public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79019 from flokli/gitlab-12.7.5 

gitlab: 12.7.4 -> 12.7.5
This commit is contained in:
Maximilian Bosch 2020-02-02 09:17:01 +01:00 committed by GitHub
parent 73c51e064a 0142bd49cc
commit e7131d6b86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,9 +1,9 @@
{ {
"version": "12.7.4", "version": "12.7.5",
"repo_hash": "02n1paz1m8dq8kmill1bwgkzai5yx7zzqa0rc3cz50pdyfq9lp5c", "repo_hash": "0jlhaakpg6bycajbhm3100gs2ka9f6iv529dvj3y1k6gysd2dpvs",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v12.7.4-ee", "rev": "v12.7.5-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "1.83.0", "GITALY_SERVER_VERSION": "1.83.0",
"GITLAB_PAGES_VERSION": "1.12.0", "GITLAB_PAGES_VERSION": "1.12.0",

4
pkgs/applications/version-management/gitlab/gitaly/deps.nix generated
View File

@ -1319,8 +1319,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/ugorji/go"; url = "https://github.com/ugorji/go";
rev = "d75b2dcb6bc8"; rev = "v1.1.4";
sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
}; };
} }
{ {

5
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -132,9 +132,8 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-model', '~> 6.1'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '~> 6.8' gem 'elasticsearch-api', '~> 6.8'
gem 'aws-sdk-core', '~> 3' gem 'aws-sdk'
gem 'aws-sdk-cloudformation', '~> 1' gem 'faraday_middleware-aws-signers-v4'
gem 'faraday_middleware-aws-sigv4'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.12' gem 'html-pipeline', '~> 2.12'

25
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -81,15 +81,13 @@ GEM
attr_required (1.0.1) attr_required (1.0.1)
awesome_print (1.8.0) awesome_print (1.8.0)
aws-eventstream (1.0.3) aws-eventstream (1.0.3)
aws-partitions (1.263.0) aws-sdk (2.11.374)
aws-sdk-cloudformation (1.29.0) aws-sdk-resources (= 2.11.374)
aws-sdk-core (~> 3, >= 3.71.0) aws-sdk-core (2.11.374)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.0)
aws-sdk-core (3.88.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-resources (2.11.374)
aws-sdk-core (= 2.11.374)
aws-sigv4 (1.1.0) aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2) aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1) axiom-types (0.1.1)
@ -278,9 +276,9 @@ GEM
faraday (~> 0.8) faraday (~> 0.8)
faraday_middleware (0.12.2) faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
faraday_middleware-aws-sigv4 (0.3.0) faraday_middleware-aws-signers-v4 (0.1.7)
aws-sigv4 (~> 1.0) aws-sdk-resources (~> 2)
faraday (>= 0.15) faraday (~> 0.9)
faraday_middleware-multi_json (0.0.6) faraday_middleware-multi_json (0.0.6)
faraday_middleware faraday_middleware
multi_json multi_json
@ -1144,8 +1142,7 @@ DEPENDENCIES
atlassian-jwt (~> 0.2.0) atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0) attr_encrypted (~> 3.1.0)
awesome_print awesome_print
aws-sdk-cloudformation (~> 1) aws-sdk
aws-sdk-core (~> 3)
babosa (~> 1.0.2) babosa (~> 1.0.2)
base32 (~> 0.3.0) base32 (~> 0.3.0)
batch-loader (~> 1.4.0) batch-loader (~> 1.4.0)
@ -1191,7 +1188,7 @@ DEPENDENCIES
escape_utils (~> 1.1) escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0) factory_bot_rails (~> 5.1.0)
faraday (~> 0.12) faraday (~> 0.12)
faraday_middleware-aws-sigv4 faraday_middleware-aws-signers-v4
fast_blank fast_blank
ffaker (~> 2.10) ffaker (~> 2.10)
flipper (~> 0.17.1) flipper (~> 0.17.1)

43
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -319,37 +319,38 @@
}; };
version = "1.0.3"; version = "1.0.3";
}; };
aws-partitions = { aws-sdk = {
dependencies = ["aws-sdk-resources"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0mr3f9bdh9lxqy4c999sk99avy46fygx4hf3i86adpvrj6axmygs"; sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0";
type = "gem"; type = "gem";
}; };
version = "1.263.0"; version = "2.11.374";
};
aws-sdk-cloudformation = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11fhscz4y6lq9c8p0ikq5608qbv4bhi6sq7bxn6vnsgx9m45kvq1";
type = "gem";
};
version = "1.29.0";
}; };
aws-sdk-core = { aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; dependencies = ["aws-sigv4" "jmespath"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yl3aw8q7ddm5x2wrqdry038gnkw0ys5il2qhlifqyc0qk8yhlfz"; sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9";
type = "gem"; type = "gem";
}; };
version = "3.88.0"; version = "2.11.374";
};
aws-sdk-resources = {
dependencies = ["aws-sdk-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4";
type = "gem";
};
version = "2.11.374";
}; };
aws-sigv4 = { aws-sigv4 = {
dependencies = ["aws-eventstream"]; dependencies = ["aws-eventstream"];
@ -1316,16 +1317,16 @@
}; };
version = "0.12.2"; version = "0.12.2";
}; };
faraday_middleware-aws-sigv4 = { faraday_middleware-aws-signers-v4 = {
dependencies = ["aws-sigv4" "faraday"]; dependencies = ["aws-sdk-resources" "faraday"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
type = "gem"; type = "gem";
}; };
version = "0.3.0"; version = "0.1.7";
}; };
faraday_middleware-multi_json = { faraday_middleware-multi_json = {
dependencies = ["faraday_middleware" "multi_json"]; dependencies = ["faraday_middleware" "multi_json"];