git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #51526 from mayflower/gitlab-11-5-1

gitlab: 11.5.0 -> 11.5.1

commit478654da767f06ff695b2f46b8f8d04362652167 authorFlorian Klink <flokli@flokli.de> dateTue 4 Dec 2018, 23:15 (8 years ago) parentaa85911c2b54dc
9 files changed+159−403
pkgs/applications/version-management/gitlab/data.json+14−14 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+1−1 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+10−18 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+23−59 pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+38−116 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+10−18 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+23−59 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+38−116
pkgs/applications/version-management/gitlab/data.json+14−14
@@ -1,32 +1,32 @@
11{
22 "ce": {
3− "version": "11.5.0",
4− "repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb",
5− "deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp",
6− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb",
3+ "version": "11.5.1",
4+ "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5",
5+ "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d",
6+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb",
77 "owner": "gitlab-org",
88 "repo": "gitlab-ce",
9− "rev": "v11.5.0",
9+ "rev": "v11.5.1",
1010 "passthru": {
1111 "GITALY_SERVER_VERSION": "0.129.0",
12− "GITLAB_PAGES_VERSION": "1.3.0",
12+ "GITLAB_PAGES_VERSION": "1.3.1",
1313 "GITLAB_SHELL_VERSION": "8.4.1",
14− "GITLAB_WORKHORSE_VERSION": "7.1.0"
14+ "GITLAB_WORKHORSE_VERSION": "7.1.3"
1515 }
1616 },
1717 "ee": {
18− "version": "11.5.0",
19− "repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z",
20− "deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c",
21− "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb",
18+ "version": "11.5.1",
19+ "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp",
20+ "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg",
21+ "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb",
2222 "owner": "gitlab-org",
2323 "repo": "gitlab-ee",
24− "rev": "v11.5.0-ee",
24+ "rev": "v11.5.1-ee",
2525 "passthru": {
2626 "GITALY_SERVER_VERSION": "0.129.0",
27− "GITLAB_PAGES_VERSION": "1.3.0",
27+ "GITLAB_PAGES_VERSION": "1.3.1",
2828 "GITLAB_SHELL_VERSION": "8.4.1",
29− "GITLAB_WORKHORSE_VERSION": "7.1.0"
29+ "GITLAB_WORKHORSE_VERSION": "7.1.3"
3030 }
3131 }
3232}
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+1−1
@@ -25,7 +25,7 @@ index 435cb29..078c1df 100644
2525
2626 func NewFromDir(dir string) (*Config, error) {
2727- return newFromFile(path.Join(dir, configFile))
28−+ return newFromFile(path.Join(dir, "shell-config.yml"))
28++ return newFromFile("/run/gitlab/shell-config.yml")
2929 }
3030
3131 func newFromFile(filename string) (*Config, error) {
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 = "7.1.0";
6+ version = "7.1.3";
77
88 src = fetchFromGitLab {
99 owner = "gitlab-org";
1010 repo = "gitlab-workhorse";
1111 rev = "v${version}";
12− sha256 = "1jq28z2kf58wnbv8jkwfx2bm8ki22hpm9ssdy2ymza22gq0zx00g";
12+ sha256 = "1r75jj0xb4jv5fq2ihxk0vlv43gsk523zx86076mwph1g75gi1nz";
1313 };
1414
1515 buildInputs = [ git go ];
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+10−18
@@ -79,13 +79,6 @@ gem 'gpgme'
7979gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
8080gem 'net-ldap'
8181
82−# Git Wiki
83−# Only used to compute wiki page slugs
84−gem 'gitlab-gollum-lib', '~> 4.2', require: false
85−
86−# Language detection
87−gem 'github-linguist', '~> 5.3.3', require: 'linguist'
88−
8982# API
9083gem 'grape', '~> 1.1'
9184gem 'grape-entity', '~> 0.7.1'
@@ -146,6 +139,7 @@ gem 'rouge', '~> 3.1'
146139gem 'truncato', '~> 0.7.9'
147140gem 'bootstrap_form', '~> 2.7.0'
148141gem 'nokogiri', '~> 1.8.2'
142+gem 'escape_utils', '~> 1.1'
149143
150144# Calendar rendering
151145gem 'icalendar'
@@ -159,6 +153,11 @@ group :unicorn do
159153 gem 'unicorn-worker-killer', '~> 0.4.4'
160154end
161155
156+group :puma do
157+ gem 'puma', '~> 3.12', require: false
158+ gem 'puma_worker_killer', require: false
159+end
160+
162161# State machine
163162gem 'state_machines-activerecord', '~> 0.5.1'
164163
@@ -212,7 +211,7 @@ gem 'hipchat', '~> 1.5.0'
212211gem 'jira-ruby', '~> 1.4'
213212
214213# Flowdock integration
215−gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
214+gem 'flowdock', '~> 0.7'
216215
217216# Slack integration
218217gem 'slack-notifier', '~> 1.5.1'
@@ -245,9 +244,6 @@ gem 'rack-attack', '~> 4.4.1'
245244# Ace editor
246245gem 'ace-rails-ap', '~> 4.1.0'
247246
248−# Keyboard shortcuts
249−gem 'mousetrap-rails', '~> 1.4.6'
250−
251247# Detect and convert string character encoding
252248gem 'charlock_holmes', '~> 0.7.5'
253249
@@ -420,11 +416,10 @@ group :ed25519 do
420416end
421417
422418# Gitaly GRPC client
423−gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
424−gem 'grpc', '~> 1.11.0'
419+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
420+gem 'grpc', '~> 1.15.0'
425421
426−# Locked until https://github.com/google/protobuf/issues/4210 is closed
427−gem 'google-protobuf', '= 3.5.1'
422+gem 'google-protobuf', '~> 3.6'
428423
429424gem 'toml-rb', '~> 1.0.0', require: false
430425
@@ -436,6 +431,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
436431# Structured logging
437432gem 'lograge', '~> 0.5'
438433gem 'grape_logging', '~> 1.7'
439−
440−# Asset synchronization
441−gem 'asset_sync', '~> 2.4'
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+23−59
@@ -58,11 +58,6 @@ GEM
5858 asciidoctor (1.5.6.2)
5959 asciidoctor-plantuml (0.0.8)
6060 asciidoctor (~> 1.5)
61− asset_sync (2.4.0)
62− activemodel (>= 4.1.0)
63− fog-core
64− mime-types (>= 2.99)
65− unf
6661 ast (2.4.0)
6762 atomic (1.1.99)
6863 attr_encrypted (3.1.0)
@@ -274,32 +269,9 @@ GEM
274269 gettext_i18n_rails (>= 0.7.1)
275270 po_to_json (>= 1.0.0)
276271 rails (>= 3.2.0)
277− gitaly-proto (0.118.1)
278− google-protobuf (~> 3.1)
279− grpc (~> 1.10)
280− github-linguist (5.3.3)
281− charlock_holmes (~> 0.7.5)
282− escape_utils (~> 1.1.0)
283− mime-types (>= 1.19)
284− rugged (>= 0.25.1)
272+ gitaly-proto (0.123.0)
273+ grpc (~> 1.0)
285274 github-markup (1.7.0)
286− gitlab-flowdock-git-hook (1.0.1)
287− flowdock (~> 0.7)
288− gitlab-grit (>= 2.4.1)
289− multi_json
290− gitlab-gollum-lib (4.2.7.5)
291− gemojione (~> 3.2)
292− github-markup (~> 1.6)
293− gollum-grit_adapter (~> 1.0)
294− nokogiri (>= 1.6.1, < 2.0)
295− rouge (~> 3.1)
296− sanitize (~> 4.6.4)
297− stringex (~> 2.6)
298− gitlab-grit (2.8.2)
299− charlock_holmes (~> 0.6)
300− diff-lcs (~> 1.1)
301− mime-types (>= 1.16)
302− posix-spawn (~> 0.3)
303275 gitlab-markup (1.6.4)
304276 gitlab-sidekiq-fetcher (0.3.0)
305277 sidekiq (~> 5)
@@ -314,8 +286,6 @@ GEM
314286 rubyntlm (~> 0.5)
315287 globalid (0.4.1)
316288 activesupport (>= 4.2.0)
317− gollum-grit_adapter (1.0.1)
318− gitlab-grit (~> 2.7, >= 2.7.1)
319289 gon (6.2.0)
320290 actionpack (>= 3.0)
321291 multi_json
@@ -327,16 +297,15 @@ GEM
327297 mime-types (~> 3.0)
328298 representable (~> 3.0)
329299 retriable (>= 2.0, < 4.0)
330− google-protobuf (3.5.1)
331− googleapis-common-protos-types (1.0.1)
300+ google-protobuf (3.6.1)
301+ googleapis-common-protos-types (1.0.2)
332302 google-protobuf (~> 3.0)
333− googleauth (0.6.2)
303+ googleauth (0.6.6)
334304 faraday (~> 0.12)
335305 jwt (>= 1.4, < 3.0)
336− logging (~> 2.0)
337306 memoist (~> 0.12)
338307 multi_json (~> 1.11)
339− os (~> 0.9)
308+ os (>= 0.9, < 2.0)
340309 signet (~> 0.7)
341310 gpgme (2.0.13)
342311 mini_portile2 (~> 2.1)
@@ -360,10 +329,9 @@ GEM
360329 railties
361330 sprockets-rails
362331 graphql (1.8.1)
363− grpc (1.11.0)
332+ grpc (1.15.0)
364333 google-protobuf (~> 3.1)
365334 googleapis-common-protos-types (~> 1.0.0)
366− googleauth (>= 0.5.1, < 0.7)
367335 haml (5.0.4)
368336 temple (>= 0.8.0)
369337 tilt
@@ -465,11 +433,7 @@ GEM
465433 xml-simple
466434 licensee (8.9.2)
467435 rugged (~> 0.24)
468− little-plugger (1.1.4)
469436 locale (2.1.2)
470− logging (2.2.2)
471− little-plugger (~> 1.1)
472− multi_json (~> 1.10)
473437 lograge (0.10.0)
474438 actionpack (>= 4)
475439 activesupport (>= 4)
@@ -493,7 +457,6 @@ GEM
493457 mini_mime (1.0.1)
494458 mini_portile2 (2.3.0)
495459 minitest (5.7.0)
496− mousetrap-rails (1.4.6)
497460 msgpack (1.2.4)
498461 multi_json (1.13.1)
499462 multi_xml (0.6.0)
@@ -575,9 +538,9 @@ GEM
575538 org-ruby (0.9.12)
576539 rubypants (~> 0.2)
577540 orm_adapter (0.5.0)
578− os (0.9.6)
541+ os (1.0.0)
579542 parallel (1.12.1)
580− parser (2.5.1.0)
543+ parser (2.5.3.0)
581544 ast (~> 2.4.0)
582545 parslet (1.8.2)
583546 peek (1.0.1)
@@ -605,7 +568,6 @@ GEM
605568 pg (0.18.4)
606569 po_to_json (1.0.1)
607570 json (>= 1.6.0)
608− posix-spawn (0.3.13)
609571 powerpack (0.1.1)
610572 premailer (1.10.4)
611573 addressable
@@ -629,6 +591,10 @@ GEM
629591 pry-rails (0.3.6)
630592 pry (>= 0.10.4)
631593 public_suffix (3.0.3)
594+ puma (3.12.0)
595+ puma_worker_killer (0.1.0)
596+ get_process_mem (~> 0.2)
597+ puma (>= 2.7, < 4)
632598 pyu-ruby-sasl (0.0.3.3)
633599 rack (1.6.11)
634600 rack-accept (0.4.5)
@@ -797,7 +763,7 @@ GEM
797763 rubyzip (1.2.2)
798764 rufus-scheduler (3.4.0)
799765 et-orbi (~> 1.0)
800− rugged (0.27.4)
766+ rugged (0.27.5)
801767 safe_yaml (1.0.4)
802768 sanitize (4.6.6)
803769 crass (~> 1.0.2)
@@ -843,7 +809,7 @@ GEM
843809 sidekiq-cron (0.6.0)
844810 rufus-scheduler (>= 3.3.0)
845811 sidekiq (>= 4.2.1)
846− signet (0.8.1)
812+ signet (0.11.0)
847813 addressable (~> 2.3)
848814 faraday (~> 0.9)
849815 jwt (>= 1.5, < 3.0)
@@ -876,7 +842,6 @@ GEM
876842 state_machines-activerecord (0.5.1)
877843 activerecord (>= 4.1, < 6.0)
878844 state_machines-activemodel (>= 0.5.0)
879− stringex (2.8.4)
880845 sys-filesystem (1.1.6)
881846 ffi
882847 sysexits (1.2.0)
@@ -968,7 +933,6 @@ DEPENDENCIES
968933 asana (~> 0.6.0)
969934 asciidoctor (~> 1.5.6)
970935 asciidoctor-plantuml (= 0.0.8)
971− asset_sync (~> 2.4)
972936 attr_encrypted (~> 3.1.0)
973937 awesome_print
974938 babosa (~> 1.0.2)
@@ -1006,6 +970,7 @@ DEPENDENCIES
1006970 ed25519 (~> 1.2)
1007971 email_reply_trimmer (~> 0.1)
1008972 email_spec (~> 2.2.0)
973+ escape_utils (~> 1.1)
1009974 factory_bot_rails (~> 4.8.2)
1010975 faraday (~> 0.12)
1011976 fast_blank
@@ -1013,6 +978,7 @@ DEPENDENCIES
1013978 flipper (~> 0.13.0)
1014979 flipper-active_record (~> 0.13.0)
1015980 flipper-active_support_cache_store (~> 0.13.0)
981+ flowdock (~> 0.7)
1016982 fog-aliyun (~> 0.2.0)
1017983 fog-aws (~> 2.0.1)
1018984 fog-core (~> 1.44)
@@ -1027,18 +993,15 @@ DEPENDENCIES
1027993 gettext (~> 3.2.2)
1028994 gettext_i18n_rails (~> 1.8.0)
1029995 gettext_i18n_rails_js (~> 1.3)
1030− gitaly-proto (~> 0.118.1)
1031− github-linguist (~> 5.3.3)
996+ gitaly-proto (~> 0.123.0)
1032997 github-markup (~> 1.7.0)
1033− gitlab-flowdock-git-hook (~> 1.0.1)
1034− gitlab-gollum-lib (~> 4.2)
1035998 gitlab-markup (~> 1.6.4)
1036999 gitlab-sidekiq-fetcher
10371000 gitlab-styles (~> 2.4)
10381001 gitlab_omniauth-ldap (~> 2.0.4)
10391002 gon (~> 6.2)
10401003 google-api-client (~> 0.23)
1041− google-protobuf (= 3.5.1)
1004+ google-protobuf (~> 3.6)
10421005 gpgme
10431006 grape (~> 1.1)
10441007 grape-entity (~> 0.7.1)
@@ -1046,7 +1009,7 @@ DEPENDENCIES
10461009 grape_logging (~> 1.7)
10471010 graphiql-rails (~> 1.4.10)
10481011 graphql (~> 1.8.0)
1049− grpc (~> 1.11.0)
1012+ grpc (~> 1.15.0)
10501013 haml_lint (~> 0.26.0)
10511014 hamlit (~> 2.8.8)
10521015 hangouts-chat (~> 0.0.5)
@@ -1075,7 +1038,6 @@ DEPENDENCIES
10751038 method_source (~> 0.8)
10761039 mini_magick
10771040 minitest (~> 5.7.0)
1078− mousetrap-rails (~> 1.4.6)
10791041 mysql2 (~> 0.4.10)
10801042 net-ldap
10811043 net-ssh (~> 5.0)
@@ -1109,6 +1071,8 @@ DEPENDENCIES
11091071 prometheus-client-mmap (~> 0.9.4)
11101072 pry-byebug (~> 3.4.1)
11111073 pry-rails (~> 0.3.4)
1074+ puma (~> 3.12)
1075+ puma_worker_killer
11121076 rack-attack (~> 4.4.1)
11131077 rack-cors (~> 1.0.0)
11141078 rack-oauth2 (~> 1.2.1)
@@ -1187,4 +1151,4 @@ DEPENDENCIES
11871151 wikicloth (= 0.8.1)
11881152
11891153BUNDLED WITH
1190− 1.16.4
1154+ 1.17.1
pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+38−116
@@ -164,15 +164,6 @@
164164 };
165165 version = "0.0.8";
166166 };
167− asset_sync = {
168− dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
169− source = {
170− remotes = ["https://rubygems.org"];
171− sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
172− type = "gem";
173− };
174− version = "2.4.0";
175− };
176167 ast = {
177168 source = {
178169 remotes = ["https://rubygems.org"];
@@ -1066,22 +1057,13 @@
10661057 version = "1.3.0";
10671058 };
10681059 gitaly-proto = {
1069− dependencies = ["google-protobuf" "grpc"];
1070− source = {
1071− remotes = ["https://rubygems.org"];
1072− sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
1073− type = "gem";
1074− };
1075− version = "0.118.1";
1076− };
1077− github-linguist = {
1078− dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
1060+ dependencies = ["grpc"];
10791061 source = {
10801062 remotes = ["https://rubygems.org"];
1081− sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
1063+ sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
10821064 type = "gem";
10831065 };
1084− version = "5.3.3";
1066+ version = "0.123.0";
10851067 };
10861068 github-markup = {
10871069 source = {
@@ -1091,33 +1073,6 @@
10911073 };
10921074 version = "1.7.0";
10931075 };
1094− gitlab-flowdock-git-hook = {
1095− dependencies = ["flowdock" "gitlab-grit" "multi_json"];
1096− source = {
1097− remotes = ["https://rubygems.org"];
1098− sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
1099− type = "gem";
1100− };
1101− version = "1.0.1";
1102− };
1103− gitlab-gollum-lib = {
1104− dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
1105− source = {
1106− remotes = ["https://rubygems.org"];
1107− sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
1108− type = "gem";
1109− };
1110− version = "4.2.7.5";
1111− };
1112− gitlab-grit = {
1113− dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
1114− source = {
1115− remotes = ["https://rubygems.org"];
1116− sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
1117− type = "gem";
1118− };
1119− version = "2.8.2";
1120− };
11211076 gitlab-markup = {
11221077 source = {
11231078 remotes = ["https://rubygems.org"];
@@ -1162,15 +1117,6 @@
11621117 };
11631118 version = "0.4.1";
11641119 };
1165− gollum-grit_adapter = {
1166− dependencies = ["gitlab-grit"];
1167− source = {
1168− remotes = ["https://rubygems.org"];
1169− sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
1170− type = "gem";
1171− };
1172− version = "1.0.1";
1173− };
11741120 gon = {
11751121 dependencies = ["actionpack" "multi_json" "request_store"];
11761122 source = {
@@ -1192,28 +1138,28 @@
11921138 google-protobuf = {
11931139 source = {
11941140 remotes = ["https://rubygems.org"];
1195− sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
1141+ sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
11961142 type = "gem";
11971143 };
1198− version = "3.5.1";
1144+ version = "3.6.1";
11991145 };
12001146 googleapis-common-protos-types = {
12011147 dependencies = ["google-protobuf"];
12021148 source = {
12031149 remotes = ["https://rubygems.org"];
1204− sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
1150+ sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
12051151 type = "gem";
12061152 };
1207− version = "1.0.1";
1153+ version = "1.0.2";
12081154 };
12091155 googleauth = {
1210− dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
1156+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
12111157 source = {
12121158 remotes = ["https://rubygems.org"];
1213− sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
1159+ sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
12141160 type = "gem";
12151161 };
1216− version = "0.6.2";
1162+ version = "0.6.6";
12171163 };
12181164 gpgme = {
12191165 dependencies = ["mini_portile2"];
@@ -1278,13 +1224,13 @@
12781224 version = "1.8.1";
12791225 };
12801226 grpc = {
1281− dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
1227+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
12821228 source = {
12831229 remotes = ["https://rubygems.org"];
1284− sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
1230+ sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
12851231 type = "gem";
12861232 };
1287− version = "1.11.0";
1233+ version = "1.15.0";
12881234 };
12891235 haml = {
12901236 dependencies = ["temple" "tilt"];
@@ -1649,14 +1595,6 @@
16491595 };
16501596 version = "8.9.2";
16511597 };
1652− little-plugger = {
1653− source = {
1654− remotes = ["https://rubygems.org"];
1655− sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
1656− type = "gem";
1657− };
1658− version = "1.1.4";
1659− };
16601598 locale = {
16611599 source = {
16621600 remotes = ["https://rubygems.org"];
@@ -1665,15 +1603,6 @@
16651603 };
16661604 version = "2.1.2";
16671605 };
1668− logging = {
1669− dependencies = ["little-plugger" "multi_json"];
1670− source = {
1671− remotes = ["https://rubygems.org"];
1672− sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
1673− type = "gem";
1674− };
1675− version = "2.2.2";
1676− };
16771606 lograge = {
16781607 dependencies = ["actionpack" "activesupport" "railties" "request_store"];
16791608 source = {
@@ -1791,14 +1720,6 @@
17911720 };
17921721 version = "5.7.0";
17931722 };
1794− mousetrap-rails = {
1795− source = {
1796− remotes = ["https://rubygems.org"];
1797− sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
1798− type = "gem";
1799− };
1800− version = "1.4.6";
1801− };
18021723 msgpack = {
18031724 source = {
18041725 remotes = ["https://rubygems.org"];
@@ -2114,10 +2035,10 @@
21142035 os = {
21152036 source = {
21162037 remotes = ["https://rubygems.org"];
2117− sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
2038+ sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
21182039 type = "gem";
21192040 };
2120− version = "0.9.6";
2041+ version = "1.0.0";
21212042 };
21222043 parallel = {
21232044 source = {
@@ -2131,10 +2052,10 @@
21312052 dependencies = ["ast"];
21322053 source = {
21332054 remotes = ["https://rubygems.org"];
2134− sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
2055+ sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
21352056 type = "gem";
21362057 };
2137− version = "2.5.1.0";
2058+ version = "2.5.3.0";
21382059 };
21392060 parslet = {
21402061 source = {
@@ -2215,14 +2136,6 @@
22152136 };
22162137 version = "1.0.1";
22172138 };
2218− posix-spawn = {
2219− source = {
2220− remotes = ["https://rubygems.org"];
2221− sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
2222− type = "gem";
2223− };
2224− version = "0.3.13";
2225− };
22262139 powerpack = {
22272140 source = {
22282141 remotes = ["https://rubygems.org"];
@@ -2309,6 +2222,23 @@
23092222 };
23102223 version = "3.0.3";
23112224 };
2225+ puma = {
2226+ source = {
2227+ remotes = ["https://rubygems.org"];
2228+ sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
2229+ type = "gem";
2230+ };
2231+ version = "3.12.0";
2232+ };
2233+ puma_worker_killer = {
2234+ dependencies = ["get_process_mem" "puma"];
2235+ source = {
2236+ remotes = ["https://rubygems.org"];
2237+ sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
2238+ type = "gem";
2239+ };
2240+ version = "0.1.0";
2241+ };
23122242 pyu-ruby-sasl = {
23132243 source = {
23142244 remotes = ["https://rubygems.org"];
@@ -2916,10 +2846,10 @@
29162846 rugged = {
29172847 source = {
29182848 remotes = ["https://rubygems.org"];
2919− sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
2849+ sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
29202850 type = "gem";
29212851 };
2922− version = "0.27.4";
2852+ version = "0.27.5";
29232853 };
29242854 safe_yaml = {
29252855 source = {
@@ -3075,10 +3005,10 @@
30753005 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
30763006 source = {
30773007 remotes = ["https://rubygems.org"];
3078− sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
3008+ sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
30793009 type = "gem";
30803010 };
3081− version = "0.8.1";
3011+ version = "0.11.0";
30823012 };
30833013 simple_po_parser = {
30843014 source = {
@@ -3199,14 +3129,6 @@
31993129 };
32003130 version = "0.5.1";
32013131 };
3202− stringex = {
3203− source = {
3204− remotes = ["https://rubygems.org"];
3205− sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
3206− type = "gem";
3207− };
3208− version = "2.8.4";
3209− };
32103132 sys-filesystem = {
32113133 dependencies = ["ffi"];
32123134 source = {
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+10−18
@@ -82,13 +82,6 @@ gem 'gpgme'
8282gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
8383gem 'net-ldap'
8484
85−# Git Wiki
86−# Only used to compute wiki page slugs
87−gem 'gitlab-gollum-lib', '~> 4.2', require: false
88−
89−# Language detection
90−gem 'github-linguist', '~> 5.3.3', require: 'linguist'
91−
9285# API
9386gem 'grape', '~> 1.1'
9487gem 'grape-entity', '~> 0.7.1'
@@ -156,6 +149,7 @@ gem 'rouge', '~> 3.1'
156149gem 'truncato', '~> 0.7.9'
157150gem 'bootstrap_form', '~> 2.7.0'
158151gem 'nokogiri', '~> 1.8.2'
152+gem 'escape_utils', '~> 1.1'
159153
160154# Calendar rendering
161155gem 'icalendar'
@@ -169,6 +163,11 @@ group :unicorn do
169163 gem 'unicorn-worker-killer', '~> 0.4.4'
170164end
171165
166+group :puma do
167+ gem 'puma', '~> 3.12', require: false
168+ gem 'puma_worker_killer', require: false
169+end
170+
172171# State machine
173172gem 'state_machines-activerecord', '~> 0.5.1'
174173
@@ -222,7 +221,7 @@ gem 'hipchat', '~> 1.5.0'
222221gem 'jira-ruby', '~> 1.4'
223222
224223# Flowdock integration
225−gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
224+gem 'flowdock', '~> 0.7'
226225
227226# Slack integration
228227gem 'slack-notifier', '~> 1.5.1'
@@ -255,9 +254,6 @@ gem 'rack-attack', '~> 4.4.1'
255254# Ace editor
256255gem 'ace-rails-ap', '~> 4.1.0'
257256
258−# Keyboard shortcuts
259−gem 'mousetrap-rails', '~> 1.4.6'
260−
261257# Detect and convert string character encoding
262258gem 'charlock_holmes', '~> 0.7.5'
263259
@@ -435,11 +431,10 @@ group :ed25519 do
435431end
436432
437433# Gitaly GRPC client
438−gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
439−gem 'grpc', '~> 1.11.0'
434+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
435+gem 'grpc', '~> 1.15.0'
440436
441−# Locked until https://github.com/google/protobuf/issues/4210 is closed
442−gem 'google-protobuf', '= 3.5.1'
437+gem 'google-protobuf', '~> 3.6'
443438
444439gem 'toml-rb', '~> 1.0.0', require: false
445440
@@ -451,6 +446,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
451446# Structured logging
452447gem 'lograge', '~> 0.5'
453448gem 'grape_logging', '~> 1.7'
454−
455−# Asset synchronization
456−gem 'asset_sync', '~> 2.4'
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+23−59
@@ -58,11 +58,6 @@ GEM
5858 asciidoctor (1.5.6.2)
5959 asciidoctor-plantuml (0.0.8)
6060 asciidoctor (~> 1.5)
61− asset_sync (2.4.0)
62− activemodel (>= 4.1.0)
63− fog-core
64− mime-types (>= 2.99)
65− unf
6661 ast (2.4.0)
6762 atomic (1.1.99)
6863 attr_encrypted (3.1.0)
@@ -298,32 +293,9 @@ GEM
298293 gettext_i18n_rails (>= 0.7.1)
299294 po_to_json (>= 1.0.0)
300295 rails (>= 3.2.0)
301− gitaly-proto (0.118.1)
302− google-protobuf (~> 3.1)
303− grpc (~> 1.10)
304− github-linguist (5.3.3)
305− charlock_holmes (~> 0.7.5)
306− escape_utils (~> 1.1.0)
307− mime-types (>= 1.19)
308− rugged (>= 0.25.1)
296+ gitaly-proto (0.123.0)
297+ grpc (~> 1.0)
309298 github-markup (1.7.0)
310− gitlab-flowdock-git-hook (1.0.1)
311− flowdock (~> 0.7)
312− gitlab-grit (>= 2.4.1)
313− multi_json
314− gitlab-gollum-lib (4.2.7.5)
315− gemojione (~> 3.2)
316− github-markup (~> 1.6)
317− gollum-grit_adapter (~> 1.0)
318− nokogiri (>= 1.6.1, < 2.0)
319− rouge (~> 3.1)
320− sanitize (~> 4.6.4)
321− stringex (~> 2.6)
322− gitlab-grit (2.8.2)
323− charlock_holmes (~> 0.6)
324− diff-lcs (~> 1.1)
325− mime-types (>= 1.16)
326− posix-spawn (~> 0.3)
327299 gitlab-license (1.0.0)
328300 gitlab-markup (1.6.4)
329301 gitlab-sidekiq-fetcher (0.3.0)
@@ -339,8 +311,6 @@ GEM
339311 rubyntlm (~> 0.5)
340312 globalid (0.4.1)
341313 activesupport (>= 4.2.0)
342− gollum-grit_adapter (1.0.1)
343− gitlab-grit (~> 2.7, >= 2.7.1)
344314 gon (6.2.0)
345315 actionpack (>= 3.0)
346316 multi_json
@@ -352,16 +322,15 @@ GEM
352322 mime-types (~> 3.0)
353323 representable (~> 3.0)
354324 retriable (>= 2.0, < 4.0)
355− google-protobuf (3.5.1)
356− googleapis-common-protos-types (1.0.1)
325+ google-protobuf (3.6.1)
326+ googleapis-common-protos-types (1.0.2)
357327 google-protobuf (~> 3.0)
358− googleauth (0.6.2)
328+ googleauth (0.6.6)
359329 faraday (~> 0.12)
360330 jwt (>= 1.4, < 3.0)
361− logging (~> 2.0)
362331 memoist (~> 0.12)
363332 multi_json (~> 1.11)
364− os (~> 0.9)
333+ os (>= 0.9, < 2.0)
365334 signet (~> 0.7)
366335 gpgme (2.0.13)
367336 mini_portile2 (~> 2.1)
@@ -385,10 +354,9 @@ GEM
385354 railties
386355 sprockets-rails
387356 graphql (1.8.1)
388− grpc (1.11.0)
357+ grpc (1.15.0)
389358 google-protobuf (~> 3.1)
390359 googleapis-common-protos-types (~> 1.0.0)
391− googleauth (>= 0.5.1, < 0.7)
392360 gssapi (1.2.0)
393361 ffi (>= 1.0.1)
394362 haml (5.0.4)
@@ -493,11 +461,7 @@ GEM
493461 xml-simple
494462 licensee (8.9.2)
495463 rugged (~> 0.24)
496− little-plugger (1.1.4)
497464 locale (2.1.2)
498− logging (2.2.2)
499− little-plugger (~> 1.1)
500− multi_json (~> 1.10)
501465 lograge (0.10.0)
502466 actionpack (>= 4)
503467 activesupport (>= 4)
@@ -521,7 +485,6 @@ GEM
521485 mini_mime (1.0.1)
522486 mini_portile2 (2.3.0)
523487 minitest (5.7.0)
524− mousetrap-rails (1.4.6)
525488 msgpack (1.2.4)
526489 multi_json (1.13.1)
527490 multi_xml (0.6.0)
@@ -604,9 +567,9 @@ GEM
604567 org-ruby (0.9.12)
605568 rubypants (~> 0.2)
606569 orm_adapter (0.5.0)
607− os (0.9.6)
570+ os (1.0.0)
608571 parallel (1.12.1)
609− parser (2.5.1.0)
572+ parser (2.5.3.0)
610573 ast (~> 2.4.0)
611574 parslet (1.8.2)
612575 peek (1.0.1)
@@ -634,7 +597,6 @@ GEM
634597 pg (0.18.4)
635598 po_to_json (1.0.1)
636599 json (>= 1.6.0)
637− posix-spawn (0.3.13)
638600 powerpack (0.1.1)
639601 premailer (1.10.4)
640602 addressable
@@ -658,6 +620,10 @@ GEM
658620 pry-rails (0.3.6)
659621 pry (>= 0.10.4)
660622 public_suffix (3.0.3)
623+ puma (3.12.0)
624+ puma_worker_killer (0.1.0)
625+ get_process_mem (~> 0.2)
626+ puma (>= 2.7, < 4)
661627 pyu-ruby-sasl (0.0.3.3)
662628 rack (1.6.11)
663629 rack-accept (0.4.5)
@@ -826,7 +792,7 @@ GEM
826792 rubyzip (1.2.2)
827793 rufus-scheduler (3.4.0)
828794 et-orbi (~> 1.0)
829− rugged (0.27.4)
795+ rugged (0.27.5)
830796 safe_yaml (1.0.4)
831797 sanitize (4.6.6)
832798 crass (~> 1.0.2)
@@ -872,7 +838,7 @@ GEM
872838 sidekiq-cron (0.6.0)
873839 rufus-scheduler (>= 3.3.0)
874840 sidekiq (>= 4.2.1)
875− signet (0.8.1)
841+ signet (0.11.0)
876842 addressable (~> 2.3)
877843 faraday (~> 0.9)
878844 jwt (>= 1.5, < 3.0)
@@ -905,7 +871,6 @@ GEM
905871 state_machines-activerecord (0.5.1)
906872 activerecord (>= 4.1, < 6.0)
907873 state_machines-activemodel (>= 0.5.0)
908− stringex (2.8.4)
909874 sys-filesystem (1.1.6)
910875 ffi
911876 sysexits (1.2.0)
@@ -997,7 +962,6 @@ DEPENDENCIES
997962 asana (~> 0.6.0)
998963 asciidoctor (~> 1.5.6)
999964 asciidoctor-plantuml (= 0.0.8)
1000− asset_sync (~> 2.4)
1001965 attr_encrypted (~> 3.1.0)
1002966 awesome_print
1003967 aws-sdk
@@ -1039,6 +1003,7 @@ DEPENDENCIES
10391003 elasticsearch-rails (~> 0.1.9)
10401004 email_reply_trimmer (~> 0.1)
10411005 email_spec (~> 2.2.0)
1006+ escape_utils (~> 1.1)
10421007 factory_bot_rails (~> 4.8.2)
10431008 faraday (~> 0.12)
10441009 faraday_middleware-aws-signers-v4
@@ -1047,6 +1012,7 @@ DEPENDENCIES
10471012 flipper (~> 0.13.0)
10481013 flipper-active_record (~> 0.13.0)
10491014 flipper-active_support_cache_store (~> 0.13.0)
1015+ flowdock (~> 0.7)
10501016 fog-aliyun (~> 0.2.0)
10511017 fog-aws (~> 2.0.1)
10521018 fog-core (~> 1.44)
@@ -1061,11 +1027,8 @@ DEPENDENCIES
10611027 gettext (~> 3.2.2)
10621028 gettext_i18n_rails (~> 1.8.0)
10631029 gettext_i18n_rails_js (~> 1.3)
1064− gitaly-proto (~> 0.118.1)
1065− github-linguist (~> 5.3.3)
1030+ gitaly-proto (~> 0.123.0)
10661031 github-markup (~> 1.7.0)
1067− gitlab-flowdock-git-hook (~> 1.0.1)
1068− gitlab-gollum-lib (~> 4.2)
10691032 gitlab-license (~> 1.0)
10701033 gitlab-markup (~> 1.6.4)
10711034 gitlab-sidekiq-fetcher
@@ -1073,7 +1036,7 @@ DEPENDENCIES
10731036 gitlab_omniauth-ldap (~> 2.0.4)
10741037 gon (~> 6.2)
10751038 google-api-client (~> 0.23)
1076− google-protobuf (= 3.5.1)
1039+ google-protobuf (~> 3.6)
10771040 gpgme
10781041 grape (~> 1.1)
10791042 grape-entity (~> 0.7.1)
@@ -1081,7 +1044,7 @@ DEPENDENCIES
10811044 grape_logging (~> 1.7)
10821045 graphiql-rails (~> 1.4.10)
10831046 graphql (~> 1.8.0)
1084− grpc (~> 1.11.0)
1047+ grpc (~> 1.15.0)
10851048 gssapi
10861049 haml_lint (~> 0.26.0)
10871050 hamlit (~> 2.8.8)
@@ -1111,7 +1074,6 @@ DEPENDENCIES
11111074 method_source (~> 0.8)
11121075 mini_magick
11131076 minitest (~> 5.7.0)
1114− mousetrap-rails (~> 1.4.6)
11151077 mysql2 (~> 0.4.10)
11161078 net-ldap
11171079 net-ntp
@@ -1146,6 +1108,8 @@ DEPENDENCIES
11461108 prometheus-client-mmap (~> 0.9.4)
11471109 pry-byebug (~> 3.4.1)
11481110 pry-rails (~> 0.3.4)
1111+ puma (~> 3.12)
1112+ puma_worker_killer
11491113 rack-attack (~> 4.4.1)
11501114 rack-cors (~> 1.0.0)
11511115 rack-oauth2 (~> 1.2.1)
@@ -1224,4 +1188,4 @@ DEPENDENCIES
12241188 wikicloth (= 0.8.1)
12251189
12261190BUNDLED WITH
1227− 1.16.4
1191+ 1.17.1
pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+38−116
@@ -164,15 +164,6 @@
164164 };
165165 version = "0.0.8";
166166 };
167− asset_sync = {
168− dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
169− source = {
170− remotes = ["https://rubygems.org"];
171− sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
172− type = "gem";
173− };
174− version = "2.4.0";
175− };
176167 ast = {
177168 source = {
178169 remotes = ["https://rubygems.org"];
@@ -1154,22 +1145,13 @@
11541145 version = "1.3.0";
11551146 };
11561147 gitaly-proto = {
1157− dependencies = ["google-protobuf" "grpc"];
1158− source = {
1159− remotes = ["https://rubygems.org"];
1160− sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
1161− type = "gem";
1162− };
1163− version = "0.118.1";
1164− };
1165− github-linguist = {
1166− dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
1148+ dependencies = ["grpc"];
11671149 source = {
11681150 remotes = ["https://rubygems.org"];
1169− sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
1151+ sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
11701152 type = "gem";
11711153 };
1172− version = "5.3.3";
1154+ version = "0.123.0";
11731155 };
11741156 github-markup = {
11751157 source = {
@@ -1179,33 +1161,6 @@
11791161 };
11801162 version = "1.7.0";
11811163 };
1182− gitlab-flowdock-git-hook = {
1183− dependencies = ["flowdock" "gitlab-grit" "multi_json"];
1184− source = {
1185− remotes = ["https://rubygems.org"];
1186− sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
1187− type = "gem";
1188− };
1189− version = "1.0.1";
1190− };
1191− gitlab-gollum-lib = {
1192− dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
1193− source = {
1194− remotes = ["https://rubygems.org"];
1195− sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
1196− type = "gem";
1197− };
1198− version = "4.2.7.5";
1199− };
1200− gitlab-grit = {
1201− dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
1202− source = {
1203− remotes = ["https://rubygems.org"];
1204− sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
1205− type = "gem";
1206− };
1207− version = "2.8.2";
1208− };
12091164 gitlab-license = {
12101165 source = {
12111166 remotes = ["https://rubygems.org"];
@@ -1258,15 +1213,6 @@
12581213 };
12591214 version = "0.4.1";
12601215 };
1261− gollum-grit_adapter = {
1262− dependencies = ["gitlab-grit"];
1263− source = {
1264− remotes = ["https://rubygems.org"];
1265− sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
1266− type = "gem";
1267− };
1268− version = "1.0.1";
1269− };
12701216 gon = {
12711217 dependencies = ["actionpack" "multi_json" "request_store"];
12721218 source = {
@@ -1288,28 +1234,28 @@
12881234 google-protobuf = {
12891235 source = {
12901236 remotes = ["https://rubygems.org"];
1291− sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
1237+ sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
12921238 type = "gem";
12931239 };
1294− version = "3.5.1";
1240+ version = "3.6.1";
12951241 };
12961242 googleapis-common-protos-types = {
12971243 dependencies = ["google-protobuf"];
12981244 source = {
12991245 remotes = ["https://rubygems.org"];
1300− sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
1246+ sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
13011247 type = "gem";
13021248 };
1303− version = "1.0.1";
1249+ version = "1.0.2";
13041250 };
13051251 googleauth = {
1306− dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
1252+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
13071253 source = {
13081254 remotes = ["https://rubygems.org"];
1309− sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
1255+ sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
13101256 type = "gem";
13111257 };
1312− version = "0.6.2";
1258+ version = "0.6.6";
13131259 };
13141260 gpgme = {
13151261 dependencies = ["mini_portile2"];
@@ -1374,13 +1320,13 @@
13741320 version = "1.8.1";
13751321 };
13761322 grpc = {
1377− dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
1323+ dependencies = ["google-protobuf" "googleapis-common-protos-types"];
13781324 source = {
13791325 remotes = ["https://rubygems.org"];
1380− sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
1326+ sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
13811327 type = "gem";
13821328 };
1383− version = "1.11.0";
1329+ version = "1.15.0";
13841330 };
13851331 gssapi = {
13861332 dependencies = ["ffi"];
@@ -1762,14 +1708,6 @@
17621708 };
17631709 version = "8.9.2";
17641710 };
1765− little-plugger = {
1766− source = {
1767− remotes = ["https://rubygems.org"];
1768− sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
1769− type = "gem";
1770− };
1771− version = "1.1.4";
1772− };
17731711 locale = {
17741712 source = {
17751713 remotes = ["https://rubygems.org"];
@@ -1778,15 +1716,6 @@
17781716 };
17791717 version = "2.1.2";
17801718 };
1781− logging = {
1782− dependencies = ["little-plugger" "multi_json"];
1783− source = {
1784− remotes = ["https://rubygems.org"];
1785− sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
1786− type = "gem";
1787− };
1788− version = "2.2.2";
1789− };
17901719 lograge = {
17911720 dependencies = ["actionpack" "activesupport" "railties" "request_store"];
17921721 source = {
@@ -1904,14 +1833,6 @@
19041833 };
19051834 version = "5.7.0";
19061835 };
1907− mousetrap-rails = {
1908− source = {
1909− remotes = ["https://rubygems.org"];
1910− sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
1911− type = "gem";
1912− };
1913− version = "1.4.6";
1914− };
19151836 msgpack = {
19161837 source = {
19171838 remotes = ["https://rubygems.org"];
@@ -2235,10 +2156,10 @@
22352156 os = {
22362157 source = {
22372158 remotes = ["https://rubygems.org"];
2238− sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
2159+ sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
22392160 type = "gem";
22402161 };
2241− version = "0.9.6";
2162+ version = "1.0.0";
22422163 };
22432164 parallel = {
22442165 source = {
@@ -2252,10 +2173,10 @@
22522173 dependencies = ["ast"];
22532174 source = {
22542175 remotes = ["https://rubygems.org"];
2255− sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
2176+ sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
22562177 type = "gem";
22572178 };
2258− version = "2.5.1.0";
2179+ version = "2.5.3.0";
22592180 };
22602181 parslet = {
22612182 source = {
@@ -2336,14 +2257,6 @@
23362257 };
23372258 version = "1.0.1";
23382259 };
2339− posix-spawn = {
2340− source = {
2341− remotes = ["https://rubygems.org"];
2342− sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
2343− type = "gem";
2344− };
2345− version = "0.3.13";
2346− };
23472260 powerpack = {
23482261 source = {
23492262 remotes = ["https://rubygems.org"];
@@ -2430,6 +2343,23 @@
24302343 };
24312344 version = "3.0.3";
24322345 };
2346+ puma = {
2347+ source = {
2348+ remotes = ["https://rubygems.org"];
2349+ sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
2350+ type = "gem";
2351+ };
2352+ version = "3.12.0";
2353+ };
2354+ puma_worker_killer = {
2355+ dependencies = ["get_process_mem" "puma"];
2356+ source = {
2357+ remotes = ["https://rubygems.org"];
2358+ sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i";
2359+ type = "gem";
2360+ };
2361+ version = "0.1.0";
2362+ };
24332363 pyu-ruby-sasl = {
24342364 source = {
24352365 remotes = ["https://rubygems.org"];
@@ -3037,10 +2967,10 @@
30372967 rugged = {
30382968 source = {
30392969 remotes = ["https://rubygems.org"];
3040− sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
2970+ sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
30412971 type = "gem";
30422972 };
3043− version = "0.27.4";
2973+ version = "0.27.5";
30442974 };
30452975 safe_yaml = {
30462976 source = {
@@ -3196,10 +3126,10 @@
31963126 dependencies = ["addressable" "faraday" "jwt" "multi_json"];
31973127 source = {
31983128 remotes = ["https://rubygems.org"];
3199− sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
3129+ sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
32003130 type = "gem";
32013131 };
3202− version = "0.8.1";
3132+ version = "0.11.0";
32033133 };
32043134 simple_po_parser = {
32053135 source = {
@@ -3320,14 +3250,6 @@
33203250 };
33213251 version = "0.5.1";
33223252 };
3323− stringex = {
3324− source = {
3325− remotes = ["https://rubygems.org"];
3326− sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
3327− type = "gem";
3328− };
3329− version = "2.8.4";
3330− };
33313253 sys-filesystem = {
33323254 dependencies = ["ffi"];
33333255 source = {