diff options
gitlab: 14.3.3 -> 14.4.0
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitaly')
4 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7eaf3c0f218..662252527f9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.3.2' +gem 'activesupport', '~> 6.1.4.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.20.0' +gem 'gitlab-labkit', '~> 0.21.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index dba345db638..05e75a52413 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.3.2) - actionview (= 6.1.3.2) - activesupport (= 6.1.3.2) + actionpack (6.1.4.1) + actionview (= 6.1.4.1) + activesupport (= 6.1.4.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.3.2) - activesupport (= 6.1.3.2) + actionview (6.1.4.1) + activesupport (= 6.1.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.3.2) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -65,10 +65,10 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.20.0) + gitlab-labkit (0.21.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.19) + grpc (~> 1.30) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -94,7 +94,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -139,7 +139,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.14) @@ -147,7 +147,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.3.2) - redis (4.2.5) + redis (4.4.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri @@ -197,7 +197,7 @@ GEM stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.14.1) + thrift (0.15.0) timecop (0.9.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -216,13 +216,13 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.3.2) + activesupport (~> 6.1.4.1) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.20.0) + gitlab-labkit (~> 0.21.1) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) grpc (~> 1.30.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 26deabcc230..0b87646eede 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.3"; + version = "14.4.0"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo="; + sha256 = "sha256-GnjG/LuHvulNrwj1/4r07snue7rysZ74cWpf60w48cc="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index dea32e94b13..4aad9394cd6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4.1"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r"; + sha256 = "0xkzm6kri1dzjrmicm3wgbnxi9gk0byanr6ibfrflv7spd98fz19"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.2"; }; gitlab-markup = { groups = ["default"]; @@ -383,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.10.0"; + version = "2.12.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -643,10 +643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; rainbow = { source = { @@ -682,10 +682,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; + sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720"; type = "gem"; }; - version = "4.2.5"; + version = "4.4.0"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -899,10 +899,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420"; + sha256 = "0rb9nax4k72zbriq7k98shfcj4lf54sqjpin2xm6ma7bb48ra8mc"; type = "gem"; }; - version = "0.14.1"; + version = "0.15.0"; }; timecop = { source = { |