git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57774 from bgamari/update-gitlab

gitlab: Update to 11.9.0

commitd402472b5442d468b23f13229b2fac5c79f9d4d0 authorFlorian Klink <flokli@flokli.de> dateTue 26 Mar 2019, 11:08 (8 years ago) parent476760bd8c16f1
14 files changed+788−501
pkgs/applications/version-management/gitlab/data.json+18−18 pkgs/applications/version-management/gitlab/gitaly/Gemfile+10−2 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+47−10 pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2 pkgs/applications/version-management/gitlab/gitaly/gemset.nix+162−12 pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+2−2 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+21−21 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+31−26 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+90−81 pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+141−109 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+31−26 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+90−81 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+141−109
pkgs/applications/version-management/gitlab/data.json+18−18
@@ -1,32 +1,32 @@
11{
22 "ce": {
3− "version": "11.7.5",
4− "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn",
5− "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy",
6− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb",
3+ "version": "11.9.0",
4+ "repo_hash": "1dm7syarifhfzy63mnwipmk01h9yxrbzqxlkjzqff4nrx04301lr",
5+ "deb_hash": "0p97ykl8vz47d9y0rgn738p79i4sx64dgj5f2x8r2ylz7ihzzp0k",
6+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.0-ce.0_amd64.deb/download.deb",
77 "owner": "gitlab-org",
88 "repo": "gitlab-ce",
9− "rev": "v11.7.5",
9+ "rev": "v11.9.0",
1010 "passthru": {
11− "GITALY_SERVER_VERSION": "1.12.2",
12− "GITLAB_PAGES_VERSION": "1.3.1",
13− "GITLAB_SHELL_VERSION": "8.4.4",
14− "GITLAB_WORKHORSE_VERSION": "8.0.2"
11+ "GITALY_SERVER_VERSION": "1.27.0",
12+ "GITLAB_PAGES_VERSION": "1.5.0",
13+ "GITLAB_SHELL_VERSION": "8.7.1",
14+ "GITLAB_WORKHORSE_VERSION": "8.3.1"
1515 }
1616 },
1717 "ee": {
18− "version": "11.7.5",
19− "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm",
20− "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc",
21− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb",
18+ "version": "11.9.0",
19+ "repo_hash": "0p4b65b6yqw5xhhz11ww9pn03dm4qws7qhk840r3cgsv23n1jcqv",
20+ "deb_hash": "08k1l0k2n7jrm75l8x4fnb7jwwzzxp31ywriyj7y3pwin9xsmkmc",
21+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.0-ee.0_amd64.deb/download.deb",
2222 "owner": "gitlab-org",
2323 "repo": "gitlab-ee",
24− "rev": "v11.7.5-ee",
24+ "rev": "v11.9.0-ee",
2525 "passthru": {
26− "GITALY_SERVER_VERSION": "1.12.2",
27− "GITLAB_PAGES_VERSION": "1.3.1",
28− "GITLAB_SHELL_VERSION": "8.4.4",
29− "GITLAB_WORKHORSE_VERSION": "8.0.2"
26+ "GITALY_SERVER_VERSION": "1.27.0",
27+ "GITLAB_PAGES_VERSION": "1.5.0",
28+ "GITLAB_SHELL_VERSION": "8.7.1",
29+ "GITLAB_WORKHORSE_VERSION": "8.3.1"
3030 }
3131 }
3232}
pkgs/applications/version-management/gitlab/gitaly/Gemfile+10−2
@@ -3,10 +3,10 @@ source 'https://rubygems.org'
33# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
44gem 'bundler', '>= 1.16.5'
55
6−gem 'rugged', '~> 0.27'
6+gem 'rugged', '~> 0.28'
77gem 'github-linguist', '~> 6.1', require: 'linguist'
88gem 'gitlab-markup', '~> 1.6.5'
9−gem 'gitaly-proto', '~> 1.3.0'
9+gem 'gitaly-proto', '~> 1.13.0'
1010gem 'activesupport', '~> 5.0.2'
1111gem 'rdoc', '~> 4.2'
1212gem 'gitlab-gollum-lib', '~> 4.2', require: false
@@ -14,6 +14,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
1414gem 'grpc', '~> 1.15.0'
1515gem 'sentry-raven', '~> 2.7.2', require: false
1616gem 'faraday', '~> 0.12'
17+gem 'rbtrace', require: false
1718
1819# Detects the open source license the repository includes
1920# This version needs to be in sync with GitLab CE/EE
@@ -27,4 +28,11 @@ group :development, :test do
2728 gem 'rspec-parameterized', require: false
2829 gem 'timecop', require: false
2930 gem 'factory_bot', require: false
31+ gem 'pry', '~> 0.12.2', require: false
32+
33+ # gitlab-shell spec gems
34+ gem 'listen', '~> 0.5.0'
35+ gem 'simplecov', '~> 0.9.0', require: false
36+ gem 'vcr', '~> 4.0.0'
37+ gem 'webmock', '~> 3.4.0'
3038end
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+47−10
@@ -10,6 +10,8 @@ GEM
1010 adamantium (0.2.0)
1111 ice_nine (~> 0.11.0)
1212 memoizable (~> 0.4.0)
13+ addressable (2.5.2)
14+ public_suffix (>= 2.0.2, < 4.0)
1315 ast (2.4.0)
1416 binding_of_caller (0.8.0)
1517 debug_inspector (>= 0.0.1)
@@ -19,18 +21,22 @@ GEM
1921 adamantium (~> 0.2.0)
2022 equalizer (~> 0.0.9)
2123 concurrent-ruby (1.1.3)
24+ crack (0.4.3)
25+ safe_yaml (~> 1.0.0)
2226 crass (1.0.4)
2327 debug_inspector (0.0.3)
2428 diff-lcs (1.3)
29+ docile (1.1.5)
2530 equalizer (0.0.11)
2631 escape_utils (1.2.1)
2732 factory_bot (4.11.1)
2833 activesupport (>= 3.0.0)
2934 faraday (0.15.3)
3035 multipart-post (>= 1.2, < 3)
36+ ffi (1.10.0)
3137 gemojione (3.3.0)
3238 json
33− gitaly-proto (1.3.0)
39+ gitaly-proto (1.13.0)
3440 grpc (~> 1.0)
3541 github-linguist (6.2.0)
3642 charlock_holmes (~> 0.7.6)
@@ -58,29 +64,35 @@ GEM
5864 gollum-grit_adapter (1.0.1)
5965 gitlab-grit (~> 2.7, >= 2.7.1)
6066 google-protobuf (3.6.1)
61− googleapis-common-protos-types (1.0.2)
67+ googleapis-common-protos-types (1.0.3)
6268 google-protobuf (~> 3.0)
6369 grpc (1.15.0)
6470 google-protobuf (~> 3.1)
6571 googleapis-common-protos-types (~> 1.0.0)
72+ hashdiff (0.3.8)
6673 i18n (1.1.1)
6774 concurrent-ruby (~> 1.0)
6875 ice_nine (0.11.2)
6976 json (2.1.0)
7077 licensee (8.9.2)
7178 rugged (~> 0.24)
79+ listen (0.5.3)
7280 memoizable (0.4.2)
7381 thread_safe (~> 0.3, >= 0.3.1)
82+ method_source (0.9.2)
7483 mime-types (3.2.2)
7584 mime-types-data (~> 3.2015)
7685 mime-types-data (3.2018.0812)
77− mini_portile2 (2.3.0)
86+ mini_portile2 (2.4.0)
7887 minitest (5.11.3)
88+ msgpack (1.2.6)
89+ multi_json (1.13.1)
7990 multipart-post (2.0.0)
80− nokogiri (1.8.5)
81− mini_portile2 (~> 2.3.0)
91+ nokogiri (1.10.1)
92+ mini_portile2 (~> 2.4.0)
8293 nokogumbo (1.5.0)
8394 nokogiri
95+ optimist (3.0.0)
8496 parallel (1.12.1)
8597 parser (2.5.3.0)
8698 ast (~> 2.4.0)
@@ -91,7 +103,15 @@ GEM
91103 parser
92104 unparser
93105 procto (0.0.3)
106+ pry (0.12.2)
107+ coderay (~> 1.1.0)
108+ method_source (~> 0.9.0)
109+ public_suffix (3.0.3)
94110 rainbow (3.0.0)
111+ rbtrace (0.4.11)
112+ ffi (>= 1.0.6)
113+ msgpack (>= 0.4.3)
114+ optimist (>= 3.0.0)
95115 rdoc (4.3.0)
96116 rouge (3.3.0)
97117 rspec (3.7.0)
@@ -121,13 +141,19 @@ GEM
121141 ruby-progressbar (~> 1.7)
122142 unicode-display_width (~> 1.0, >= 1.0.1)
123143 ruby-progressbar (1.10.0)
124− rugged (0.27.5)
144+ rugged (0.28.0)
145+ safe_yaml (1.0.4)
125146 sanitize (4.6.6)
126147 crass (~> 1.0.2)
127148 nokogiri (>= 1.4.4)
128149 nokogumbo (~> 1.4)
129− sentry-raven (2.7.2)
150+ sentry-raven (2.7.4)
130151 faraday (>= 0.7.6, < 1.0)
152+ simplecov (0.9.2)
153+ docile (~> 1.1.0)
154+ multi_json (~> 1.0)
155+ simplecov-html (~> 0.9.0)
156+ simplecov-html (0.9.0)
131157 stringex (2.8.4)
132158 thread_safe (0.3.6)
133159 timecop (0.9.1)
@@ -142,6 +168,11 @@ GEM
142168 equalizer (~> 0.0.9)
143169 parser (>= 2.3.1.2, < 2.6)
144170 procto (~> 0.0.2)
171+ vcr (4.0.0)
172+ webmock (3.4.2)
173+ addressable (>= 2.3.6)
174+ crack (>= 0.3.2)
175+ hashdiff
145176
146177PLATFORMS
147178 ruby
@@ -151,7 +182,7 @@ DEPENDENCIES
151182 bundler (>= 1.16.5)
152183 factory_bot
153184 faraday (~> 0.12)
154− gitaly-proto (~> 1.3.0)
185+ gitaly-proto (~> 1.13.0)
155186 github-linguist (~> 6.1)
156187 gitlab-gollum-lib (~> 4.2)
157188 gitlab-gollum-rugged_adapter (~> 0.4.4)
@@ -159,13 +190,19 @@ DEPENDENCIES
159190 google-protobuf (~> 3.6)
160191 grpc (~> 1.15.0)
161192 licensee (~> 8.9.0)
193+ listen (~> 0.5.0)
194+ pry (~> 0.12.2)
195+ rbtrace
162196 rdoc (~> 4.2)
163197 rspec
164198 rspec-parameterized
165199 rubocop (~> 0.50)
166− rugged (~> 0.27)
200+ rugged (~> 0.28)
167201 sentry-raven (~> 2.7.2)
202+ simplecov (~> 0.9.0)
168203 timecop
204+ vcr (~> 4.0.0)
205+ webmock (~> 3.4.0)
169206
170207BUNDLED WITH
171− 1.17.1
208+ 1.17.3
pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2
@@ -7,14 +7,14 @@ let
77 gemdir = ./.;
88 };
99in buildGoPackage rec {
10− version = "1.12.2";
10+ version = "1.27.0";
1111 name = "gitaly-${version}";
1212
1313 src = fetchFromGitLab {
1414 owner = "gitlab-org";
1515 repo = "gitaly";
1616 rev = "v${version}";
17− sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy";
17+ sha256 = "0m96048nxbgdkly5rz9d21yz8dmgv1kqis98is5kdz5b1wmhz18r";
1818 };
1919
2020 goPackagePath = "gitlab.com/gitlab-org/gitaly";
pkgs/applications/version-management/gitlab/gitaly/gemset.nix+162−12
@@ -25,6 +25,15 @@
2525 };
2626 version = "0.2.0";
2727 };
28+ addressable = {
29+ dependencies = ["public_suffix"];
30+ source = {
31+ remotes = ["https://rubygems.org"];
32+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
33+ type = "gem";
34+ };
35+ version = "2.5.2";
36+ };
2837 ast = {
2938 source = {
3039 remotes = ["https://rubygems.org"];
@@ -75,6 +84,15 @@
7584 };
7685 version = "1.1.3";
7786 };
87+ crack = {
88+ dependencies = ["safe_yaml"];
89+ source = {
90+ remotes = ["https://rubygems.org"];
91+ sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
92+ type = "gem";
93+ };
94+ version = "0.4.3";
95+ };
7896 crass = {
7997 source = {
8098 remotes = ["https://rubygems.org"];
@@ -99,6 +117,14 @@
99117 };
100118 version = "1.3";
101119 };
120+ docile = {
121+ source = {
122+ remotes = ["https://rubygems.org"];
123+ sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
124+ type = "gem";
125+ };
126+ version = "1.1.5";
127+ };
102128 equalizer = {
103129 source = {
104130 remotes = ["https://rubygems.org"];
@@ -133,6 +159,14 @@
133159 };
134160 version = "0.15.3";
135161 };
162+ ffi = {
163+ source = {
164+ remotes = ["https://rubygems.org"];
165+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
166+ type = "gem";
167+ };
168+ version = "1.10.0";
169+ };
136170 gemojione = {
137171 dependencies = ["json"];
138172 source = {
@@ -146,10 +180,10 @@
146180 dependencies = ["grpc"];
147181 source = {
148182 remotes = ["https://rubygems.org"];
149− sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680";
183+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
150184 type = "gem";
151185 };
152− version = "1.3.0";
186+ version = "1.13.0";
153187 };
154188 github-linguist = {
155189 dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -224,10 +258,10 @@
224258 dependencies = ["google-protobuf"];
225259 source = {
226260 remotes = ["https://rubygems.org"];
227− sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
261+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
228262 type = "gem";
229263 };
230− version = "1.0.2";
264+ version = "1.0.3";
231265 };
232266 grpc = {
233267 dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -238,6 +272,14 @@
238272 };
239273 version = "1.15.0";
240274 };
275+ hashdiff = {
276+ source = {
277+ remotes = ["https://rubygems.org"];
278+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
279+ type = "gem";
280+ };
281+ version = "0.3.8";
282+ };
241283 i18n = {
242284 dependencies = ["concurrent-ruby"];
243285 source = {
@@ -272,6 +314,14 @@
272314 };
273315 version = "8.9.2";
274316 };
317+ listen = {
318+ source = {
319+ remotes = ["https://rubygems.org"];
320+ sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
321+ type = "gem";
322+ };
323+ version = "0.5.3";
324+ };
275325 memoizable = {
276326 dependencies = ["thread_safe"];
277327 source = {
@@ -281,6 +331,14 @@
281331 };
282332 version = "0.4.2";
283333 };
334+ method_source = {
335+ source = {
336+ remotes = ["https://rubygems.org"];
337+ sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
338+ type = "gem";
339+ };
340+ version = "0.9.2";
341+ };
284342 mime-types = {
285343 dependencies = ["mime-types-data"];
286344 source = {
@@ -301,10 +359,10 @@
301359 mini_portile2 = {
302360 source = {
303361 remotes = ["https://rubygems.org"];
304− sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
362+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
305363 type = "gem";
306364 };
307− version = "2.3.0";
365+ version = "2.4.0";
308366 };
309367 minitest = {
310368 source = {
@@ -314,6 +372,22 @@
314372 };
315373 version = "5.11.3";
316374 };
375+ msgpack = {
376+ source = {
377+ remotes = ["https://rubygems.org"];
378+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
379+ type = "gem";
380+ };
381+ version = "1.2.6";
382+ };
383+ multi_json = {
384+ source = {
385+ remotes = ["https://rubygems.org"];
386+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
387+ type = "gem";
388+ };
389+ version = "1.13.1";
390+ };
317391 multipart-post = {
318392 source = {
319393 remotes = ["https://rubygems.org"];
@@ -326,10 +400,10 @@
326400 dependencies = ["mini_portile2"];
327401 source = {
328402 remotes = ["https://rubygems.org"];
329− sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
403+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
330404 type = "gem";
331405 };
332− version = "1.8.5";
406+ version = "1.10.1";
333407 };
334408 nokogumbo = {
335409 dependencies = ["nokogiri"];
@@ -340,6 +414,14 @@
340414 };
341415 version = "1.5.0";
342416 };
417+ optimist = {
418+ source = {
419+ remotes = ["https://rubygems.org"];
420+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
421+ type = "gem";
422+ };
423+ version = "3.0.0";
424+ };
343425 parallel = {
344426 source = {
345427 remotes = ["https://rubygems.org"];
@@ -390,6 +472,23 @@
390472 };
391473 version = "0.0.3";
392474 };
475+ pry = {
476+ dependencies = ["coderay" "method_source"];
477+ source = {
478+ remotes = ["https://rubygems.org"];
479+ sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
480+ type = "gem";
481+ };
482+ version = "0.12.2";
483+ };
484+ public_suffix = {
485+ source = {
486+ remotes = ["https://rubygems.org"];
487+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
488+ type = "gem";
489+ };
490+ version = "3.0.3";
491+ };
393492 rainbow = {
394493 source = {
395494 remotes = ["https://rubygems.org"];
@@ -398,6 +497,15 @@
398497 };
399498 version = "3.0.0";
400499 };
500+ rbtrace = {
501+ dependencies = ["ffi" "msgpack" "optimist"];
502+ source = {
503+ remotes = ["https://rubygems.org"];
504+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
505+ type = "gem";
506+ };
507+ version = "0.4.11";
508+ };
401509 rdoc = {
402510 source = {
403511 remotes = ["https://rubygems.org"];
@@ -487,10 +595,18 @@
487595 rugged = {
488596 source = {
489597 remotes = ["https://rubygems.org"];
490− sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
598+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
491599 type = "gem";
492600 };
493− version = "0.27.5";
601+ version = "0.28.0";
602+ };
603+ safe_yaml = {
604+ source = {
605+ remotes = ["https://rubygems.org"];
606+ sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
607+ type = "gem";
608+ };
609+ version = "1.0.4";
494610 };
495611 sanitize = {
496612 dependencies = ["crass" "nokogiri" "nokogumbo"];
@@ -505,10 +621,27 @@
505621 dependencies = ["faraday"];
506622 source = {
507623 remotes = ["https://rubygems.org"];
508− sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
624+ sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4";
625+ type = "gem";
626+ };
627+ version = "2.7.4";
628+ };
629+ simplecov = {
630+ dependencies = ["docile" "multi_json" "simplecov-html"];
631+ source = {
632+ remotes = ["https://rubygems.org"];
633+ sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
509634 type = "gem";
510635 };
511− version = "2.7.2";
636+ version = "0.9.2";
637+ };
638+ simplecov-html = {
639+ source = {
640+ remotes = ["https://rubygems.org"];
641+ sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
642+ type = "gem";
643+ };
644+ version = "0.9.0";
512645 };
513646 stringex = {
514647 source = {
@@ -560,4 +693,21 @@
560693 };
561694 version = "0.2.8";
562695 };
696+ vcr = {
697+ source = {
698+ remotes = ["https://rubygems.org"];
699+ sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
700+ type = "gem";
701+ };
702+ version = "4.0.0";
703+ };
704+ webmock = {
705+ dependencies = ["addressable" "crack" "hashdiff"];
706+ source = {
707+ remotes = ["https://rubygems.org"];
708+ sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
709+ type = "gem";
710+ };
711+ version = "3.4.2";
712+ };
563713}
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, ruby, bundler, fetchFromGitLab, go }:
22
33stdenv.mkDerivation rec {
4− version = "8.4.4";
4+ version = "8.7.1";
55 name = "gitlab-shell-${version}";
66
77 src = fetchFromGitLab {
88 owner = "gitlab-org";
99 repo = "gitlab-shell";
1010 rev = "v${version}";
11− sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq";
11+ sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia";
1212 };
1313
1414 buildInputs = [ ruby bundler go ];
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+21−21
@@ -1,16 +1,16 @@
11diff --git a/go/internal/config/config.go b/go/internal/config/config.go
2−index 435cb29..078c1df 100644
2+index f951fe6..b422fe3 100644
33--- a/go/internal/config/config.go
44+++ b/go/internal/config/config.go
5−@@ -2,7 +2,6 @@ package config
6−
5+@@ -3,7 +3,6 @@ package config
76 import (
87 "io/ioutil"
8+ "net/url"
99- "os"
1010 "path"
11+ "strings"
1112
12− yaml "gopkg.in/yaml.v2"
13−@@ -26,16 +25,13 @@ type Config struct {
13+@@ -30,16 +29,13 @@ type Config struct {
1414 }
1515
1616 func New() (*Config, error) {
@@ -28,12 +28,25 @@ index 435cb29..078c1df 100644
2828+ return newFromFile("/run/gitlab/shell-config.yml")
2929 }
3030
31− func newFromFile(filename string) (*Config, error) {
31+ func (c *Config) FeatureEnabled(featureName string) bool {
32+diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
33+index 0600a18..c46f2d7 100644
34+--- a/lib/gitlab_keys.rb
35++++ b/lib/gitlab_keys.rb
36+@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
37+ attr_accessor :auth_file, :key
38+
39+ def self.command(whatever)
40+- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
41++ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
42+ end
43+
44+ def self.command_key(key_id)
3245diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
33−index 57c70f5..700569b 100644
46+index 2cb76a8..f59ad5e 100644
3447--- a/lib/gitlab_shell.rb
3548+++ b/lib/gitlab_shell.rb
36−@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
49+@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
3750
3851 args = [executable, gitaly_address, json_args]
3952 # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
@@ -43,16 +56,3 @@ index 57c70f5..700569b 100644
4356 end
4457
4558 def api
46−diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
47−index 0600a18..6814f0a 100644
48−--- a/lib/gitlab_keys.rb
49−+++ b/lib/gitlab_keys.rb
50−@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
51− attr_accessor :auth_file, :key
52−
53− def self.command(whatever)
54−- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
55−+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
56− end
57−
58− def self.command_key(key_id)
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44 name = "gitlab-workhorse-${version}";
55
6− version = "8.0.2";
6+ version = "8.3.1";
77
88 src = fetchFromGitLab {
99 owner = "gitlab-org";
1010 repo = "gitlab-workhorse";
1111 rev = "v${version}";
12− sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690";
12+ sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j";
1313 };
1414
1515 buildInputs = [ git go ];
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+31−26
@@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
1616
1717# Supported DBs
1818gem 'mysql2', '~> 0.4.10', group: :mysql
19−gem 'pg', '~> 0.18.2', group: :postgres
19+gem 'pg', '~> 1.1', group: :postgres
2020
21−gem 'rugged', '~> 0.27'
21+gem 'rugged', '~> 0.28'
2222gem 'grape-path-helpers', '~> 1.0'
2323
2424gem 'faraday', '~> 0.12'
@@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18'
6868# LDAP Auth
6969# GitLab fork with several improvements to original library. For full list of changes
7070# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
71−gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
71+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
7272gem 'net-ldap'
7373
7474# API
@@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3'
9494gem 'mini_magick'
9595
9696# for backups
97−gem 'fog-aws', '~> 2.0.1'
98−gem 'fog-core', '~> 1.44'
99−gem 'fog-google', '~> 1.7.1'
100−gem 'fog-local', '~> 0.3'
101−gem 'fog-openstack', '~> 0.1'
97+gem 'fog-aws', '~> 3.3'
98+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
99+# Also see config/initializers/fog_core_patch.rb.
100+gem 'fog-core', '= 2.1.0'
101+gem 'fog-google', '~> 1.8'
102+gem 'fog-local', '~> 0.6'
103+gem 'fog-openstack', '~> 1.0'
102104gem 'fog-rackspace', '~> 0.1.1'
103−gem 'fog-aliyun', '~> 0.2.0'
105+gem 'fog-aliyun', '~> 0.3'
104106
105107# for Google storage
106108gem 'google-api-client', '~> 0.23'
@@ -113,10 +115,9 @@ gem 'seed-fu', '~> 2.3.7'
113115
114116# Markdown and HTML processing
115117gem 'html-pipeline', '~> 2.8'
116−gem 'deckar01-task_list', '2.0.0'
118+gem 'deckar01-task_list', '2.2.0'
117119gem 'gitlab-markup', '~> 1.6.5'
118120gem 'github-markup', '~> 1.7.0', require: 'github/markup'
119−gem 'redcarpet', '~> 3.4'
120121gem 'commonmarker', '~> 0.17'
121122gem 'RedCloth', '~> 4.3.2'
122123gem 'rdoc', '~> 6.0'
@@ -126,9 +127,9 @@ gem 'wikicloth', '0.8.1'
126127gem 'asciidoctor', '~> 1.5.8'
127128gem 'asciidoctor-plantuml', '0.0.8'
128129gem 'rouge', '~> 3.1'
129−gem 'truncato', '~> 0.7.9'
130+gem 'truncato', '~> 0.7.11'
130131gem 'bootstrap_form', '~> 2.7.0'
131−gem 'nokogiri', '~> 1.8.5'
132+gem 'nokogiri', '~> 1.10.1'
132133gem 'escape_utils', '~> 1.1'
133134
134135# Calendar rendering
@@ -144,7 +145,7 @@ gem 'diffy', '~> 3.1.0'
144145gem 'rack', '2.0.6'
145146
146147group :unicorn do
147− gem 'unicorn', '~> 5.1.0'
148+ gem 'unicorn', '~> 5.4.1'
148149 gem 'unicorn-worker-killer', '~> 0.4.4'
149150end
150151
@@ -161,12 +162,12 @@ gem 'acts-as-taggable-on', '~> 5.0'
161162
162163# Background jobs
163164gem 'sidekiq', '~> 5.2.1'
164−gem 'sidekiq-cron', '~> 0.6.0'
165+gem 'sidekiq-cron', '~> 1.0'
165166gem 'redis-namespace', '~> 1.6.0'
166167gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
167168
168169# Cron Parser
169−gem 'rufus-scheduler', '~> 3.4'
170+gem 'fugit', '~> 1.1'
170171
171172# HTTP requests
172173gem 'httparty', '~> 0.13.3'
@@ -185,10 +186,10 @@ gem 're2', '~> 1.1.1'
185186
186187# Misc
187188
188−gem 'version_sorter', '~> 2.1.0'
189+gem 'version_sorter', '~> 2.2.4'
189190
190191# Export Ruby Regex to Javascript
191−gem 'js_regex', '~> 2.2.1'
192+gem 'js_regex', '~> 3.1'
192193
193194# User agent parsing
194195gem 'device_detector'
@@ -203,9 +204,6 @@ gem 'connection_pool', '~> 2.0'
203204# Discord integration
204205gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
205206
206−# HipChat integration
207−gem 'hipchat', '~> 1.5.0'
208−
209207# JIRA integration
210208gem 'jira-ruby', '~> 1.4'
211209
@@ -225,7 +223,7 @@ gem 'asana', '~> 0.8.1'
225223gem 'ruby-fogbugz', '~> 0.2.1'
226224
227225# Kubernetes integration
228−gem 'kubeclient', '~> 4.0.0'
226+gem 'kubeclient', '~> 4.2.2'
229227
230228# Sanitize user input
231229gem 'sanitize', '~> 4.6'
@@ -305,6 +303,12 @@ group :metrics do
305303 gem 'raindrops', '~> 0.18'
306304end
307305
306+group :tracing do
307+ # OpenTracing
308+ gem 'opentracing', '~> 0.4.3'
309+ gem 'jaeger-client', '~> 0.10.0'
310+end
311+
308312group :development do
309313 gem 'foreman', '~> 0.84.0'
310314 gem 'brakeman', '~> 4.2', require: false
@@ -321,7 +325,7 @@ group :development do
321325end
322326
323327group :development, :test do
324− gem 'bootsnap', '~> 1.3'
328+ gem 'bootsnap', '~> 1.4'
325329 gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
326330 gem 'pry-byebug', '~> 3.5.1', platform: :mri
327331 gem 'pry-rails', '~> 0.3.4'
@@ -378,7 +382,7 @@ group :test do
378382 gem 'shoulda-matchers', '~> 3.1.2', require: false
379383 gem 'email_spec', '~> 2.2.0'
380384 gem 'json-schema', '~> 2.8.0'
381− gem 'webmock', '~> 2.3.2'
385+ gem 'webmock', '~> 3.5.1'
382386 gem 'rails-controller-testing'
383387 gem 'sham_rack', '~> 1.3.6'
384388 gem 'concurrent-ruby', '~> 1.1'
@@ -408,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6'
408412
409413# SSH host key support
410414gem 'net-ssh', '~> 5.0'
411−gem 'sshkey', '~> 1.9.0'
415+gem 'sshkey', '~> 2.0'
412416
413417# Required for ED25519 SSH host key support
414418group :ed25519 do
@@ -417,7 +421,8 @@ group :ed25519 do
417421end
418422
419423# Gitaly GRPC client
420−gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
424+gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
425+
421426gem 'grpc', '~> 1.15.0'
422427
423428gem 'google-protobuf', '~> 3.6'
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+90−81
@@ -85,7 +85,7 @@ GEM
8585 binding_ninja (0.2.2)
8686 binding_of_caller (0.8.0)
8787 debug_inspector (>= 0.0.1)
88− bootsnap (1.3.2)
88+ bootsnap (1.4.1)
8989 msgpack (~> 1.0)
9090 bootstrap_form (2.7.0)
9191 brakeman (4.2.1)
@@ -113,6 +113,7 @@ GEM
113113 activesupport (>= 4.0.0)
114114 mime-types (>= 1.16)
115115 cause (0.1)
116+ character_set (1.1.2)
116117 charlock_holmes (0.7.6)
117118 childprocess (0.9.0)
118119 ffi (~> 1.0, >= 1.0.11)
@@ -143,7 +144,7 @@ GEM
143144 database_cleaner (1.7.0)
144145 debug_inspector (0.0.3)
145146 debugger-ruby_core_source (1.3.8)
146− deckar01-task_list (2.0.0)
147+ deckar01-task_list (2.2.0)
147148 html-pipeline
148149 declarative (0.0.10)
149150 declarative-option (0.1.0)
@@ -185,7 +186,7 @@ GEM
185186 erubi (1.7.1)
186187 erubis (2.7.0)
187188 escape_utils (1.2.1)
188− et-orbi (1.0.3)
189+ et-orbi (1.1.7)
189190 tzinfo
190191 eventmachine (1.2.7)
191192 excon (0.62.0)
@@ -206,7 +207,7 @@ GEM
206207 fast_blank (1.0.0)
207208 fast_gettext (1.6.0)
208209 ffaker (2.10.0)
209− ffi (1.9.25)
210+ ffi (1.10.0)
210211 flipper (0.13.0)
211212 flipper-active_record (0.13.0)
212213 activerecord (>= 3.2, < 6)
@@ -217,32 +218,33 @@ GEM
217218 flowdock (0.7.1)
218219 httparty (~> 0.7)
219220 multi_json
220− fog-aliyun (0.2.0)
221− fog-core (~> 1.27)
222− fog-json (~> 1.0)
221+ fog-aliyun (0.3.3)
222+ fog-core
223+ fog-json
223224 ipaddress (~> 0.8)
224225 xml-simple (~> 1.1)
225− fog-aws (2.0.1)
226− fog-core (~> 1.38)
227− fog-json (~> 1.0)
226+ fog-aws (3.3.0)
227+ fog-core (~> 2.1)
228+ fog-json (~> 1.1)
228229 fog-xml (~> 0.1)
229230 ipaddress (~> 0.8)
230− fog-core (1.45.0)
231+ fog-core (2.1.0)
231232 builder
232233 excon (~> 0.58)
233234 formatador (~> 0.2)
234− fog-google (1.7.1)
235− fog-core
236− fog-json
237− fog-xml
235+ mime-types
236+ fog-google (1.8.2)
237+ fog-core (<= 2.1.0)
238+ fog-json (~> 1.2)
239+ fog-xml (~> 0.1.0)
238240 google-api-client (~> 0.23.0)
239− fog-json (1.0.2)
240− fog-core (~> 1.0)
241+ fog-json (1.2.0)
242+ fog-core
241243 multi_json (~> 1.10)
242− fog-local (0.3.1)
243− fog-core (~> 1.27)
244− fog-openstack (0.1.21)
245− fog-core (>= 1.40)
244+ fog-local (0.6.0)
245+ fog-core (>= 1.27, < 3.0)
246+ fog-openstack (1.0.8)
247+ fog-core (~> 2.1)
246248 fog-json (>= 1.0)
247249 ipaddress (>= 0.8)
248250 fog-rackspace (0.1.1)
@@ -258,6 +260,9 @@ GEM
258260 foreman (0.84.0)
259261 thor (~> 0.19.1)
260262 formatador (0.2.5)
263+ fugit (1.1.7)
264+ et-orbi (~> 1.1, >= 1.1.7)
265+ raabro (~> 1.1)
261266 fuubar (2.2.0)
262267 rspec-core (~> 3.0)
263268 ruby-progressbar (~> 1.4)
@@ -274,7 +279,7 @@ GEM
274279 gettext_i18n_rails (>= 0.7.1)
275280 po_to_json (>= 1.0.0)
276281 rails (>= 3.2.0)
277− gitaly-proto (1.5.0)
282+ gitaly-proto (1.13.0)
278283 grpc (~> 1.0)
279284 github-markup (1.7.0)
280285 gitlab-default_value_for (3.1.1)
@@ -282,11 +287,11 @@ GEM
282287 gitlab-markup (1.6.5)
283288 gitlab-sidekiq-fetcher (0.4.0)
284289 sidekiq (~> 5)
285− gitlab-styles (2.4.1)
290+ gitlab-styles (2.5.1)
286291 rubocop (~> 0.54.0)
287292 rubocop-gitlab-security (~> 0.1.0)
288293 rubocop-rspec (~> 1.19)
289− gitlab_omniauth-ldap (2.0.4)
294+ gitlab_omniauth-ldap (2.1.1)
290295 net-ldap (~> 0.16)
291296 omniauth (~> 1.3)
292297 pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -305,7 +310,7 @@ GEM
305310 representable (~> 3.0)
306311 retriable (>= 2.0, < 4.0)
307312 google-protobuf (3.6.1)
308− googleapis-common-protos-types (1.0.2)
313+ googleapis-common-protos-types (1.0.3)
309314 google-protobuf (~> 3.0)
310315 googleauth (0.6.6)
311316 faraday (~> 0.12)
@@ -353,15 +358,12 @@ GEM
353358 thor
354359 tilt
355360 hangouts-chat (0.0.5)
356− hashdiff (0.3.4)
361+ hashdiff (0.3.8)
357362 hashie (3.5.7)
358363 hashie-forbidden_attributes (0.1.1)
359364 hashie (>= 3.0)
360365 health_check (2.6.0)
361366 rails (>= 4.0)
362− hipchat (1.5.2)
363− httparty
364− mimemagic
365367 html-pipeline (2.8.4)
366368 activesupport (>= 2)
367369 nokogiri (>= 1.4)
@@ -389,13 +391,18 @@ GEM
389391 cause
390392 json
391393 ipaddress (0.8.3)
394+ jaeger-client (0.10.0)
395+ opentracing (~> 0.3)
396+ thrift
392397 jira-ruby (1.4.1)
393398 activesupport
394399 multipart-post
395400 oauth (~> 0.5, >= 0.5.0)
396401 jquery-atwho-rails (1.3.2)
397− js_regex (2.2.1)
398− regexp_parser (>= 0.4.11, <= 0.5.0)
402+ js_regex (3.1.1)
403+ character_set (~> 1.1)
404+ regexp_parser (~> 1.1)
405+ regexp_property_values (~> 0.3)
399406 json (1.8.6)
400407 json-jwt (1.9.4)
401408 activesupport
@@ -416,10 +423,10 @@ GEM
416423 activerecord
417424 kaminari-core (= 1.0.1)
418425 kaminari-core (1.0.1)
419− kgio (2.10.0)
426+ kgio (2.11.2)
420427 knapsack (1.17.0)
421428 rake
422− kubeclient (4.0.0)
429+ kubeclient (4.2.2)
423430 http (~> 3.0)
424431 recursive-open-struct (~> 1.0, >= 1.0.4)
425432 rest-client (~> 2.0)
@@ -462,9 +469,9 @@ GEM
462469 mimemagic (0.3.2)
463470 mini_magick (4.8.0)
464471 mini_mime (1.0.1)
465− mini_portile2 (2.3.0)
472+ mini_portile2 (2.4.0)
466473 minitest (5.11.3)
467− msgpack (1.2.4)
474+ msgpack (1.2.6)
468475 multi_json (1.13.1)
469476 multi_xml (0.6.0)
470477 multipart-post (2.0.0)
@@ -477,8 +484,8 @@ GEM
477484 net-ssh (5.0.1)
478485 netrc (0.11.0)
479486 nio4r (2.3.1)
480− nokogiri (1.8.5)
481− mini_portile2 (~> 2.3.0)
487+ nokogiri (1.10.1)
488+ mini_portile2 (~> 2.4.0)
482489 nokogumbo (1.5.0)
483490 nokogiri
484491 numerizer (0.1.1)
@@ -544,6 +551,8 @@ GEM
544551 activesupport
545552 nokogiri (>= 1.4.4)
546553 omniauth (~> 1.0)
554+ opentracing (0.4.3)
555+ optimist (3.0.0)
547556 org-ruby (0.9.12)
548557 rubypants (~> 0.2)
549558 orm_adapter (0.5.0)
@@ -575,7 +584,7 @@ GEM
575584 atomic (>= 1.0.0)
576585 peek
577586 redis
578− pg (0.18.4)
587+ pg (1.1.3)
579588 po_to_json (1.0.1)
580589 json (>= 1.6.0)
581590 powerpack (0.1.1)
@@ -606,6 +615,7 @@ GEM
606615 get_process_mem (~> 0.2)
607616 puma (>= 2.7, < 4)
608617 pyu-ruby-sasl (0.0.3.3)
618+ raabro (1.1.6)
609619 rack (2.0.6)
610620 rack-accept (0.4.5)
611621 rack (>= 0.4)
@@ -618,7 +628,7 @@ GEM
618628 httpclient (>= 2.4)
619629 multi_json (>= 1.3.6)
620630 rack (>= 1.1)
621− rack-protection (2.0.4)
631+ rack-protection (2.0.5)
622632 rack
623633 rack-proxy (0.6.0)
624634 rack
@@ -657,23 +667,22 @@ GEM
657667 rake (>= 0.8.7)
658668 thor (>= 0.18.1, < 2.0)
659669 rainbow (3.0.0)
660− raindrops (0.18.0)
670+ raindrops (0.19.0)
661671 rake (12.3.2)
662672 rb-fsevent (0.10.2)
663673 rb-inotify (0.9.10)
664674 ffi (>= 0.5.0, < 2)
665675 rblineprof (0.3.6)
666676 debugger-ruby_core_source (~> 1.3)
667− rbtrace (0.4.10)
677+ rbtrace (0.4.11)
668678 ffi (>= 1.0.6)
669679 msgpack (>= 0.4.3)
670− trollop (>= 1.16.2)
680+ optimist (>= 3.0.0)
671681 rdoc (6.0.4)
672682 re2 (1.1.1)
673683 recaptcha (3.0.0)
674684 json
675685 recursive-open-struct (1.1.0)
676− redcarpet (3.4.0)
677686 redis (3.3.5)
678687 redis-actionpack (5.0.2)
679688 actionpack (>= 4.0, < 6)
@@ -693,7 +702,8 @@ GEM
693702 redis-store (>= 1.2, < 2)
694703 redis-store (1.6.0)
695704 redis (>= 2.2, < 5)
696− regexp_parser (0.5.0)
705+ regexp_parser (1.3.0)
706+ regexp_property_values (0.3.4)
697707 representable (3.0.4)
698708 declarative (< 0.1.0)
699709 declarative-option (< 0.2.0)
@@ -775,9 +785,7 @@ GEM
775785 rubyntlm (0.6.2)
776786 rubypants (0.2.0)
777787 rubyzip (1.2.2)
778− rufus-scheduler (3.4.0)
779− et-orbi (~> 1.0)
780− rugged (0.27.5)
788+ rugged (0.28.0)
781789 safe_yaml (1.0.4)
782790 sanitize (4.6.6)
783791 crass (~> 1.0.2)
@@ -816,12 +824,13 @@ GEM
816824 rack
817825 shoulda-matchers (3.1.2)
818826 activesupport (>= 4.0.0)
819− sidekiq (5.2.3)
827+ sidekiq (5.2.5)
820828 connection_pool (~> 2.2, >= 2.2.2)
829+ rack (>= 1.5.0)
821830 rack-protection (>= 1.5.0)
822831 redis (>= 3.3.5, < 5)
823− sidekiq-cron (0.6.0)
824− rufus-scheduler (>= 3.3.0)
832+ sidekiq-cron (1.0.4)
833+ fugit (~> 1.1)
825834 sidekiq (>= 4.2.1)
826835 signet (0.11.0)
827836 addressable (~> 2.3)
@@ -847,7 +856,7 @@ GEM
847856 activesupport (>= 4.0)
848857 sprockets (>= 3.0.0)
849858 sqlite3 (1.3.13)
850− sshkey (1.9.0)
859+ sshkey (2.0.0)
851860 stackprof (0.2.10)
852861 state_machines (0.5.0)
853862 state_machines-activemodel (0.5.1)
@@ -868,6 +877,7 @@ GEM
868877 rack (>= 1, < 3)
869878 thor (0.19.4)
870879 thread_safe (0.3.6)
880+ thrift (0.11.0.0)
871881 tilt (2.0.8)
872882 timecop (0.8.1)
873883 timfel-krb5-auth (0.8.3)
@@ -875,10 +885,9 @@ GEM
875885 parslet (~> 1.8.0)
876886 toml-rb (1.0.0)
877887 citrus (~> 3.0, > 3.0)
878− trollop (2.1.3)
879− truncato (0.7.10)
888+ truncato (0.7.11)
880889 htmlentities (~> 4.3.1)
881− nokogiri (~> 1.8.0, >= 1.7.0)
890+ nokogiri (>= 1.7.0, <= 2.0)
882891 tzinfo (1.2.5)
883892 thread_safe (~> 0.1)
884893 u2f (0.2.1)
@@ -890,7 +899,7 @@ GEM
890899 unf_ext
891900 unf_ext (0.0.7.5)
892901 unicode-display_width (1.3.2)
893− unicorn (5.1.0)
902+ unicorn (5.4.1)
894903 kgio (~> 2.6)
895904 raindrops (~> 0.7)
896905 unicorn-worker-killer (0.4.4)
@@ -908,7 +917,7 @@ GEM
908917 validates_hostname (1.0.6)
909918 activerecord (>= 3.0)
910919 activesupport (>= 3.0)
911− version_sorter (2.1.0)
920+ version_sorter (2.2.4)
912921 virtus (1.0.5)
913922 axiom-types (~> 0.1)
914923 coercible (~> 1.0)
@@ -917,7 +926,7 @@ GEM
917926 vmstat (2.3.0)
918927 warden (1.2.7)
919928 rack (>= 1.0)
920− webmock (2.3.2)
929+ webmock (3.5.1)
921930 addressable (>= 2.3.6)
922931 crack (>= 0.3.2)
923932 hashdiff
@@ -957,7 +966,7 @@ DEPENDENCIES
957966 benchmark-ips (~> 2.3.0)
958967 better_errors (~> 2.5.0)
959968 binding_of_caller (~> 0.8.0)
960− bootsnap (~> 1.3)
969+ bootsnap (~> 1.4)
961970 bootstrap_form (~> 2.7.0)
962971 brakeman (~> 4.2)
963972 browser (~> 2.5)
@@ -974,7 +983,7 @@ DEPENDENCIES
974983 connection_pool (~> 2.0)
975984 creole (~> 0.5.0)
976985 database_cleaner (~> 1.7.0)
977− deckar01-task_list (= 2.0.0)
986+ deckar01-task_list (= 2.2.0)
978987 device_detector
979988 devise (~> 4.4)
980989 devise-two-factor (~> 3.0.0)
@@ -994,27 +1003,28 @@ DEPENDENCIES
9941003 flipper-active_record (~> 0.13.0)
9951004 flipper-active_support_cache_store (~> 0.13.0)
9961005 flowdock (~> 0.7)
997− fog-aliyun (~> 0.2.0)
998− fog-aws (~> 2.0.1)
999− fog-core (~> 1.44)
1000− fog-google (~> 1.7.1)
1001− fog-local (~> 0.3)
1002− fog-openstack (~> 0.1)
1006+ fog-aliyun (~> 0.3)
1007+ fog-aws (~> 3.3)
1008+ fog-core (= 2.1.0)
1009+ fog-google (~> 1.8)
1010+ fog-local (~> 0.6)
1011+ fog-openstack (~> 1.0)
10031012 fog-rackspace (~> 0.1.1)
10041013 font-awesome-rails (~> 4.7)
10051014 foreman (~> 0.84.0)
1015+ fugit (~> 1.1)
10061016 fuubar (~> 2.2.0)
10071017 gemojione (~> 3.3)
10081018 gettext (~> 3.2.2)
10091019 gettext_i18n_rails (~> 1.8.0)
10101020 gettext_i18n_rails_js (~> 1.3)
1011− gitaly-proto (~> 1.5.0)
1021+ gitaly-proto (~> 1.13.0)
10121022 github-markup (~> 1.7.0)
10131023 gitlab-default_value_for (~> 3.1.1)
10141024 gitlab-markup (~> 1.6.5)
10151025 gitlab-sidekiq-fetcher (~> 0.4.0)
10161026 gitlab-styles (~> 2.4)
1017− gitlab_omniauth-ldap (~> 2.0.4)
1027+ gitlab_omniauth-ldap (~> 2.1.1)
10181028 gon (~> 6.2)
10191029 google-api-client (~> 0.23)
10201030 google-protobuf (~> 3.6)
@@ -1031,20 +1041,20 @@ DEPENDENCIES
10311041 hangouts-chat (~> 0.0.5)
10321042 hashie-forbidden_attributes
10331043 health_check (~> 2.6.0)
1034− hipchat (~> 1.5.0)
10351044 html-pipeline (~> 2.8)
10361045 html2text
10371046 httparty (~> 0.13.3)
10381047 icalendar
10391048 influxdb (~> 0.2)
1049+ jaeger-client (~> 0.10.0)
10401050 jira-ruby (~> 1.4)
10411051 jquery-atwho-rails (~> 1.3.2)
1042− js_regex (~> 2.2.1)
1052+ js_regex (~> 3.1)
10431053 json-schema (~> 2.8.0)
10441054 jwt (~> 2.1.0)
10451055 kaminari (~> 1.0)
10461056 knapsack (~> 1.17)
1047− kubeclient (~> 4.0.0)
1057+ kubeclient (~> 4.2.2)
10481058 letter_opener_web (~> 1.3.0)
10491059 license_finder (~> 5.4)
10501060 licensee (~> 8.9)
@@ -1059,7 +1069,7 @@ DEPENDENCIES
10591069 nakayoshi_fork (~> 0.0.4)
10601070 net-ldap
10611071 net-ssh (~> 5.0)
1062− nokogiri (~> 1.8.5)
1072+ nokogiri (~> 1.10.1)
10631073 oauth2 (~> 1.4)
10641074 octokit (~> 4.9)
10651075 omniauth (~> 1.8)
@@ -1077,6 +1087,7 @@ DEPENDENCIES
10771087 omniauth-shibboleth (~> 1.3.0)
10781088 omniauth-twitter (~> 1.4)
10791089 omniauth_crowd (~> 2.2.0)
1090+ opentracing (~> 0.4.3)
10801091 org-ruby (~> 0.9.12)
10811092 peek (~> 1.0.1)
10821093 peek-gc (~> 0.0.2)
@@ -1084,7 +1095,7 @@ DEPENDENCIES
10841095 peek-pg (~> 1.3.0)
10851096 peek-rblineprof (~> 0.2.0)
10861097 peek-redis (~> 1.2.0)
1087− pg (~> 0.18.2)
1098+ pg (~> 1.1)
10881099 premailer-rails (~> 1.9.7)
10891100 prometheus-client-mmap (~> 0.9.4)
10901101 pry-byebug (~> 3.5.1)
@@ -1107,7 +1118,6 @@ DEPENDENCIES
11071118 rdoc (~> 6.0)
11081119 re2 (~> 1.1.1)
11091120 recaptcha (~> 3.0)
1110− redcarpet (~> 3.4)
11111121 redis (~> 3.2)
11121122 redis-namespace (~> 1.6.0)
11131123 redis-rails (~> 5.0.2)
@@ -1128,8 +1138,7 @@ DEPENDENCIES
11281138 ruby-progressbar
11291139 ruby_parser (~> 3.8)
11301140 rubyzip (~> 1.2.2)
1131− rufus-scheduler (~> 3.4)
1132− rugged (~> 0.27)
1141+ rugged (~> 0.28)
11331142 sanitize (~> 4.6)
11341143 sass (~> 3.5)
11351144 sass-rails (~> 5.0.6)
@@ -1142,14 +1151,14 @@ DEPENDENCIES
11421151 sham_rack (~> 1.3.6)
11431152 shoulda-matchers (~> 3.1.2)
11441153 sidekiq (~> 5.2.1)
1145− sidekiq-cron (~> 0.6.0)
1154+ sidekiq-cron (~> 1.0)
11461155 simple_po_parser (~> 1.1.2)
11471156 simplecov (~> 0.14.0)
11481157 slack-notifier (~> 1.5.1)
11491158 spring (~> 2.0.0)
11501159 spring-commands-rspec (~> 1.0.4)
11511160 sprockets (~> 3.7.0)
1152− sshkey (~> 1.9.0)
1161+ sshkey (~> 2.0)
11531162 stackprof (~> 0.2.10)
11541163 state_machines-activerecord (~> 0.5.1)
11551164 sys-filesystem (~> 1.1.6)
@@ -1157,17 +1166,17 @@ DEPENDENCIES
11571166 thin (~> 1.7.0)
11581167 timecop (~> 0.8.0)
11591168 toml-rb (~> 1.0.0)
1160− truncato (~> 0.7.9)
1169+ truncato (~> 0.7.11)
11611170 u2f (~> 0.2.1)
11621171 uglifier (~> 2.7.2)
11631172 unf (~> 0.1.4)
1164− unicorn (~> 5.1.0)
1173+ unicorn (~> 5.4.1)
11651174 unicorn-worker-killer (~> 0.4.4)
11661175 validates_hostname (~> 1.0.6)
1167− version_sorter (~> 2.1.0)
1176+ version_sorter (~> 2.2.4)
11681177 virtus (~> 1.0.1)
11691178 vmstat (~> 2.3.0)
1170− webmock (~> 2.3.2)
1179+ webmock (~> 3.5.1)
11711180 webpack-rails (~> 0.9.10)
11721181 wikicloth (= 0.8.1)
11731182
pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+141−109
@@ -309,10 +309,10 @@
309309 dependencies = ["msgpack"];
310310 source = {
311311 remotes = ["https://rubygems.org"];
312− sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
312+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
313313 type = "gem";
314314 };
315− version = "1.3.2";
315+ version = "1.4.1";
316316 };
317317 bootstrap_form = {
318318 source = {
@@ -407,6 +407,14 @@
407407 };
408408 version = "0.1";
409409 };
410+ character_set = {
411+ source = {
412+ remotes = ["https://rubygems.org"];
413+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
414+ type = "gem";
415+ };
416+ version = "1.1.2";
417+ };
410418 charlock_holmes = {
411419 source = {
412420 remotes = ["https://rubygems.org"];
@@ -587,10 +595,10 @@
587595 dependencies = ["html-pipeline"];
588596 source = {
589597 remotes = ["https://rubygems.org"];
590− sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
598+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
591599 type = "gem";
592600 };
593− version = "2.0.0";
601+ version = "2.2.0";
594602 };
595603 declarative = {
596604 source = {
@@ -772,10 +780,10 @@
772780 dependencies = ["tzinfo"];
773781 source = {
774782 remotes = ["https://rubygems.org"];
775− sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
783+ sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp";
776784 type = "gem";
777785 };
778− version = "1.0.3";
786+ version = "1.1.7";
779787 };
780788 eventmachine = {
781789 source = {
@@ -881,10 +889,10 @@
881889 ffi = {
882890 source = {
883891 remotes = ["https://rubygems.org"];
884− sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
892+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
885893 type = "gem";
886894 };
887− version = "1.9.25";
895+ version = "1.10.0";
888896 };
889897 flipper = {
890898 source = {
@@ -925,64 +933,64 @@
925933 dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
926934 source = {
927935 remotes = ["https://rubygems.org"];
928− sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
936+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
929937 type = "gem";
930938 };
931− version = "0.2.0";
939+ version = "0.3.3";
932940 };
933941 fog-aws = {
934942 dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
935943 source = {
936944 remotes = ["https://rubygems.org"];
937− sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
945+ sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
938946 type = "gem";
939947 };
940− version = "2.0.1";
948+ version = "3.3.0";
941949 };
942950 fog-core = {
943− dependencies = ["builder" "excon" "formatador"];
951+ dependencies = ["builder" "excon" "formatador" "mime-types"];
944952 source = {
945953 remotes = ["https://rubygems.org"];
946− sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
954+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
947955 type = "gem";
948956 };
949− version = "1.45.0";
957+ version = "2.1.0";
950958 };
951959 fog-google = {
952960 dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
953961 source = {
954962 remotes = ["https://rubygems.org"];
955− sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
963+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
956964 type = "gem";
957965 };
958− version = "1.7.1";
966+ version = "1.8.2";
959967 };
960968 fog-json = {
961969 dependencies = ["fog-core" "multi_json"];
962970 source = {
963971 remotes = ["https://rubygems.org"];
964− sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
972+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
965973 type = "gem";
966974 };
967− version = "1.0.2";
975+ version = "1.2.0";
968976 };
969977 fog-local = {
970978 dependencies = ["fog-core"];
971979 source = {
972980 remotes = ["https://rubygems.org"];
973− sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
981+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
974982 type = "gem";
975983 };
976− version = "0.3.1";
984+ version = "0.6.0";
977985 };
978986 fog-openstack = {
979987 dependencies = ["fog-core" "fog-json" "ipaddress"];
980988 source = {
981989 remotes = ["https://rubygems.org"];
982− sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
990+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
983991 type = "gem";
984992 };
985− version = "0.1.21";
993+ version = "1.0.8";
986994 };
987995 fog-rackspace = {
988996 dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1028,6 +1036,15 @@
10281036 };
10291037 version = "0.2.5";
10301038 };
1039+ fugit = {
1040+ dependencies = ["et-orbi" "raabro"];
1041+ source = {
1042+ remotes = ["https://rubygems.org"];
1043+ sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
1044+ type = "gem";
1045+ };
1046+ version = "1.1.7";
1047+ };
10311048 fuubar = {
10321049 dependencies = ["rspec-core" "ruby-progressbar"];
10331050 source = {
@@ -1085,10 +1102,10 @@
10851102 dependencies = ["grpc"];
10861103 source = {
10871104 remotes = ["https://rubygems.org"];
1088− sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
1105+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
10891106 type = "gem";
10901107 };
1091− version = "1.5.0";
1108+ version = "1.13.0";
10921109 };
10931110 github-markup = {
10941111 source = {
@@ -1130,19 +1147,19 @@
11301147 dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
11311148 source = {
11321149 remotes = ["https://rubygems.org"];
1133− sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
1150+ sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa";
11341151 type = "gem";
11351152 };
1136− version = "2.4.1";
1153+ version = "2.5.1";
11371154 };
11381155 gitlab_omniauth-ldap = {
11391156 dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
11401157 source = {
11411158 remotes = ["https://rubygems.org"];
1142− sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
1159+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
11431160 type = "gem";
11441161 };
1145− version = "2.0.4";
1162+ version = "2.1.1";
11461163 };
11471164 globalid = {
11481165 dependencies = ["activesupport"];
@@ -1183,10 +1200,10 @@
11831200 dependencies = ["google-protobuf"];
11841201 source = {
11851202 remotes = ["https://rubygems.org"];
1186− sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
1203+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
11871204 type = "gem";
11881205 };
1189− version = "1.0.2";
1206+ version = "1.0.3";
11901207 };
11911208 googleauth = {
11921209 dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1306,10 +1323,10 @@
13061323 hashdiff = {
13071324 source = {
13081325 remotes = ["https://rubygems.org"];
1309− sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
1326+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
13101327 type = "gem";
13111328 };
1312− version = "0.3.4";
1329+ version = "0.3.8";
13131330 };
13141331 hashie = {
13151332 source = {
@@ -1337,15 +1354,6 @@
13371354 };
13381355 version = "2.6.0";
13391356 };
1340− hipchat = {
1341− dependencies = ["httparty" "mimemagic"];
1342− source = {
1343− remotes = ["https://rubygems.org"];
1344− sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
1345− type = "gem";
1346− };
1347− version = "1.5.2";
1348− };
13491357 html-pipeline = {
13501358 dependencies = ["activesupport" "nokogiri"];
13511359 source = {
@@ -1465,6 +1473,15 @@
14651473 };
14661474 version = "0.8.3";
14671475 };
1476+ jaeger-client = {
1477+ dependencies = ["opentracing" "thrift"];
1478+ source = {
1479+ remotes = ["https://rubygems.org"];
1480+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
1481+ type = "gem";
1482+ };
1483+ version = "0.10.0";
1484+ };
14681485 jira-ruby = {
14691486 dependencies = ["activesupport" "multipart-post" "oauth"];
14701487 source = {
@@ -1483,13 +1500,13 @@
14831500 version = "1.3.2";
14841501 };
14851502 js_regex = {
1486− dependencies = ["regexp_parser"];
1503+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
14871504 source = {
14881505 remotes = ["https://rubygems.org"];
1489− sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
1506+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
14901507 type = "gem";
14911508 };
1492− version = "2.2.1";
1509+ version = "3.1.1";
14931510 };
14941511 json = {
14951512 source = {
@@ -1563,10 +1580,10 @@
15631580 kgio = {
15641581 source = {
15651582 remotes = ["https://rubygems.org"];
1566− sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
1583+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
15671584 type = "gem";
15681585 };
1569− version = "2.10.0";
1586+ version = "2.11.2";
15701587 };
15711588 knapsack = {
15721589 dependencies = ["rake"];
@@ -1581,10 +1598,10 @@
15811598 dependencies = ["http" "recursive-open-struct" "rest-client"];
15821599 source = {
15831600 remotes = ["https://rubygems.org"];
1584− sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
1601+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
15851602 type = "gem";
15861603 };
1587− version = "4.0.0";
1604+ version = "4.2.2";
15881605 };
15891606 launchy = {
15901607 dependencies = ["addressable"];
@@ -1743,10 +1760,10 @@
17431760 mini_portile2 = {
17441761 source = {
17451762 remotes = ["https://rubygems.org"];
1746− sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
1763+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
17471764 type = "gem";
17481765 };
1749− version = "2.3.0";
1766+ version = "2.4.0";
17501767 };
17511768 minitest = {
17521769 source = {
@@ -1759,10 +1776,10 @@
17591776 msgpack = {
17601777 source = {
17611778 remotes = ["https://rubygems.org"];
1762− sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
1779+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
17631780 type = "gem";
17641781 };
1765− version = "1.2.4";
1782+ version = "1.2.6";
17661783 };
17671784 multi_json = {
17681785 source = {
@@ -1857,10 +1874,10 @@
18571874 dependencies = ["mini_portile2"];
18581875 source = {
18591876 remotes = ["https://rubygems.org"];
1860− sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
1877+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
18611878 type = "gem";
18621879 };
1863− version = "1.8.5";
1880+ version = "1.10.1";
18641881 };
18651882 nokogumbo = {
18661883 dependencies = ["nokogiri"];
@@ -2067,6 +2084,22 @@
20672084 };
20682085 version = "2.2.3";
20692086 };
2087+ opentracing = {
2088+ source = {
2089+ remotes = ["https://rubygems.org"];
2090+ sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf";
2091+ type = "gem";
2092+ };
2093+ version = "0.4.3";
2094+ };
2095+ optimist = {
2096+ source = {
2097+ remotes = ["https://rubygems.org"];
2098+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
2099+ type = "gem";
2100+ };
2101+ version = "3.0.0";
2102+ };
20702103 org-ruby = {
20712104 dependencies = ["rubypants"];
20722105 source = {
@@ -2174,10 +2207,10 @@
21742207 pg = {
21752208 source = {
21762209 remotes = ["https://rubygems.org"];
2177− sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
2210+ sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
21782211 type = "gem";
21792212 };
2180− version = "0.18.4";
2213+ version = "1.1.3";
21812214 };
21822215 po_to_json = {
21832216 dependencies = ["json"];
@@ -2299,6 +2332,14 @@
22992332 };
23002333 version = "0.0.3.3";
23012334 };
2335+ raabro = {
2336+ source = {
2337+ remotes = ["https://rubygems.org"];
2338+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
2339+ type = "gem";
2340+ };
2341+ version = "1.1.6";
2342+ };
23022343 rack = {
23032344 source = {
23042345 remotes = ["https://rubygems.org"];
@@ -2346,10 +2387,10 @@
23462387 dependencies = ["rack"];
23472388 source = {
23482389 remotes = ["https://rubygems.org"];
2349− sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
2390+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
23502391 type = "gem";
23512392 };
2352− version = "2.0.4";
2393+ version = "2.0.5";
23532394 };
23542395 rack-proxy = {
23552396 dependencies = ["rack"];
@@ -2443,10 +2484,10 @@
24432484 raindrops = {
24442485 source = {
24452486 remotes = ["https://rubygems.org"];
2446− sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
2487+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
24472488 type = "gem";
24482489 };
2449− version = "0.18.0";
2490+ version = "0.19.0";
24502491 };
24512492 rake = {
24522493 source = {
@@ -2483,13 +2524,13 @@
24832524 version = "0.3.6";
24842525 };
24852526 rbtrace = {
2486− dependencies = ["ffi" "msgpack" "trollop"];
2527+ dependencies = ["ffi" "msgpack" "optimist"];
24872528 source = {
24882529 remotes = ["https://rubygems.org"];
2489− sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
2530+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
24902531 type = "gem";
24912532 };
2492− version = "0.4.10";
2533+ version = "0.4.11";
24932534 };
24942535 rdoc = {
24952536 source = {
@@ -2524,14 +2565,6 @@
25242565 };
25252566 version = "1.1.0";
25262567 };
2527− redcarpet = {
2528− source = {
2529− remotes = ["https://rubygems.org"];
2530− sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
2531− type = "gem";
2532− };
2533− version = "3.4.0";
2534− };
25352568 RedCloth = {
25362569 source = {
25372570 remotes = ["https://rubygems.org"];
@@ -2605,10 +2638,18 @@
26052638 regexp_parser = {
26062639 source = {
26072640 remotes = ["https://rubygems.org"];
2608− sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
2641+ sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq";
26092642 type = "gem";
26102643 };
2611− version = "0.5.0";
2644+ version = "1.3.0";
2645+ };
2646+ regexp_property_values = {
2647+ source = {
2648+ remotes = ["https://rubygems.org"];
2649+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
2650+ type = "gem";
2651+ };
2652+ version = "0.3.4";
26122653 };
26132654 representable = {
26142655 dependencies = ["declarative" "declarative-option" "uber"];
@@ -2895,22 +2936,13 @@
28952936 };
28962937 version = "1.2.2";
28972938 };
2898− rufus-scheduler = {
2899− dependencies = ["et-orbi"];
2900− source = {
2901− remotes = ["https://rubygems.org"];
2902− sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
2903− type = "gem";
2904− };
2905− version = "3.4.0";
2906− };
29072939 rugged = {
29082940 source = {
29092941 remotes = ["https://rubygems.org"];
2910− sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
2942+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
29112943 type = "gem";
29122944 };
2913− version = "0.27.5";
2945+ version = "0.28.0";
29142946 };
29152947 safe_yaml = {
29162948 source = {
@@ -3045,22 +3077,22 @@
30453077 version = "3.1.2";
30463078 };
30473079 sidekiq = {
3048− dependencies = ["connection_pool" "rack-protection" "redis"];
3080+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
30493081 source = {
30503082 remotes = ["https://rubygems.org"];
3051− sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
3083+ sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29";
30523084 type = "gem";
30533085 };
3054− version = "5.2.3";
3086+ version = "5.2.5";
30553087 };
30563088 sidekiq-cron = {
3057− dependencies = ["rufus-scheduler" "sidekiq"];
3089+ dependencies = ["fugit" "sidekiq"];
30583090 source = {
30593091 remotes = ["https://rubygems.org"];
3060− sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
3092+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
30613093 type = "gem";
30623094 };
3063− version = "0.6.0";
3095+ version = "1.0.4";
30643096 };
30653097 signet = {
30663098 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3151,10 +3183,10 @@
31513183 sshkey = {
31523184 source = {
31533185 remotes = ["https://rubygems.org"];
3154− sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
3186+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
31553187 type = "gem";
31563188 };
3157− version = "1.9.0";
3189+ version = "2.0.0";
31583190 };
31593191 stackprof = {
31603192 source = {
@@ -3256,6 +3288,14 @@
32563288 };
32573289 version = "0.3.6";
32583290 };
3291+ thrift = {
3292+ source = {
3293+ remotes = ["https://rubygems.org"];
3294+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
3295+ type = "gem";
3296+ };
3297+ version = "0.11.0.0";
3298+ };
32593299 tilt = {
32603300 source = {
32613301 remotes = ["https://rubygems.org"];
@@ -3298,22 +3338,14 @@
32983338 };
32993339 version = "1.0.0";
33003340 };
3301− trollop = {
3302− source = {
3303− remotes = ["https://rubygems.org"];
3304− sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
3305− type = "gem";
3306− };
3307− version = "2.1.3";
3308− };
33093341 truncato = {
33103342 dependencies = ["htmlentities" "nokogiri"];
33113343 source = {
33123344 remotes = ["https://rubygems.org"];
3313− sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
3345+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
33143346 type = "gem";
33153347 };
3316− version = "0.7.10";
3348+ version = "0.7.11";
33173349 };
33183350 tzinfo = {
33193351 dependencies = ["thread_safe"];
@@ -3378,10 +3410,10 @@
33783410 dependencies = ["kgio" "raindrops"];
33793411 source = {
33803412 remotes = ["https://rubygems.org"];
3381− sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
3413+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
33823414 type = "gem";
33833415 };
3384− version = "5.1.0";
3416+ version = "5.4.1";
33853417 };
33863418 unicorn-worker-killer = {
33873419 dependencies = ["get_process_mem" "unicorn"];
@@ -3421,10 +3453,10 @@
34213453 version_sorter = {
34223454 source = {
34233455 remotes = ["https://rubygems.org"];
3424− sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
3456+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
34253457 type = "gem";
34263458 };
3427− version = "2.1.0";
3459+ version = "2.2.4";
34283460 };
34293461 virtus = {
34303462 dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3456,10 +3488,10 @@
34563488 dependencies = ["addressable" "crack" "hashdiff"];
34573489 source = {
34583490 remotes = ["https://rubygems.org"];
3459− sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
3491+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
34603492 type = "gem";
34613493 };
3462− version = "2.3.2";
3494+ version = "3.5.1";
34633495 };
34643496 webpack-rails = {
34653497 dependencies = ["railties"];
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+31−26
@@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
1616
1717# Supported DBs
1818gem 'mysql2', '~> 0.4.10', group: :mysql
19−gem 'pg', '~> 0.18.2', group: :postgres
19+gem 'pg', '~> 1.1', group: :postgres
2020
21−gem 'rugged', '~> 0.27'
21+gem 'rugged', '~> 0.28'
2222gem 'grape-path-helpers', '~> 1.0'
2323
2424gem 'faraday', '~> 0.12'
@@ -71,7 +71,7 @@ gem 'gpgme', '~> 2.0.18'
7171# LDAP Auth
7272# GitLab fork with several improvements to original library. For full list of changes
7373# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
74−gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
74+gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
7575gem 'net-ldap'
7676
7777# API
@@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3'
9797gem 'mini_magick'
9898
9999# for backups
100−gem 'fog-aws', '~> 2.0.1'
101−gem 'fog-core', '~> 1.44'
102−gem 'fog-google', '~> 1.7.1'
103−gem 'fog-local', '~> 0.3'
104−gem 'fog-openstack', '~> 0.1'
100+gem 'fog-aws', '~> 3.3'
101+# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
102+# Also see config/initializers/fog_core_patch.rb.
103+gem 'fog-core', '= 2.1.0'
104+gem 'fog-google', '~> 1.8'
105+gem 'fog-local', '~> 0.6'
106+gem 'fog-openstack', '~> 1.0'
105107gem 'fog-rackspace', '~> 0.1.1'
106−gem 'fog-aliyun', '~> 0.2.0'
108+gem 'fog-aliyun', '~> 0.3'
107109
108110# for Google storage
109111gem 'google-api-client', '~> 0.23'
@@ -123,10 +125,9 @@ gem 'faraday_middleware-aws-signers-v4'
123125
124126# Markdown and HTML processing
125127gem 'html-pipeline', '~> 2.8'
126−gem 'deckar01-task_list', '2.0.0'
128+gem 'deckar01-task_list', '2.2.0'
127129gem 'gitlab-markup', '~> 1.6.5'
128130gem 'github-markup', '~> 1.7.0', require: 'github/markup'
129−gem 'redcarpet', '~> 3.4'
130131gem 'commonmarker', '~> 0.17'
131132gem 'RedCloth', '~> 4.3.2'
132133gem 'rdoc', '~> 6.0'
@@ -136,9 +137,9 @@ gem 'wikicloth', '0.8.1'
136137gem 'asciidoctor', '~> 1.5.8'
137138gem 'asciidoctor-plantuml', '0.0.8'
138139gem 'rouge', '~> 3.1'
139−gem 'truncato', '~> 0.7.9'
140+gem 'truncato', '~> 0.7.11'
140141gem 'bootstrap_form', '~> 2.7.0'
141−gem 'nokogiri', '~> 1.8.5'
142+gem 'nokogiri', '~> 1.10.1'
142143gem 'escape_utils', '~> 1.1'
143144
144145# Calendar rendering
@@ -154,7 +155,7 @@ gem 'diffy', '~> 3.1.0'
154155gem 'rack', '2.0.6'
155156
156157group :unicorn do
157− gem 'unicorn', '~> 5.1.0'
158+ gem 'unicorn', '~> 5.4.1'
158159 gem 'unicorn-worker-killer', '~> 0.4.4'
159160end
160161
@@ -171,12 +172,12 @@ gem 'acts-as-taggable-on', '~> 5.0'
171172
172173# Background jobs
173174gem 'sidekiq', '~> 5.2.1'
174−gem 'sidekiq-cron', '~> 0.6.0'
175+gem 'sidekiq-cron', '~> 1.0'
175176gem 'redis-namespace', '~> 1.6.0'
176177gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
177178
178179# Cron Parser
179−gem 'rufus-scheduler', '~> 3.4'
180+gem 'fugit', '~> 1.1'
180181
181182# HTTP requests
182183gem 'httparty', '~> 0.13.3'
@@ -195,10 +196,10 @@ gem 're2', '~> 1.1.1'
195196
196197# Misc
197198
198−gem 'version_sorter', '~> 2.1.0'
199+gem 'version_sorter', '~> 2.2.4'
199200
200201# Export Ruby Regex to Javascript
201−gem 'js_regex', '~> 2.2.1'
202+gem 'js_regex', '~> 3.1'
202203
203204# User agent parsing
204205gem 'device_detector'
@@ -213,9 +214,6 @@ gem 'connection_pool', '~> 2.0'
213214# Discord integration
214215gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
215216
216−# HipChat integration
217−gem 'hipchat', '~> 1.5.0'
218−
219217# JIRA integration
220218gem 'jira-ruby', '~> 1.4'
221219
@@ -235,7 +233,7 @@ gem 'asana', '~> 0.8.1'
235233gem 'ruby-fogbugz', '~> 0.2.1'
236234
237235# Kubernetes integration
238−gem 'kubeclient', '~> 4.0.0'
236+gem 'kubeclient', '~> 4.2.2'
239237
240238# Sanitize user input
241239gem 'sanitize', '~> 4.6'
@@ -317,6 +315,12 @@ group :metrics do
317315 gem 'raindrops', '~> 0.18'
318316end
319317
318+group :tracing do
319+ # OpenTracing
320+ gem 'opentracing', '~> 0.4.3'
321+ gem 'jaeger-client', '~> 0.10.0'
322+end
323+
320324group :development do
321325 gem 'foreman', '~> 0.84.0'
322326 gem 'brakeman', '~> 4.2', require: false
@@ -333,7 +337,7 @@ group :development do
333337end
334338
335339group :development, :test do
336− gem 'bootsnap', '~> 1.3'
340+ gem 'bootsnap', '~> 1.4'
337341 gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
338342 gem 'pry-byebug', '~> 3.5.1', platform: :mri
339343 gem 'pry-rails', '~> 0.3.4'
@@ -390,7 +394,7 @@ group :test do
390394 gem 'shoulda-matchers', '~> 3.1.2', require: false
391395 gem 'email_spec', '~> 2.2.0'
392396 gem 'json-schema', '~> 2.8.0'
393− gem 'webmock', '~> 2.3.2'
397+ gem 'webmock', '~> 3.5.1'
394398 gem 'rails-controller-testing'
395399 gem 'sham_rack', '~> 1.3.6'
396400 gem 'concurrent-ruby', '~> 1.1'
@@ -423,7 +427,7 @@ gem 'net-ntp'
423427
424428# SSH host key support
425429gem 'net-ssh', '~> 5.0'
426−gem 'sshkey', '~> 1.9.0'
430+gem 'sshkey', '~> 2.0'
427431
428432# Required for ED25519 SSH host key support
429433group :ed25519 do
@@ -432,7 +436,8 @@ group :ed25519 do
432436end
433437
434438# Gitaly GRPC client
435−gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
439+gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
440+
436441gem 'grpc', '~> 1.15.0'
437442
438443gem 'google-protobuf', '~> 3.6'
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+90−81
@@ -93,7 +93,7 @@ GEM
9393 binding_ninja (0.2.2)
9494 binding_of_caller (0.8.0)
9595 debug_inspector (>= 0.0.1)
96− bootsnap (1.3.2)
96+ bootsnap (1.4.1)
9797 msgpack (~> 1.0)
9898 bootstrap_form (2.7.0)
9999 brakeman (4.2.1)
@@ -121,6 +121,7 @@ GEM
121121 activesupport (>= 4.0.0)
122122 mime-types (>= 1.16)
123123 cause (0.1)
124+ character_set (1.1.2)
124125 charlock_holmes (0.7.6)
125126 childprocess (0.9.0)
126127 ffi (~> 1.0, >= 1.0.11)
@@ -151,7 +152,7 @@ GEM
151152 database_cleaner (1.7.0)
152153 debug_inspector (0.0.3)
153154 debugger-ruby_core_source (1.3.8)
154− deckar01-task_list (2.0.0)
155+ deckar01-task_list (2.2.0)
155156 html-pipeline
156157 declarative (0.0.10)
157158 declarative-option (0.1.0)
@@ -206,7 +207,7 @@ GEM
206207 erubi (1.7.1)
207208 erubis (2.7.0)
208209 escape_utils (1.2.1)
209− et-orbi (1.0.3)
210+ et-orbi (1.1.7)
210211 tzinfo
211212 eventmachine (1.2.7)
212213 excon (0.62.0)
@@ -230,7 +231,7 @@ GEM
230231 fast_blank (1.0.0)
231232 fast_gettext (1.6.0)
232233 ffaker (2.10.0)
233− ffi (1.9.25)
234+ ffi (1.10.0)
234235 flipper (0.13.0)
235236 flipper-active_record (0.13.0)
236237 activerecord (>= 3.2, < 6)
@@ -241,32 +242,33 @@ GEM
241242 flowdock (0.7.1)
242243 httparty (~> 0.7)
243244 multi_json
244− fog-aliyun (0.2.0)
245− fog-core (~> 1.27)
246− fog-json (~> 1.0)
245+ fog-aliyun (0.3.3)
246+ fog-core
247+ fog-json
247248 ipaddress (~> 0.8)
248249 xml-simple (~> 1.1)
249− fog-aws (2.0.1)
250− fog-core (~> 1.38)
251− fog-json (~> 1.0)
250+ fog-aws (3.3.0)
251+ fog-core (~> 2.1)
252+ fog-json (~> 1.1)
252253 fog-xml (~> 0.1)
253254 ipaddress (~> 0.8)
254− fog-core (1.45.0)
255+ fog-core (2.1.0)
255256 builder
256257 excon (~> 0.58)
257258 formatador (~> 0.2)
258− fog-google (1.7.1)
259− fog-core
260− fog-json
261− fog-xml
259+ mime-types
260+ fog-google (1.8.2)
261+ fog-core (<= 2.1.0)
262+ fog-json (~> 1.2)
263+ fog-xml (~> 0.1.0)
262264 google-api-client (~> 0.23.0)
263− fog-json (1.0.2)
264− fog-core (~> 1.0)
265+ fog-json (1.2.0)
266+ fog-core
265267 multi_json (~> 1.10)
266− fog-local (0.3.1)
267− fog-core (~> 1.27)
268− fog-openstack (0.1.21)
269− fog-core (>= 1.40)
268+ fog-local (0.6.0)
269+ fog-core (>= 1.27, < 3.0)
270+ fog-openstack (1.0.8)
271+ fog-core (~> 2.1)
270272 fog-json (>= 1.0)
271273 ipaddress (>= 0.8)
272274 fog-rackspace (0.1.1)
@@ -282,6 +284,9 @@ GEM
282284 foreman (0.84.0)
283285 thor (~> 0.19.1)
284286 formatador (0.2.5)
287+ fugit (1.1.7)
288+ et-orbi (~> 1.1, >= 1.1.7)
289+ raabro (~> 1.1)
285290 fuubar (2.2.0)
286291 rspec-core (~> 3.0)
287292 ruby-progressbar (~> 1.4)
@@ -298,7 +303,7 @@ GEM
298303 gettext_i18n_rails (>= 0.7.1)
299304 po_to_json (>= 1.0.0)
300305 rails (>= 3.2.0)
301− gitaly-proto (1.5.0)
306+ gitaly-proto (1.13.0)
302307 grpc (~> 1.0)
303308 github-markup (1.7.0)
304309 gitlab-default_value_for (3.1.1)
@@ -307,11 +312,11 @@ GEM
307312 gitlab-markup (1.6.5)
308313 gitlab-sidekiq-fetcher (0.4.0)
309314 sidekiq (~> 5)
310− gitlab-styles (2.4.1)
315+ gitlab-styles (2.5.1)
311316 rubocop (~> 0.54.0)
312317 rubocop-gitlab-security (~> 0.1.0)
313318 rubocop-rspec (~> 1.19)
314− gitlab_omniauth-ldap (2.0.4)
319+ gitlab_omniauth-ldap (2.1.1)
315320 net-ldap (~> 0.16)
316321 omniauth (~> 1.3)
317322 pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -330,7 +335,7 @@ GEM
330335 representable (~> 3.0)
331336 retriable (>= 2.0, < 4.0)
332337 google-protobuf (3.6.1)
333− googleapis-common-protos-types (1.0.2)
338+ googleapis-common-protos-types (1.0.3)
334339 google-protobuf (~> 3.0)
335340 googleauth (0.6.6)
336341 faraday (~> 0.12)
@@ -380,15 +385,12 @@ GEM
380385 thor
381386 tilt
382387 hangouts-chat (0.0.5)
383− hashdiff (0.3.4)
388+ hashdiff (0.3.8)
384389 hashie (3.5.7)
385390 hashie-forbidden_attributes (0.1.1)
386391 hashie (>= 3.0)
387392 health_check (2.6.0)
388393 rails (>= 4.0)
389− hipchat (1.5.2)
390− httparty
391− mimemagic
392394 html-pipeline (2.8.4)
393395 activesupport (>= 2)
394396 nokogiri (>= 1.4)
@@ -416,14 +418,19 @@ GEM
416418 cause
417419 json
418420 ipaddress (0.8.3)
421+ jaeger-client (0.10.0)
422+ opentracing (~> 0.3)
423+ thrift
419424 jira-ruby (1.4.1)
420425 activesupport
421426 multipart-post
422427 oauth (~> 0.5, >= 0.5.0)
423428 jmespath (1.3.1)
424429 jquery-atwho-rails (1.3.2)
425− js_regex (2.2.1)
426− regexp_parser (>= 0.4.11, <= 0.5.0)
430+ js_regex (3.1.1)
431+ character_set (~> 1.1)
432+ regexp_parser (~> 1.1)
433+ regexp_property_values (~> 0.3)
427434 json (1.8.6)
428435 json-jwt (1.9.4)
429436 activesupport
@@ -444,10 +451,10 @@ GEM
444451 activerecord
445452 kaminari-core (= 1.0.1)
446453 kaminari-core (1.0.1)
447− kgio (2.10.0)
454+ kgio (2.11.2)
448455 knapsack (1.17.0)
449456 rake
450− kubeclient (4.0.0)
457+ kubeclient (4.2.2)
451458 http (~> 3.0)
452459 recursive-open-struct (~> 1.0, >= 1.0.4)
453460 rest-client (~> 2.0)
@@ -490,9 +497,9 @@ GEM
490497 mimemagic (0.3.2)
491498 mini_magick (4.8.0)
492499 mini_mime (1.0.1)
493− mini_portile2 (2.3.0)
500+ mini_portile2 (2.4.0)
494501 minitest (5.11.3)
495− msgpack (1.2.4)
502+ msgpack (1.2.6)
496503 multi_json (1.13.1)
497504 multi_xml (0.6.0)
498505 multipart-post (2.0.0)
@@ -507,8 +514,8 @@ GEM
507514 net-ssh (5.0.1)
508515 netrc (0.11.0)
509516 nio4r (2.3.1)
510− nokogiri (1.8.5)
511− mini_portile2 (~> 2.3.0)
517+ nokogiri (1.10.1)
518+ mini_portile2 (~> 2.4.0)
512519 nokogumbo (1.5.0)
513520 nokogiri
514521 numerizer (0.1.1)
@@ -574,6 +581,8 @@ GEM
574581 activesupport
575582 nokogiri (>= 1.4.4)
576583 omniauth (~> 1.0)
584+ opentracing (0.4.3)
585+ optimist (3.0.0)
577586 org-ruby (0.9.12)
578587 rubypants (~> 0.2)
579588 orm_adapter (0.5.0)
@@ -605,7 +614,7 @@ GEM
605614 atomic (>= 1.0.0)
606615 peek
607616 redis
608− pg (0.18.4)
617+ pg (1.1.3)
609618 po_to_json (1.0.1)
610619 json (>= 1.6.0)
611620 powerpack (0.1.1)
@@ -636,6 +645,7 @@ GEM
636645 get_process_mem (~> 0.2)
637646 puma (>= 2.7, < 4)
638647 pyu-ruby-sasl (0.0.3.3)
648+ raabro (1.1.6)
639649 rack (2.0.6)
640650 rack-accept (0.4.5)
641651 rack (>= 0.4)
@@ -648,7 +658,7 @@ GEM
648658 httpclient (>= 2.4)
649659 multi_json (>= 1.3.6)
650660 rack (>= 1.1)
651− rack-protection (2.0.4)
661+ rack-protection (2.0.5)
652662 rack
653663 rack-proxy (0.6.0)
654664 rack
@@ -687,23 +697,22 @@ GEM
687697 rake (>= 0.8.7)
688698 thor (>= 0.18.1, < 2.0)
689699 rainbow (3.0.0)
690− raindrops (0.18.0)
700+ raindrops (0.19.0)
691701 rake (12.3.2)
692702 rb-fsevent (0.10.2)
693703 rb-inotify (0.9.10)
694704 ffi (>= 0.5.0, < 2)
695705 rblineprof (0.3.6)
696706 debugger-ruby_core_source (~> 1.3)
697− rbtrace (0.4.10)
707+ rbtrace (0.4.11)
698708 ffi (>= 1.0.6)
699709 msgpack (>= 0.4.3)
700− trollop (>= 1.16.2)
710+ optimist (>= 3.0.0)
701711 rdoc (6.0.4)
702712 re2 (1.1.1)
703713 recaptcha (3.0.0)
704714 json
705715 recursive-open-struct (1.1.0)
706− redcarpet (3.4.0)
707716 redis (3.3.5)
708717 redis-actionpack (5.0.2)
709718 actionpack (>= 4.0, < 6)
@@ -723,7 +732,8 @@ GEM
723732 redis-store (>= 1.2, < 2)
724733 redis-store (1.6.0)
725734 redis (>= 2.2, < 5)
726− regexp_parser (0.5.0)
735+ regexp_parser (1.3.0)
736+ regexp_property_values (0.3.4)
727737 representable (3.0.4)
728738 declarative (< 0.1.0)
729739 declarative-option (< 0.2.0)
@@ -805,9 +815,7 @@ GEM
805815 rubyntlm (0.6.2)
806816 rubypants (0.2.0)
807817 rubyzip (1.2.2)
808− rufus-scheduler (3.4.0)
809− et-orbi (~> 1.0)
810− rugged (0.27.5)
818+ rugged (0.28.0)
811819 safe_yaml (1.0.4)
812820 sanitize (4.6.6)
813821 crass (~> 1.0.2)
@@ -846,12 +854,13 @@ GEM
846854 rack
847855 shoulda-matchers (3.1.2)
848856 activesupport (>= 4.0.0)
849− sidekiq (5.2.3)
857+ sidekiq (5.2.5)
850858 connection_pool (~> 2.2, >= 2.2.2)
859+ rack (>= 1.5.0)
851860 rack-protection (>= 1.5.0)
852861 redis (>= 3.3.5, < 5)
853− sidekiq-cron (0.6.0)
854− rufus-scheduler (>= 3.3.0)
862+ sidekiq-cron (1.0.4)
863+ fugit (~> 1.1)
855864 sidekiq (>= 4.2.1)
856865 signet (0.11.0)
857866 addressable (~> 2.3)
@@ -877,7 +886,7 @@ GEM
877886 activesupport (>= 4.0)
878887 sprockets (>= 3.0.0)
879888 sqlite3 (1.3.13)
880− sshkey (1.9.0)
889+ sshkey (2.0.0)
881890 stackprof (0.2.10)
882891 state_machines (0.5.0)
883892 state_machines-activemodel (0.5.1)
@@ -898,6 +907,7 @@ GEM
898907 rack (>= 1, < 3)
899908 thor (0.19.4)
900909 thread_safe (0.3.6)
910+ thrift (0.11.0.0)
901911 tilt (2.0.8)
902912 timecop (0.8.1)
903913 timfel-krb5-auth (0.8.3)
@@ -905,10 +915,9 @@ GEM
905915 parslet (~> 1.8.0)
906916 toml-rb (1.0.0)
907917 citrus (~> 3.0, > 3.0)
908− trollop (2.1.3)
909− truncato (0.7.10)
918+ truncato (0.7.11)
910919 htmlentities (~> 4.3.1)
911− nokogiri (~> 1.8.0, >= 1.7.0)
920+ nokogiri (>= 1.7.0, <= 2.0)
912921 tzinfo (1.2.5)
913922 thread_safe (~> 0.1)
914923 u2f (0.2.1)
@@ -920,7 +929,7 @@ GEM
920929 unf_ext
921930 unf_ext (0.0.7.5)
922931 unicode-display_width (1.3.2)
923− unicorn (5.1.0)
932+ unicorn (5.4.1)
924933 kgio (~> 2.6)
925934 raindrops (~> 0.7)
926935 unicorn-worker-killer (0.4.4)
@@ -938,7 +947,7 @@ GEM
938947 validates_hostname (1.0.6)
939948 activerecord (>= 3.0)
940949 activesupport (>= 3.0)
941− version_sorter (2.1.0)
950+ version_sorter (2.2.4)
942951 virtus (1.0.5)
943952 axiom-types (~> 0.1)
944953 coercible (~> 1.0)
@@ -947,7 +956,7 @@ GEM
947956 vmstat (2.3.0)
948957 warden (1.2.7)
949958 rack (>= 1.0)
950− webmock (2.3.2)
959+ webmock (3.5.1)
951960 addressable (>= 2.3.6)
952961 crack (>= 0.3.2)
953962 hashdiff
@@ -988,7 +997,7 @@ DEPENDENCIES
988997 benchmark-ips (~> 2.3.0)
989998 better_errors (~> 2.5.0)
990999 binding_of_caller (~> 0.8.0)
991− bootsnap (~> 1.3)
1000+ bootsnap (~> 1.4)
9921001 bootstrap_form (~> 2.7.0)
9931002 brakeman (~> 4.2)
9941003 browser (~> 2.5)
@@ -1005,7 +1014,7 @@ DEPENDENCIES
10051014 connection_pool (~> 2.0)
10061015 creole (~> 0.5.0)
10071016 database_cleaner (~> 1.7.0)
1008− deckar01-task_list (= 2.0.0)
1017+ deckar01-task_list (= 2.2.0)
10091018 device_detector
10101019 devise (~> 4.4)
10111020 devise-two-factor (~> 3.0.0)
@@ -1029,28 +1038,29 @@ DEPENDENCIES
10291038 flipper-active_record (~> 0.13.0)
10301039 flipper-active_support_cache_store (~> 0.13.0)
10311040 flowdock (~> 0.7)
1032− fog-aliyun (~> 0.2.0)
1033− fog-aws (~> 2.0.1)
1034− fog-core (~> 1.44)
1035− fog-google (~> 1.7.1)
1036− fog-local (~> 0.3)
1037− fog-openstack (~> 0.1)
1041+ fog-aliyun (~> 0.3)
1042+ fog-aws (~> 3.3)
1043+ fog-core (= 2.1.0)
1044+ fog-google (~> 1.8)
1045+ fog-local (~> 0.6)
1046+ fog-openstack (~> 1.0)
10381047 fog-rackspace (~> 0.1.1)
10391048 font-awesome-rails (~> 4.7)
10401049 foreman (~> 0.84.0)
1050+ fugit (~> 1.1)
10411051 fuubar (~> 2.2.0)
10421052 gemojione (~> 3.3)
10431053 gettext (~> 3.2.2)
10441054 gettext_i18n_rails (~> 1.8.0)
10451055 gettext_i18n_rails_js (~> 1.3)
1046− gitaly-proto (~> 1.5.0)
1056+ gitaly-proto (~> 1.13.0)
10471057 github-markup (~> 1.7.0)
10481058 gitlab-default_value_for (~> 3.1.1)
10491059 gitlab-license (~> 1.0)
10501060 gitlab-markup (~> 1.6.5)
10511061 gitlab-sidekiq-fetcher (~> 0.4.0)
10521062 gitlab-styles (~> 2.4)
1053− gitlab_omniauth-ldap (~> 2.0.4)
1063+ gitlab_omniauth-ldap (~> 2.1.1)
10541064 gon (~> 6.2)
10551065 google-api-client (~> 0.23)
10561066 google-protobuf (~> 3.6)
@@ -1068,20 +1078,20 @@ DEPENDENCIES
10681078 hangouts-chat (~> 0.0.5)
10691079 hashie-forbidden_attributes
10701080 health_check (~> 2.6.0)
1071− hipchat (~> 1.5.0)
10721081 html-pipeline (~> 2.8)
10731082 html2text
10741083 httparty (~> 0.13.3)
10751084 icalendar
10761085 influxdb (~> 0.2)
1086+ jaeger-client (~> 0.10.0)
10771087 jira-ruby (~> 1.4)
10781088 jquery-atwho-rails (~> 1.3.2)
1079− js_regex (~> 2.2.1)
1089+ js_regex (~> 3.1)
10801090 json-schema (~> 2.8.0)
10811091 jwt (~> 2.1.0)
10821092 kaminari (~> 1.0)
10831093 knapsack (~> 1.17)
1084− kubeclient (~> 4.0.0)
1094+ kubeclient (~> 4.2.2)
10851095 letter_opener_web (~> 1.3.0)
10861096 license_finder (~> 5.4)
10871097 licensee (~> 8.9)
@@ -1098,7 +1108,7 @@ DEPENDENCIES
10981108 net-ldap
10991109 net-ntp
11001110 net-ssh (~> 5.0)
1101− nokogiri (~> 1.8.5)
1111+ nokogiri (~> 1.10.1)
11021112 oauth2 (~> 1.4)
11031113 octokit (~> 4.9)
11041114 omniauth (~> 1.8)
@@ -1116,6 +1126,7 @@ DEPENDENCIES
11161126 omniauth-shibboleth (~> 1.3.0)
11171127 omniauth-twitter (~> 1.4)
11181128 omniauth_crowd (~> 2.2.0)
1129+ opentracing (~> 0.4.3)
11191130 org-ruby (~> 0.9.12)
11201131 peek (~> 1.0.1)
11211132 peek-gc (~> 0.0.2)
@@ -1123,7 +1134,7 @@ DEPENDENCIES
11231134 peek-pg (~> 1.3.0)
11241135 peek-rblineprof (~> 0.2.0)
11251136 peek-redis (~> 1.2.0)
1126− pg (~> 0.18.2)
1137+ pg (~> 1.1)
11271138 premailer-rails (~> 1.9.7)
11281139 prometheus-client-mmap (~> 0.9.4)
11291140 pry-byebug (~> 3.5.1)
@@ -1146,7 +1157,6 @@ DEPENDENCIES
11461157 rdoc (~> 6.0)
11471158 re2 (~> 1.1.1)
11481159 recaptcha (~> 3.0)
1149− redcarpet (~> 3.4)
11501160 redis (~> 3.2)
11511161 redis-namespace (~> 1.6.0)
11521162 redis-rails (~> 5.0.2)
@@ -1167,8 +1177,7 @@ DEPENDENCIES
11671177 ruby-progressbar
11681178 ruby_parser (~> 3.8)
11691179 rubyzip (~> 1.2.2)
1170− rufus-scheduler (~> 3.4)
1171− rugged (~> 0.27)
1180+ rugged (~> 0.28)
11721181 sanitize (~> 4.6)
11731182 sass (~> 3.5)
11741183 sass-rails (~> 5.0.6)
@@ -1181,14 +1190,14 @@ DEPENDENCIES
11811190 sham_rack (~> 1.3.6)
11821191 shoulda-matchers (~> 3.1.2)
11831192 sidekiq (~> 5.2.1)
1184− sidekiq-cron (~> 0.6.0)
1193+ sidekiq-cron (~> 1.0)
11851194 simple_po_parser (~> 1.1.2)
11861195 simplecov (~> 0.14.0)
11871196 slack-notifier (~> 1.5.1)
11881197 spring (~> 2.0.0)
11891198 spring-commands-rspec (~> 1.0.4)
11901199 sprockets (~> 3.7.0)
1191− sshkey (~> 1.9.0)
1200+ sshkey (~> 2.0)
11921201 stackprof (~> 0.2.10)
11931202 state_machines-activerecord (~> 0.5.1)
11941203 sys-filesystem (~> 1.1.6)
@@ -1196,17 +1205,17 @@ DEPENDENCIES
11961205 thin (~> 1.7.0)
11971206 timecop (~> 0.8.0)
11981207 toml-rb (~> 1.0.0)
1199− truncato (~> 0.7.9)
1208+ truncato (~> 0.7.11)
12001209 u2f (~> 0.2.1)
12011210 uglifier (~> 2.7.2)
12021211 unf (~> 0.1.4)
1203− unicorn (~> 5.1.0)
1212+ unicorn (~> 5.4.1)
12041213 unicorn-worker-killer (~> 0.4.4)
12051214 validates_hostname (~> 1.0.6)
1206− version_sorter (~> 2.1.0)
1215+ version_sorter (~> 2.2.4)
12071216 virtus (~> 1.0.1)
12081217 vmstat (~> 2.3.0)
1209− webmock (~> 2.3.2)
1218+ webmock (~> 3.5.1)
12101219 webpack-rails (~> 0.9.10)
12111220 wikicloth (= 0.8.1)
12121221
pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+141−109
@@ -344,10 +344,10 @@
344344 dependencies = ["msgpack"];
345345 source = {
346346 remotes = ["https://rubygems.org"];
347− sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
347+ sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
348348 type = "gem";
349349 };
350− version = "1.3.2";
350+ version = "1.4.1";
351351 };
352352 bootstrap_form = {
353353 source = {
@@ -442,6 +442,14 @@
442442 };
443443 version = "0.1";
444444 };
445+ character_set = {
446+ source = {
447+ remotes = ["https://rubygems.org"];
448+ sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9";
449+ type = "gem";
450+ };
451+ version = "1.1.2";
452+ };
445453 charlock_holmes = {
446454 source = {
447455 remotes = ["https://rubygems.org"];
@@ -622,10 +630,10 @@
622630 dependencies = ["html-pipeline"];
623631 source = {
624632 remotes = ["https://rubygems.org"];
625− sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
633+ sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
626634 type = "gem";
627635 };
628− version = "2.0.0";
636+ version = "2.2.0";
629637 };
630638 declarative = {
631639 source = {
@@ -851,10 +859,10 @@
851859 dependencies = ["tzinfo"];
852860 source = {
853861 remotes = ["https://rubygems.org"];
854− sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
862+ sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp";
855863 type = "gem";
856864 };
857− version = "1.0.3";
865+ version = "1.1.7";
858866 };
859867 eventmachine = {
860868 source = {
@@ -969,10 +977,10 @@
969977 ffi = {
970978 source = {
971979 remotes = ["https://rubygems.org"];
972− sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
980+ sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
973981 type = "gem";
974982 };
975− version = "1.9.25";
983+ version = "1.10.0";
976984 };
977985 flipper = {
978986 source = {
@@ -1013,64 +1021,64 @@
10131021 dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
10141022 source = {
10151023 remotes = ["https://rubygems.org"];
1016− sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
1024+ sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
10171025 type = "gem";
10181026 };
1019− version = "0.2.0";
1027+ version = "0.3.3";
10201028 };
10211029 fog-aws = {
10221030 dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
10231031 source = {
10241032 remotes = ["https://rubygems.org"];
1025− sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
1033+ sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
10261034 type = "gem";
10271035 };
1028− version = "2.0.1";
1036+ version = "3.3.0";
10291037 };
10301038 fog-core = {
1031− dependencies = ["builder" "excon" "formatador"];
1039+ dependencies = ["builder" "excon" "formatador" "mime-types"];
10321040 source = {
10331041 remotes = ["https://rubygems.org"];
1034− sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
1042+ sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
10351043 type = "gem";
10361044 };
1037− version = "1.45.0";
1045+ version = "2.1.0";
10381046 };
10391047 fog-google = {
10401048 dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
10411049 source = {
10421050 remotes = ["https://rubygems.org"];
1043− sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
1051+ sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
10441052 type = "gem";
10451053 };
1046− version = "1.7.1";
1054+ version = "1.8.2";
10471055 };
10481056 fog-json = {
10491057 dependencies = ["fog-core" "multi_json"];
10501058 source = {
10511059 remotes = ["https://rubygems.org"];
1052− sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
1060+ sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
10531061 type = "gem";
10541062 };
1055− version = "1.0.2";
1063+ version = "1.2.0";
10561064 };
10571065 fog-local = {
10581066 dependencies = ["fog-core"];
10591067 source = {
10601068 remotes = ["https://rubygems.org"];
1061− sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
1069+ sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
10621070 type = "gem";
10631071 };
1064− version = "0.3.1";
1072+ version = "0.6.0";
10651073 };
10661074 fog-openstack = {
10671075 dependencies = ["fog-core" "fog-json" "ipaddress"];
10681076 source = {
10691077 remotes = ["https://rubygems.org"];
1070− sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
1078+ sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
10711079 type = "gem";
10721080 };
1073− version = "0.1.21";
1081+ version = "1.0.8";
10741082 };
10751083 fog-rackspace = {
10761084 dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@@ -1116,6 +1124,15 @@
11161124 };
11171125 version = "0.2.5";
11181126 };
1127+ fugit = {
1128+ dependencies = ["et-orbi" "raabro"];
1129+ source = {
1130+ remotes = ["https://rubygems.org"];
1131+ sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf";
1132+ type = "gem";
1133+ };
1134+ version = "1.1.7";
1135+ };
11191136 fuubar = {
11201137 dependencies = ["rspec-core" "ruby-progressbar"];
11211138 source = {
@@ -1173,10 +1190,10 @@
11731190 dependencies = ["grpc"];
11741191 source = {
11751192 remotes = ["https://rubygems.org"];
1176− sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0";
1193+ sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
11771194 type = "gem";
11781195 };
1179− version = "1.5.0";
1196+ version = "1.13.0";
11801197 };
11811198 github-markup = {
11821199 source = {
@@ -1226,19 +1243,19 @@
12261243 dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
12271244 source = {
12281245 remotes = ["https://rubygems.org"];
1229− sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
1246+ sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa";
12301247 type = "gem";
12311248 };
1232− version = "2.4.1";
1249+ version = "2.5.1";
12331250 };
12341251 gitlab_omniauth-ldap = {
12351252 dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
12361253 source = {
12371254 remotes = ["https://rubygems.org"];
1238− sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
1255+ sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
12391256 type = "gem";
12401257 };
1241− version = "2.0.4";
1258+ version = "2.1.1";
12421259 };
12431260 globalid = {
12441261 dependencies = ["activesupport"];
@@ -1279,10 +1296,10 @@
12791296 dependencies = ["google-protobuf"];
12801297 source = {
12811298 remotes = ["https://rubygems.org"];
1282− sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
1299+ sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
12831300 type = "gem";
12841301 };
1285− version = "1.0.2";
1302+ version = "1.0.3";
12861303 };
12871304 googleauth = {
12881305 dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -1411,10 +1428,10 @@
14111428 hashdiff = {
14121429 source = {
14131430 remotes = ["https://rubygems.org"];
1414− sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
1431+ sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
14151432 type = "gem";
14161433 };
1417− version = "0.3.4";
1434+ version = "0.3.8";
14181435 };
14191436 hashie = {
14201437 source = {
@@ -1442,15 +1459,6 @@
14421459 };
14431460 version = "2.6.0";
14441461 };
1445− hipchat = {
1446− dependencies = ["httparty" "mimemagic"];
1447− source = {
1448− remotes = ["https://rubygems.org"];
1449− sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
1450− type = "gem";
1451− };
1452− version = "1.5.2";
1453− };
14541462 html-pipeline = {
14551463 dependencies = ["activesupport" "nokogiri"];
14561464 source = {
@@ -1570,6 +1578,15 @@
15701578 };
15711579 version = "0.8.3";
15721580 };
1581+ jaeger-client = {
1582+ dependencies = ["opentracing" "thrift"];
1583+ source = {
1584+ remotes = ["https://rubygems.org"];
1585+ sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
1586+ type = "gem";
1587+ };
1588+ version = "0.10.0";
1589+ };
15731590 jira-ruby = {
15741591 dependencies = ["activesupport" "multipart-post" "oauth"];
15751592 source = {
@@ -1596,13 +1613,13 @@
15961613 version = "1.3.2";
15971614 };
15981615 js_regex = {
1599− dependencies = ["regexp_parser"];
1616+ dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
16001617 source = {
16011618 remotes = ["https://rubygems.org"];
1602− sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
1619+ sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq";
16031620 type = "gem";
16041621 };
1605− version = "2.2.1";
1622+ version = "3.1.1";
16061623 };
16071624 json = {
16081625 source = {
@@ -1676,10 +1693,10 @@
16761693 kgio = {
16771694 source = {
16781695 remotes = ["https://rubygems.org"];
1679− sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
1696+ sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
16801697 type = "gem";
16811698 };
1682− version = "2.10.0";
1699+ version = "2.11.2";
16831700 };
16841701 knapsack = {
16851702 dependencies = ["rake"];
@@ -1694,10 +1711,10 @@
16941711 dependencies = ["http" "recursive-open-struct" "rest-client"];
16951712 source = {
16961713 remotes = ["https://rubygems.org"];
1697− sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg";
1714+ sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn";
16981715 type = "gem";
16991716 };
1700− version = "4.0.0";
1717+ version = "4.2.2";
17011718 };
17021719 launchy = {
17031720 dependencies = ["addressable"];
@@ -1856,10 +1873,10 @@
18561873 mini_portile2 = {
18571874 source = {
18581875 remotes = ["https://rubygems.org"];
1859− sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
1876+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
18601877 type = "gem";
18611878 };
1862− version = "2.3.0";
1879+ version = "2.4.0";
18631880 };
18641881 minitest = {
18651882 source = {
@@ -1872,10 +1889,10 @@
18721889 msgpack = {
18731890 source = {
18741891 remotes = ["https://rubygems.org"];
1875− sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
1892+ sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13";
18761893 type = "gem";
18771894 };
1878− version = "1.2.4";
1895+ version = "1.2.6";
18791896 };
18801897 multi_json = {
18811898 source = {
@@ -1986,10 +2003,10 @@
19862003 dependencies = ["mini_portile2"];
19872004 source = {
19882005 remotes = ["https://rubygems.org"];
1989− sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
2006+ sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
19902007 type = "gem";
19912008 };
1992− version = "1.8.5";
2009+ version = "1.10.1";
19932010 };
19942011 nokogumbo = {
19952012 dependencies = ["nokogiri"];
@@ -2196,6 +2213,22 @@
21962213 };
21972214 version = "2.2.3";
21982215 };
2216+ opentracing = {
2217+ source = {
2218+ remotes = ["https://rubygems.org"];
2219+ sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf";
2220+ type = "gem";
2221+ };
2222+ version = "0.4.3";
2223+ };
2224+ optimist = {
2225+ source = {
2226+ remotes = ["https://rubygems.org"];
2227+ sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
2228+ type = "gem";
2229+ };
2230+ version = "3.0.0";
2231+ };
21992232 org-ruby = {
22002233 dependencies = ["rubypants"];
22012234 source = {
@@ -2303,10 +2336,10 @@
23032336 pg = {
23042337 source = {
23052338 remotes = ["https://rubygems.org"];
2306− sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
2339+ sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb";
23072340 type = "gem";
23082341 };
2309− version = "0.18.4";
2342+ version = "1.1.3";
23102343 };
23112344 po_to_json = {
23122345 dependencies = ["json"];
@@ -2428,6 +2461,14 @@
24282461 };
24292462 version = "0.0.3.3";
24302463 };
2464+ raabro = {
2465+ source = {
2466+ remotes = ["https://rubygems.org"];
2467+ sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
2468+ type = "gem";
2469+ };
2470+ version = "1.1.6";
2471+ };
24312472 rack = {
24322473 source = {
24332474 remotes = ["https://rubygems.org"];
@@ -2475,10 +2516,10 @@
24752516 dependencies = ["rack"];
24762517 source = {
24772518 remotes = ["https://rubygems.org"];
2478− sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq";
2519+ sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk";
24792520 type = "gem";
24802521 };
2481− version = "2.0.4";
2522+ version = "2.0.5";
24822523 };
24832524 rack-proxy = {
24842525 dependencies = ["rack"];
@@ -2572,10 +2613,10 @@
25722613 raindrops = {
25732614 source = {
25742615 remotes = ["https://rubygems.org"];
2575− sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
2616+ sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
25762617 type = "gem";
25772618 };
2578− version = "0.18.0";
2619+ version = "0.19.0";
25792620 };
25802621 rake = {
25812622 source = {
@@ -2612,13 +2653,13 @@
26122653 version = "0.3.6";
26132654 };
26142655 rbtrace = {
2615− dependencies = ["ffi" "msgpack" "trollop"];
2656+ dependencies = ["ffi" "msgpack" "optimist"];
26162657 source = {
26172658 remotes = ["https://rubygems.org"];
2618− sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
2659+ sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
26192660 type = "gem";
26202661 };
2621− version = "0.4.10";
2662+ version = "0.4.11";
26222663 };
26232664 rdoc = {
26242665 source = {
@@ -2653,14 +2694,6 @@
26532694 };
26542695 version = "1.1.0";
26552696 };
2656− redcarpet = {
2657− source = {
2658− remotes = ["https://rubygems.org"];
2659− sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
2660− type = "gem";
2661− };
2662− version = "3.4.0";
2663− };
26642697 RedCloth = {
26652698 source = {
26662699 remotes = ["https://rubygems.org"];
@@ -2734,10 +2767,18 @@
27342767 regexp_parser = {
27352768 source = {
27362769 remotes = ["https://rubygems.org"];
2737− sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
2770+ sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq";
27382771 type = "gem";
27392772 };
2740− version = "0.5.0";
2773+ version = "1.3.0";
2774+ };
2775+ regexp_property_values = {
2776+ source = {
2777+ remotes = ["https://rubygems.org"];
2778+ sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr";
2779+ type = "gem";
2780+ };
2781+ version = "0.3.4";
27412782 };
27422783 representable = {
27432784 dependencies = ["declarative" "declarative-option" "uber"];
@@ -3024,22 +3065,13 @@
30243065 };
30253066 version = "1.2.2";
30263067 };
3027− rufus-scheduler = {
3028− dependencies = ["et-orbi"];
3029− source = {
3030− remotes = ["https://rubygems.org"];
3031− sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
3032− type = "gem";
3033− };
3034− version = "3.4.0";
3035− };
30363068 rugged = {
30373069 source = {
30383070 remotes = ["https://rubygems.org"];
3039− sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
3071+ sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
30403072 type = "gem";
30413073 };
3042− version = "0.27.5";
3074+ version = "0.28.0";
30433075 };
30443076 safe_yaml = {
30453077 source = {
@@ -3174,22 +3206,22 @@
31743206 version = "3.1.2";
31753207 };
31763208 sidekiq = {
3177− dependencies = ["connection_pool" "rack-protection" "redis"];
3209+ dependencies = ["connection_pool" "rack" "rack-protection" "redis"];
31783210 source = {
31793211 remotes = ["https://rubygems.org"];
3180− sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26";
3212+ sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29";
31813213 type = "gem";
31823214 };
3183− version = "5.2.3";
3215+ version = "5.2.5";
31843216 };
31853217 sidekiq-cron = {
3186− dependencies = ["rufus-scheduler" "sidekiq"];
3218+ dependencies = ["fugit" "sidekiq"];
31873219 source = {
31883220 remotes = ["https://rubygems.org"];
3189− sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
3221+ sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0";
31903222 type = "gem";
31913223 };
3192− version = "0.6.0";
3224+ version = "1.0.4";
31933225 };
31943226 signet = {
31953227 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -3280,10 +3312,10 @@
32803312 sshkey = {
32813313 source = {
32823314 remotes = ["https://rubygems.org"];
3283− sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
3315+ sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
32843316 type = "gem";
32853317 };
3286− version = "1.9.0";
3318+ version = "2.0.0";
32873319 };
32883320 stackprof = {
32893321 source = {
@@ -3385,6 +3417,14 @@
33853417 };
33863418 version = "0.3.6";
33873419 };
3420+ thrift = {
3421+ source = {
3422+ remotes = ["https://rubygems.org"];
3423+ sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
3424+ type = "gem";
3425+ };
3426+ version = "0.11.0.0";
3427+ };
33883428 tilt = {
33893429 source = {
33903430 remotes = ["https://rubygems.org"];
@@ -3427,22 +3467,14 @@
34273467 };
34283468 version = "1.0.0";
34293469 };
3430− trollop = {
3431− source = {
3432− remotes = ["https://rubygems.org"];
3433− sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
3434− type = "gem";
3435− };
3436− version = "2.1.3";
3437− };
34383470 truncato = {
34393471 dependencies = ["htmlentities" "nokogiri"];
34403472 source = {
34413473 remotes = ["https://rubygems.org"];
3442− sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
3474+ sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4";
34433475 type = "gem";
34443476 };
3445− version = "0.7.10";
3477+ version = "0.7.11";
34463478 };
34473479 tzinfo = {
34483480 dependencies = ["thread_safe"];
@@ -3507,10 +3539,10 @@
35073539 dependencies = ["kgio" "raindrops"];
35083540 source = {
35093541 remotes = ["https://rubygems.org"];
3510− sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
3542+ sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
35113543 type = "gem";
35123544 };
3513− version = "5.1.0";
3545+ version = "5.4.1";
35143546 };
35153547 unicorn-worker-killer = {
35163548 dependencies = ["get_process_mem" "unicorn"];
@@ -3550,10 +3582,10 @@
35503582 version_sorter = {
35513583 source = {
35523584 remotes = ["https://rubygems.org"];
3553− sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
3585+ sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
35543586 type = "gem";
35553587 };
3556− version = "2.1.0";
3588+ version = "2.2.4";
35573589 };
35583590 virtus = {
35593591 dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@@ -3585,10 +3617,10 @@
35853617 dependencies = ["addressable" "crack" "hashdiff"];
35863618 source = {
35873619 remotes = ["https://rubygems.org"];
3588− sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
3620+ sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
35893621 type = "gem";
35903622 };
3591− version = "2.3.2";
3623+ version = "3.5.1";
35923624 };
35933625 webpack-rails = {
35943626 dependencies = ["railties"];