diff options
10 files changed, 218 insertions, 202 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 2bdf0260f1e..36acd8ae13d 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.9.3", - "repo_hash": "04a5z9dr8qs1vrgrdlw5sx5wjwjgqzgj7rqxy4lswycxglc8i1ad", - "yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj", + "version": "14.10.0", + "repo_hash": "0j4dx32d4i8b44zfmqshkc19g3g9a2c2rg1r8mifjv67p7hvacnx", + "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.9.3-ee", + "rev": "v14.10.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.9.3", + "GITALY_SERVER_VERSION": "14.10.0", "GITLAB_PAGES_VERSION": "1.56.1", - "GITLAB_SHELL_VERSION": "13.24.0", - "GITLAB_WORKHORSE_VERSION": "14.9.3" + "GITLAB_SHELL_VERSION": "13.25.1", + "GITLAB_WORKHORSE_VERSION": "14.10.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 78296dff887..787e705f945 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.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.6' +gem 'activesupport', '~> 6.1.4.7' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 752883d801d..cc37adacce6 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.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) 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.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.4.6) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) diff-lcs (1.3) dotenv (2.7.6) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.14.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -111,12 +111,12 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) mini_mime (1.0.2) - mini_portile2 (2.6.1) + mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) faraday (>= 0.9) @@ -225,7 +225,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.6) + activesupport (~> 6.1.4.7) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 408a5df8564..428e5fc2104 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.9.3"; + version = "14.10.0"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-D4Dgw2vqX5464ciYvTqagQG/uXt0Wm15ztdwbyJp1HM="; + sha256 = "sha256-E0tIbcm/yI1oSn4CD8oZo8WfZVJNAZBUw2QRlhAujTI="; }; - vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds="; + vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0="; passthru = { inherit rubyEnv; @@ -42,7 +42,7 @@ buildGoModule { postInstall = '' mkdir -p $ruby cp -rv $src/ruby/{bin,lib,proto} $ruby - mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version} + mv $out/bin/gitaly-git2go-v${lib.versions.major version} $out/bin/gitaly-git2go-${version} ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c55d094db5f..21db54b6ed5 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 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; + sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; + sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; + sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -122,10 +122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; crass = { groups = ["default"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; ice_nine = { source = { @@ -394,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.14.0"; + version = "2.16.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -452,10 +452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; minitest = { groups = ["default" "development" "test"]; @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 971ef2af955..915d52f1635 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.24.0"; + version = "13.25.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M="; + sha256 = "sha256-JItk6gfpBNxabI0vsIOHIBhK7L6E1ijPgrnzhQiKPYw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY="; + vendorSha256 = "sha256-S7bVQxb+p6o0LPAdx7S6dlsHLecPwMS7myjQZwYhHcU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 22b982f5d71..be505628891 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.9.3"; + version = "14.10.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw="; + vendorSha256 = "sha256-TNZtggUBMwIPO6ZZGk/EkRcilh7sztlAT7Hu4vhME0w="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ae8a8e01241..732591ae170 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.6' +gem 'rails', '~> 6.1.4.7' gem 'bootsnap', '~> 1.9.1', require: false @@ -41,6 +41,7 @@ gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-dingtalk-oauth2', '~> 1.0' +gem 'omniauth-alicloud', '~> 1.0.1' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' gem 'omniauth-gitlab', '~> 1.0.2' @@ -163,7 +164,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' -gem 'asciidoctor-include-ext', '~> 0.3.1', require: false +gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'rouge', '~> 3.27.0' @@ -285,7 +286,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.6.0' +gem 'rack-proxy', '~> 0.7.2' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -344,7 +345,7 @@ gem 'warning', '~> 1.2.0' group :development do gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false + gem 'solargraph', '~> 0.44.3', require: false gem 'letter_opener_web', '~> 2.0.0' @@ -389,7 +390,7 @@ group :development, :test do gem 'knapsack', '~> 1.21.1' gem 'crystalball', '~> 0.7.0', require: false - gem 'simple_po_parser', '~> 1.1.2', require: false + gem 'simple_po_parser', '~> 1.1.6', require: false gem 'timecop', '~> 0.9.1' @@ -403,7 +404,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.11.0', require: false + gem 'gitlab-dangerfiles', '~> 3.0', require: false end group :development, :test, :coverage do @@ -481,7 +482,7 @@ gem 'ssh_data', '~> 1.2' gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.9.0.pre.rc4' +gem 'gitaly', '~> 14.10.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -497,7 +498,7 @@ gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.7.0' +gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' @@ -542,4 +543,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.4.4' +gem 'ipynbdiff', '0.4.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 658d79dfcc6..eeb2a8d8a73 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.9) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + actioncable (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailbox (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (>= 2.7.1) - actionmailer (6.1.4.6) - actionpack (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailer (6.1.4.7) + actionpack (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.6) - actionpack (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actiontext (6.1.4.7) + actionpack (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) nokogiri (>= 1.8.5) - actionview (6.1.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.6) - activesupport (= 6.1.4.6) + activejob (6.1.4.7) + activesupport (= 6.1.4.7) globalid (>= 0.3.6) - activemodel (6.1.4.6) - activesupport (= 6.1.4.6) - activerecord (6.1.4.6) - activemodel (= 6.1.4.6) - activesupport (= 6.1.4.6) + activemodel (6.1.4.7) + activesupport (= 6.1.4.7) + activerecord (6.1.4.7) + activemodel (= 6.1.4.7) + activesupport (= 6.1.4.7) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activesupport (= 6.1.4.6) + activestorage (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activesupport (= 6.1.4.7) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.6) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -82,7 +82,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) asciidoctor (2.0.15) - asciidoctor-include-ext (0.3.1) + asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor-kroki (0.5.0) asciidoctor (~> 2.0) @@ -130,7 +130,7 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - benchmark (0.1.1) + benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) benchmark-memory (0.1.2) @@ -196,7 +196,7 @@ GEM coderay (1.1.3) colored2 (3.1.2) commonmarker (0.23.4) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) contracts (0.11.0) cork (0.3.0) @@ -217,7 +217,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.4.5) + danger (8.5.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -448,7 +448,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.9.0.pre.rc4) + gitaly (14.10.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -456,10 +456,11 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.11.0) + gitlab-dangerfiles (3.0.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.7.0) + rake + gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) gitlab-fog-azure-rm (1.2.0) @@ -526,7 +527,7 @@ GEM signet (~> 0.12) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.19.1) + google-protobuf (3.19.4) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) googleauth (0.14.0) @@ -647,7 +648,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.4) + ipynbdiff (0.4.5) diffy (~> 3.3) json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) @@ -729,7 +730,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.12.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -748,8 +749,8 @@ GEM mime-types-data (3.2020.0512) mini_histogram (0.3.1) mini_magick (4.10.1) - mini_mime (1.1.1) - mini_portile2 (2.6.1) + mini_mime (1.1.2) + mini_portile2 (2.8.0) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -787,8 +788,8 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -821,6 +822,8 @@ GEM omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + omniauth-alicloud (1.0.1) + omniauth-oauth2 (~> 1.7.1) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -961,25 +964,25 @@ GEM httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-proxy (0.6.0) + rack-proxy (0.7.2) rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.4.6) - actioncable (= 6.1.4.6) - actionmailbox (= 6.1.4.6) - actionmailer (= 6.1.4.6) - actionpack (= 6.1.4.6) - actiontext (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activemodel (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + rails (6.1.4.7) + actioncable (= 6.1.4.7) + actionmailbox (= 6.1.4.7) + actionmailer (= 6.1.4.7) + actionpack (= 6.1.4.7) + actiontext (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activemodel (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) bundler (>= 1.15.0) - railties (= 6.1.4.6) + railties (= 6.1.4.7) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -993,9 +996,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + railties (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) method_source rake (>= 0.13) thor (~> 1.0) @@ -1199,7 +1202,7 @@ GEM faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_po_parser (1.1.2) + simple_po_parser (1.1.6) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -1213,7 +1216,7 @@ GEM slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.43.0) + solargraph (0.44.3) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1240,11 +1243,11 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.2) ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) @@ -1410,7 +1413,7 @@ DEPENDENCIES apollo_upload_server (~> 2.1.0) asana (~> 0.10.3) asciidoctor (~> 2.0.10) - asciidoctor-include-ext (~> 0.3.1) + asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.5.0) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) @@ -1484,11 +1487,11 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.9.0.pre.rc4) + gitaly (~> 14.10.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.11.0) - gitlab-experiment (~> 0.7.0) + gitlab-dangerfiles (~> 3.0) + gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.22.0) gitlab-license (~> 2.1.0) @@ -1528,7 +1531,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.4) + ipynbdiff (= 0.4.5) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1561,6 +1564,7 @@ DEPENDENCIES ohai (~> 16.10) oj (~> 3.10.6) omniauth (~> 1.8) + omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) @@ -1597,9 +1601,9 @@ DEPENDENCIES rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.16.0) - rack-proxy (~> 0.6.0) + rack-proxy (~> 0.7.2) rack-timeout (~> 0.5.1) - rails (~> 6.1.4.6) + rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1644,13 +1648,13 @@ DEPENDENCIES sidekiq (~> 6.4) sidekiq-cron (~> 1.2) sigdump (~> 0.2.4) - simple_po_parser (~> 1.1.2) + simple_po_parser (~> 1.1.6) simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.43) + solargraph (~> 0.44.3) spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index cc88cbbbab5..e9bd35cea58 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp"; + sha256 = "0knrmrqmjl4gdzvmxk5plc9i5ipclncg7l0l0yhvy07779j3xqpd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw"; + sha256 = "1ksps8lzmggdhbr0d45qyp2s70kfapx1x0j77xmacw9c749y5jxd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8"; + sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; + sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p"; + sha256 = "0dwinzhsfcysz9khk137z92qr5kx6aw5f2ybkdjk1yqml8avv1wd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; + sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l"; + sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; + sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; + sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430"; + sha256 = "18gxckrydsyciaiq5j981sf522kfqpq74yvf405dgn688y5927il"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; + sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d"; + sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.0"; }; asciidoctor-kroki = { dependencies = ["asciidoctor"]; @@ -484,10 +484,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6"; + sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; benchmark-ips = { groups = ["development" "test"]; @@ -824,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; connection_pool = { groups = ["default"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl"; + sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; type = "gem"; }; - version = "8.4.5"; + version = "8.5.0"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1916,10 +1916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716"; + sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; type = "gem"; }; - version = "14.9.0.pre.rc4"; + version = "14.10.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1954,15 +1954,15 @@ version = "0.10.5"; }; gitlab-dangerfiles = { - dependencies = ["danger" "danger-gitlab"]; + dependencies = ["danger" "danger-gitlab" "rake"]; groups = ["danger" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24"; + sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; type = "gem"; }; - version = "2.11.0"; + version = "3.0.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -1970,10 +1970,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx"; + sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -2152,10 +2152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53"; + sha256 = "1q0aknwpr8k1v92qcm1rz1zyrgdpf1i1b9mxa1gi48y0aawlnb7j"; type = "gem"; }; - version = "3.19.1"; + version = "3.19.4"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2623,10 +2623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2"; + sha256 = "1r1pl4imiqi75bksh17r2j3w74x561z4bx1mpgv6cin1fcrzw9zy"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -2944,10 +2944,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.12.0"; + version = "2.16.0"; }; lru_redux = { groups = ["default"]; @@ -3081,20 +3081,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; mini_portile2 = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; minitest = { groups = ["development" "test"]; @@ -3350,10 +3350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.3"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3440,6 +3440,17 @@ }; version = "1.9.1"; }; + omniauth-alicloud = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g"; + type = "gem"; + }; + version = "1.0.1"; + }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -4081,10 +4092,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; + sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.2"; }; rack-test = { dependencies = ["rack"]; @@ -4113,10 +4124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za"; + sha256 = "0kwpw06ylmjbfldqjzhy5m6chr6q6g0gm6p6h98sbjj8awri72n5"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4168,10 +4179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; + sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; rainbow = { groups = ["default" "development" "test"]; @@ -5101,10 +5112,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; + sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.6"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -5195,10 +5206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; + sha256 = "1h3i4fkn028ylhgbqac0bgpbbikjcd5ks7id8wm94ahnq89z4mh8"; type = "gem"; }; - version = "0.43.0"; + version = "0.44.3"; }; sorted_set = { dependencies = ["rbtree" "set"]; @@ -5270,20 +5281,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.2"; }; sqlite3 = { - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.2"; }; ssh_data = { groups = ["default"]; |