Merge pull request #192423 from yayayayaka/gitlab-15.4.0

gitlab: 15.3.3 -> 15.4.0
This commit is contained in:
Mario Rodas 2022-09-24 12:01:38 -05:00 committed by GitHub
commit ae5e314ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 353 additions and 304 deletions

View File

@ -1,22 +1,27 @@
{
"version": "15.3.3",
"repo_hash": "sha256-cgFy119/ZAUc/mBVAwZ5t5H2Z2+i5EJI9Q1KYtB2MJo=",
"yarn_hash": "1s2xai0q16xhp3q68hf9mxh1v429h4n5qy1iizdi7a5cmg3p3ldq",
"version": "15.4.0",
"repo_hash": "sha256-AONzkIZbrOJkxGUYAunoWTc9xuCykKr4YkYeQQxRW8A=",
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.3.3-ee",
"rev": "v15.4.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.3.3",
"GITALY_SERVER_VERSION": "15.4.0",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
"GITLAB_WORKHORSE_VERSION": "15.3.3"
"GITLAB_WORKHORSE_VERSION": "15.4.0"
},
"vendored_gems": [
"bundler-checksum",
"devise-pbkdf2-encryptable",
"omniauth-azure-oauth2",
"omniauth-cas3",
"omniauth-gitlab",
"omniauth-google-oauth2",
"omniauth_crowd",
"omniauth-salesforce",
"mail-smtp_pool",
"microsoft_graph_mailer",
"ipynbdiff",
"error_tracking_open_api"
]

View File

@ -13,11 +13,11 @@ gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.23'
gem 'gitlab-labkit', '~> 0.24'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.14.1'
gem 'licensee', '~> 9.15'
gem 'google-protobuf', '~> 3.21.0'

View File

@ -24,7 +24,7 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
binding_ninja (0.2.3)
@ -39,13 +39,13 @@ GEM
diff-lcs (1.3)
dotenv (2.7.6)
equalizer (0.0.11)
erubi (1.10.0)
erubi (1.11.0)
escape_utils (1.2.2)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.15.3)
ffi (1.15.5)
gemojione (3.3.0)
json
github-linguist (7.20.0)
@ -65,9 +65,9 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
gitlab-labkit (0.23.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
gitlab-labkit (0.24.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
@ -81,8 +81,8 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.7.1)
google-protobuf (3.21.3)
googleapis-common-protos-types (1.3.0)
google-protobuf (3.21.5)
googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
google-protobuf (~> 3.18)
@ -95,13 +95,13 @@ GEM
opentracing (~> 0.3)
thrift
json (2.5.1)
licensee (9.14.1)
licensee (9.15.2)
dotenv (~> 2.0)
octokit (~> 4.17)
octokit (~> 4.20)
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
loofah (2.16.0)
loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@ -112,7 +112,7 @@ GEM
mime-types-data (3.2020.1104)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.2)
minitest (5.16.3)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.13.8)
@ -126,8 +126,8 @@ GEM
parallel (1.19.2)
parser (3.0.3.2)
ast (~> 2.4.1)
pg_query (2.1.1)
google-protobuf (>= 3.17.1)
pg_query (2.1.3)
google-protobuf (>= 3.19.2)
proc_to_ast (0.1.0)
coderay
parser
@ -136,15 +136,15 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.6)
public_suffix (4.0.7)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rainbow (3.0.0)
rbtrace (0.4.14)
@ -152,12 +152,12 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.3.2)
redis (4.4.0)
redis (4.8.0)
regexp_parser (1.8.1)
reverse_markdown (1.4.0)
nokogiri
rexml (3.2.5)
rouge (3.27.0)
rouge (3.30.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@ -202,7 +202,7 @@ GEM
stringex (2.8.5)
thor (1.1.0)
thread_safe (0.3.6)
thrift (0.15.0)
thrift (0.16.0)
timecop (0.9.1)
tomlrb (2.0.1)
tzinfo (2.0.5)
@ -231,13 +231,13 @@ DEPENDENCIES
github-linguist (~> 7.20.0)
gitlab-gollum-lib (~> 4.2.7.10.gitlab.2)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
gitlab-labkit (~> 0.23)
gitlab-labkit (~> 0.24)
gitlab-license_finder
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.21.0)
grpc (~> 1.42.0)
grpc-tools (~> 1.42.0)
licensee (~> 9.14.1)
licensee (~> 9.15)
pry (~> 0.12.2)
rbtrace
rdoc (~> 6.0)

View File

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.3.3";
version = "15.4.0";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,10 +22,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-JapesdZbEjGsiR9o1J/exkqlV6Y9a69PVVPS22AaJG0=";
sha256 = "sha256-cESZfLlwyC6khUrvS0LGfkvzCLudjFmlGXculYLrcDM=";
};
vendorSha256 = "sha256-aPCcTS5zflpjzb2L/oDOQotdL8cFsgKPa8b+lhCpbag=";
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

View File

@ -55,10 +55,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
ast = {
groups = ["default" "development" "test"];
@ -168,10 +168,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx";
type = "gem";
};
version = "1.10.0";
version = "1.11.0";
};
escape_utils = {
groups = ["default"];
@ -210,10 +210,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.3";
version = "1.15.5";
};
gemojione = {
dependencies = ["json"];
@ -271,10 +271,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l";
sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg";
type = "gem";
};
version = "0.23.0";
version = "0.24.0";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
@ -302,10 +302,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0825yplkfp8xf0vpl25ff58xrlah98x9yv3hj9pgl82b0gqali6p";
sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9";
type = "gem";
};
version = "3.21.3";
version = "3.21.5";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -313,10 +313,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w860lqs5j6n58a8qn4wr16hp0qz7cq5h67dgma04gncjwqiyhf5";
sha256 = "04sy3c91nlw2sv53xf2h2yf0cc09bdcvj2qbjsxwzxpbqgfrf255";
type = "gem";
};
version = "1.3.0";
version = "1.4.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -385,10 +385,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab";
type = "gem";
};
version = "9.14.1";
version = "9.15.2";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@ -396,10 +396,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1";
type = "gem";
};
version = "2.16.0";
version = "2.18.0";
};
memoizable = {
dependencies = ["thread_safe"];
@ -464,10 +464,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
type = "gem";
};
version = "5.16.2";
version = "5.16.3";
};
msgpack = {
groups = ["default"];
@ -558,10 +558,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r";
sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk";
type = "gem";
};
version = "2.1.1";
version = "2.1.3";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@ -594,10 +594,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.6";
version = "4.0.7";
};
racc = {
groups = ["default"];
@ -614,10 +614,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
type = "gem";
};
version = "2.2.3";
version = "2.2.4";
};
rack-test = {
dependencies = ["rack"];
@ -625,10 +625,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd";
type = "gem";
};
version = "1.1.0";
version = "2.0.2";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -647,10 +647,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk";
sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
type = "gem";
};
version = "1.4.2";
version = "1.4.3";
};
rainbow = {
source = {
@ -686,10 +686,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720";
sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010";
type = "gem";
};
version = "4.4.0";
version = "4.8.0";
};
regexp_parser = {
groups = ["default" "development" "test"];
@ -727,10 +727,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k";
sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3";
type = "gem";
};
version = "3.27.0";
version = "3.30.0";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@ -915,10 +915,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rb9nax4k72zbriq7k98shfcj4lf54sqjpin2xm6ma7bb48ra8mc";
sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
type = "gem";
};
version = "0.15.0";
version = "0.16.0";
};
timecop = {
source = {

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.3.3";
version = "15.4.0";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-fOAHv+/FiR/R0ohhluDig5zKH9ZkBABrr0aeFsT3U8M=";
vendorSha256 = "sha256-dN3DfkAJkqkmGyahsBDsPQBog52RGECV+SESSR6W3fg=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

View File

@ -2,6 +2,8 @@
source 'https://rubygems.org'
gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false
gem 'rails', '~> 6.1.6.1'
gem 'bootsnap', '~> 1.13.0', require: false
@ -11,7 +13,7 @@ gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.61'
gem 'view_component', '~> 2.71.0'
# Default values for AR models
gem 'default_value_for', '~> 3.4.0'
@ -29,32 +31,33 @@ gem 'marginalia', '~> 1.10.0'
gem 'declarative_policy', '~> 1.1.0'
# Authentication libraries
gem 'devise', '~> 4.7.2'
gem 'devise', '~> 4.8.1'
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'devise-pbkdf2-encryptable'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.5.0.rc2'
gem 'doorkeeper-openid_connect', '~> 1.7.5'
gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth', '~> 1.8'
gem 'omniauth-rails_csrf_protection'
gem 'omniauth', '~> 2.1.0'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
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-github', '2.0.0'
gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
gem 'omniauth-google-oauth2', '~> 0.6.0'
gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'omniauth-google-oauth2' # See gem README.md
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10'
gem 'omniauth-saml', '~> 2.0.0'
gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0', path: 'omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5', path: 'omniauth-salesforce' # See gem README.md
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.21.2'
gem 'jwt', '~> 2.1.0'
@ -164,21 +167,21 @@ gem 'rdoc', '~> 6.3.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor', '~> 2.0.17'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
gem 'asciidoctor-plantuml', '~> 0.0.16'
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
gem 'rouge', '~> 3.30.0'
gem 'truncato', '~> 0.7.12'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.13.0'
gem 'nokogiri', '~> 1.13.8'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
gem 'icalendar'
# Diffs
gem 'diffy', '~> 3.3'
gem 'diffy', '~> 3.4'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
@ -187,7 +190,7 @@ gem 'rack', '~> 2.2.4'
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 5.6.4', require: false
gem 'puma', '~> 5.6.5', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@ -199,8 +202,8 @@ gem 'state_machines-activerecord', '~> 0.8.0'
gem 'acts-as-taggable-on', '~> 9.0'
# Background jobs
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-cron', '~> 1.2'
gem 'sidekiq', '~> 6.4.0'
gem 'sidekiq-cron', '~> 1.4.0'
gem 'redis-namespace', '~> 1.8.1'
gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
@ -233,7 +236,7 @@ gem 'js_regex', '~> 3.7'
gem 'device_detector'
# Redis
gem 'redis', '~> 4.4.0'
gem 'redis', '~> 4.7.0'
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -272,7 +275,9 @@ gem 'babosa', '~> 1.0.4'
gem 'loofah', '~> 2.18.0'
# Working with license
gem 'licensee', '~> 9.14.1'
# Detects the open source license the repository includes
# This version needs to be in sync with gitlab-org/gitaly
gem 'licensee', '~> 9.15'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@ -318,9 +323,7 @@ gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.24.0'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
gem 'thrift', '>= 0.16.0'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@ -338,22 +341,21 @@ gem 'peek', '~> 1.1'
gem 'snowplow-tracker', '~> 0.6.1'
# Metrics
gem 'method_source', '~> 1.0', require: false
gem 'webrick', '~> 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.1.0', require: false
gem 'lefthook', '~> 1.1.1', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.45.0', require: false
gem 'solargraph', '~> 0.46.0', require: false
gem 'letter_opener_web', '~> 2.0.0'
gem 'lookbook'
gem 'lookbook', '~> 1.0'
# Better errors handler
gem 'better_errors', '~> 2.9.0'
gem 'better_errors', '~> 2.9.1'
gem 'sprite-factory', '~> 1.7'
end
@ -380,12 +382,14 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 7.1.0', require: false
gem 'gitlab-styles', '~> 8.0.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'haml_lint', '~> 0.40.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
# Benchmarking & profiling
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'benchmark-memory', '~> 0.1', require: false
gem 'knapsack', '~> 1.21.1'
gem 'crystalball', '~> 0.7.0', require: false
@ -406,7 +410,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
gem 'gitlab-dangerfiles', '~> 3.5.2', require: false
end
group :development, :test, :coverage do
@ -457,10 +461,9 @@ gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
gem 'ruby-prof', '~> 1.3.0'
gem 'stackprof', '~> 0.2.15', require: false
gem 'stackprof', '~> 0.2.21', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
gem 'benchmark-memory', '~> 0.1', require: false
gem 'activerecord-explain-analyze', '~> 0.1', require: false
# OAuth
@ -480,10 +483,10 @@ gem 'net-ntp'
gem 'ssh_data', '~> 1.3'
# Spamcheck GRPC protocol definitions
gem 'spamcheck', '~> 0.1.0'
gem 'spamcheck', '~> 1.0.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 15.3.0-rc3'
gem 'gitaly', '~> 15.4.0-rc2'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -524,6 +527,8 @@ gem 'erubi', '~> 1.9.0'
gem 'mail', '= 2.7.1'
gem 'mail-smtp_pool', '~> 0.1.0', path: 'mail-smtp_pool', require: false
gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'microsoft_graph_mailer'
# File encryption
gem 'lockbox', '~> 0.6.2'

View File

@ -1,3 +1,9 @@
PATH
remote: bundler-checksum
specs:
bundler-checksum (0.1.0)
bundler
PATH
remote: devise-pbkdf2-encryptable
specs:
@ -14,7 +20,7 @@ PATH
remote: ipynbdiff
specs:
ipynbdiff (0.4.7)
diffy (~> 3.3)
diffy (~> 3.4)
oj (~> 3.13.16)
PATH
@ -24,28 +30,59 @@ PATH
connection_pool (~> 2.0)
mail (~> 2.7)
PATH
remote: microsoft_graph_mailer
specs:
microsoft_graph_mailer (0.1.0)
mail (~> 2.7)
oauth2 (>= 1.4.4, < 3)
PATH
remote: omniauth-azure-oauth2
specs:
omniauth-azure-oauth2 (0.0.10)
jwt (>= 1.0, < 3.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.4)
PATH
remote: omniauth-cas3
specs:
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
omniauth (~> 1.2, < 3)
omniauth (~> 2.0)
PATH
remote: omniauth-gitlab
specs:
omniauth-gitlab (4.0.0)
omniauth (~> 1.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
PATH
remote: omniauth-google-oauth2
specs:
omniauth-google-oauth2 (1.0.1)
jwt (>= 2.0)
oauth2 (~> 2.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
PATH
remote: omniauth-salesforce
specs:
omniauth-salesforce (1.0.5)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.0)
PATH
remote: omniauth_crowd
specs:
omniauth_crowd (2.4.0)
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0, < 3)
omniauth (~> 2.0)
GEM
remote: https://rubygems.org/
@ -131,13 +168,13 @@ GEM
faraday_middleware (~> 1.0)
faraday_middleware-multi_json (~> 0.0)
oauth2 (>= 1.4, < 3)
asciidoctor (2.0.15)
asciidoctor (2.0.17)
asciidoctor-include-ext (0.4.0)
asciidoctor (>= 1.5.6, < 3.0.0)
asciidoctor-kroki (0.5.0)
asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0)
asciidoctor-plantuml (0.0.16)
asciidoctor (>= 2.0.17, < 3.0.0)
ast (2.4.2)
atlassian-jwt (0.2.0)
jwt (~> 2.1.0)
@ -306,7 +343,7 @@ GEM
ruby-statistics (>= 2.1)
thor (>= 0.19, < 2)
device_detector (1.0.0)
devise (4.7.3)
devise (4.8.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
@ -320,7 +357,7 @@ GEM
rotp (~> 6.0)
diff-lcs (1.5.0)
diff_match_patch (0.1.0)
diffy (3.3.0)
diffy (3.4.2)
discordrb-webhooks (3.4.2)
rest-client (>= 2.0.0)
docile (1.4.0)
@ -377,7 +414,7 @@ GEM
encryptor (3.0.0)
erubi (1.9.0)
escape_utils (1.2.1)
et-orbi (1.2.1)
et-orbi (1.2.7)
tzinfo
ethon (0.15.0)
ffi (>= 1.15.0)
@ -486,7 +523,7 @@ GEM
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5)
fugit (1.2.1)
fugit (1.2.3)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.1)
fuubar (2.2.0)
@ -508,7 +545,7 @@ GEM
rails (>= 3.2.0)
git (1.11.0)
rchardet (~> 1.8)
gitaly (15.3.0.pre.rc3)
gitaly (15.4.0.pre.rc2)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
@ -516,7 +553,7 @@ GEM
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.5.0)
gitlab-dangerfiles (3.5.2)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
@ -540,15 +577,15 @@ GEM
redis (> 3.0.0, < 5.0.0)
gitlab-license (2.2.1)
gitlab-mail_room (0.0.9)
gitlab-markup (1.8.0)
gitlab-markup (1.8.1)
gitlab-net-dns (0.9.1)
gitlab-omniauth-openid-connect (0.9.1)
gitlab-omniauth-openid-connect (0.10.0)
addressable (~> 2.7)
omniauth (~> 1.9)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.8.0)
sidekiq (~> 6.1)
gitlab-styles (7.1.0)
gitlab-styles (8.0.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.10)
@ -580,7 +617,7 @@ GEM
signet (~> 0.12)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-protobuf (3.21.3)
google-protobuf (3.21.5)
googleapis-common-protos-types (1.3.0)
google-protobuf (~> 3.14)
googleauth (0.14.0)
@ -649,10 +686,10 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
haml (5.1.2)
haml (5.2.2)
temple (>= 0.8.0)
tilt
haml_lint (0.36.0)
haml_lint (0.40.1)
haml (>= 4.0, < 5.3)
parallel (~> 1.10)
rainbow
@ -757,7 +794,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.1.0)
lefthook (1.1.1)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -773,9 +810,9 @@ GEM
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.9)
licensee (9.14.1)
licensee (9.15.2)
dotenv (~> 2.0)
octokit (~> 4.17)
octokit (~> 4.20)
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
@ -792,9 +829,11 @@ GEM
loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lookbook (0.9.3)
lookbook (1.0.3)
actioncable
css_parser
htmlbeautifier (~> 1.3)
htmlentities (~> 4.3.4)
listen (~> 3.0)
railties (>= 5.0)
redcarpet (~> 3.5)
@ -888,9 +927,10 @@ GEM
train-core
wmi-lite (~> 1.0)
oj (3.13.21)
omniauth (1.9.1)
omniauth (2.1.0)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
rack (>= 2.2.3)
rack-protection
omniauth-alicloud (1.0.1)
omniauth-oauth2 (~> 1.7.1)
omniauth-atlassian-oauth2 (0.2.0)
@ -903,21 +943,13 @@ GEM
omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (1.0.0)
omniauth-oauth2 (~> 1.7)
omniauth-azure-oauth2 (0.0.10)
jwt (>= 1.0, < 3.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.4)
omniauth-dingtalk-oauth2 (1.0.1)
omniauth-oauth2 (~> 1.7)
omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.4.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-google-oauth2 (0.6.0)
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
omniauth-github (2.0.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-oauth (1.2.0)
oauth
omniauth (>= 1.0, < 3)
@ -926,12 +958,12 @@ GEM
omniauth (>= 1.9, < 3)
omniauth-oauth2-generic (0.2.2)
omniauth-oauth2 (~> 1.0)
omniauth-salesforce (1.0.5)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-saml (1.10.0)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2)
omniauth (~> 2.0)
omniauth-saml (2.0.0)
omniauth (~> 2.0)
ruby-saml (~> 1.9)
omniauth-shibboleth (1.3.0)
omniauth (>= 1.0.0)
omniauth-twitter (1.4.0)
@ -980,7 +1012,7 @@ GEM
rspec (>= 2.14)
term-ansicolor (~> 1.0)
parallel (1.22.1)
parser (3.1.2.0)
parser (3.1.2.1)
ast (~> 2.4.1)
parslet (1.8.2)
pastel (0.8.0)
@ -988,7 +1020,7 @@ GEM
peek (1.1.0)
railties (>= 4.0.0)
pg (1.4.3)
pg_query (2.1.3)
pg_query (2.1.4)
google-protobuf (>= 3.19.2)
plist (3.6.0)
png_quantizator (0.2.1)
@ -1019,13 +1051,13 @@ GEM
tty-markdown
tty-prompt
public_suffix (4.0.7)
puma (5.6.4)
puma (5.6.5)
nio4r (~> 2.0)
puma_worker_killer (0.3.1)
get_process_mem (~> 0.2)
puma (>= 2.7)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
raabro (1.4.0)
racc (1.6.0)
rack (2.2.4)
rack-accept (0.4.5)
@ -1040,6 +1072,8 @@ GEM
httpclient
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (2.2.2)
rack
rack-proxy (0.7.2)
rack
rack-test (1.1.0)
@ -1083,7 +1117,7 @@ GEM
randexp (0.1.7)
rash_alt (0.4.12)
hashie (>= 3.4)
rb-fsevent (0.11.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbtrace (0.4.14)
@ -1098,7 +1132,7 @@ GEM
json
recursive-open-struct (1.1.3)
redcarpet (3.5.1)
redis (4.4.0)
redis (4.7.1)
redis-actionpack (5.3.0)
actionpack (>= 5, < 8)
redis-rack (>= 2.1.0, < 3)
@ -1187,11 +1221,11 @@ GEM
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.19.1)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-graphql (0.14.3)
rubocop-graphql (0.14.6)
rubocop (>= 0.87, < 2)
rubocop-performance (1.9.2)
rubocop (>= 0.90.0, < 2.0)
@ -1269,12 +1303,12 @@ GEM
shellany (0.0.1)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
sidekiq (6.4.0)
sidekiq (6.4.2)
connection_pool (>= 2.2.2)
rack (~> 2.0)
redis (>= 4.2.0)
sidekiq-cron (1.2.0)
fugit (~> 1.1)
sidekiq-cron (1.4.0)
fugit (~> 1)
sidekiq (>= 4.2.1)
sigdump (0.2.4)
signet (0.17.0)
@ -1296,7 +1330,7 @@ GEM
slack-messenger (2.3.4)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
solargraph (0.45.0)
solargraph (0.46.0)
backport (~> 1.2)
benchmark
bundler (>= 1.17.2)
@ -1314,7 +1348,7 @@ GEM
sorted_set (1.0.3)
rbtree
set (~> 1.0)
spamcheck (0.1.0)
spamcheck (1.0.0)
grpc (~> 1.0)
spring (2.1.1)
spring-commands-rspec (1.0.4)
@ -1330,7 +1364,7 @@ GEM
sqlite3 (1.4.2)
ssh_data (1.3.0)
ssrf_filter (1.0.7)
stackprof (0.2.15)
stackprof (0.2.21)
state_machines (0.5.0)
state_machines-activemodel (0.8.0)
activemodel (>= 5.1)
@ -1364,7 +1398,7 @@ GEM
faraday (~> 1.0)
text (1.3.1)
thor (1.2.1)
thrift (0.14.0)
thrift (0.16.0)
tilt (2.0.10)
timecop (0.9.1)
timeliness (0.3.10)
@ -1432,7 +1466,7 @@ GEM
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (1.0.13)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
validates_hostname (1.0.11)
@ -1440,12 +1474,13 @@ GEM
activesupport (>= 3.0)
version_gem (1.0.0)
version_sorter (2.2.4)
view_component (2.61.0)
view_component (2.71.0)
activesupport (>= 5.0.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
vmstat (2.3.0)
warden (1.2.8)
rack (>= 2.0.6)
warden (1.2.9)
rack (>= 2.0.9)
warning (1.3.0)
webauthn (2.3.0)
android_key_attestation (~> 0.3.0)
@ -1495,10 +1530,10 @@ DEPENDENCIES
akismet (~> 3.0)
apollo_upload_server (~> 2.1.0)
asana (~> 0.10.13)
asciidoctor (~> 2.0.10)
asciidoctor (~> 2.0.17)
asciidoctor-include-ext (~> 0.4.0)
asciidoctor-kroki (~> 0.5.0)
asciidoctor-plantuml (~> 0.0.12)
asciidoctor-plantuml (~> 0.0.16)
atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0)
autoprefixer-rails (= 10.2.5.1)
@ -1512,12 +1547,13 @@ DEPENDENCIES
bcrypt (~> 3.1, >= 3.1.14)
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.0)
better_errors (~> 2.9.1)
bootsnap (~> 1.13.0)
bootstrap_form (~> 4.2.0)
browser (~> 4.2)
bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
bundler-checksum (~> 0.1.0)!
capybara (~> 3.35.3)
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
@ -1535,11 +1571,11 @@ DEPENDENCIES
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
device_detector
devise (~> 4.7.2)
devise (~> 4.8.1)
devise-pbkdf2-encryptable (~> 0.0.0)!
devise-two-factor (~> 4.0.2)
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)
diffy (~> 3.4)
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5)
@ -1573,10 +1609,10 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 15.3.0.pre.rc3)
gitaly (~> 15.4.0.pre.rc2)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.5.0)
gitlab-dangerfiles (~> 3.5.2)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.3.0)
gitlab-labkit (~> 0.24.0)
@ -1584,9 +1620,9 @@ DEPENDENCIES
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0)
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.9.0)
gitlab-omniauth-openid-connect (~> 0.10.0)
gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 7.1.0)
gitlab-styles (~> 8.0.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
@ -1605,7 +1641,7 @@ DEPENDENCIES
grpc (~> 1.42.0)
gssapi
guard-rspec
haml_lint (~> 0.36.0)
haml_lint (~> 0.40.0)
hamlit (~> 2.15.0)
hangouts-chat (~> 0.0.5)
hashie
@ -1628,46 +1664,47 @@ DEPENDENCIES
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.9.3)
lefthook (~> 1.1.0)
lefthook (~> 1.1.1)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.14.1)
licensee (~> 9.15)
lockbox (~> 0.6.2)
lograge (~> 0.5)
loofah (~> 2.18.0)
lookbook
lookbook (~> 1.0)
lru_redux
mail (= 2.7.1)
mail-smtp_pool (~> 0.1.0)!
marginalia (~> 1.10.0)
memory_profiler (~> 0.9)
method_source (~> 1.0)
microsoft_graph_mailer (~> 0.1.0)!
mini_magick (~> 4.10.1)
minitest (~> 5.11.0)
multi_json (~> 1.14.1)
net-ldap (~> 0.16.3)
net-ntp
nokogiri (~> 1.13.0)
nokogiri (~> 1.13.8)
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 16.10)
oj (~> 3.13.21)
omniauth (~> 1.8)
omniauth (~> 2.1.0)
omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 1.0)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-azure-oauth2 (~> 0.0.9)!
omniauth-cas3 (~> 1.1.4)!
omniauth-dingtalk-oauth2 (~> 1.0)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.4)
omniauth-github (= 2.0.0)
omniauth-gitlab (~> 4.0.0)!
omniauth-google-oauth2 (~> 0.6.0)
omniauth-google-oauth2 (~> 1.0.1)!
omniauth-oauth2-generic (~> 0.2.2)
omniauth-salesforce (~> 1.0.5)
omniauth-saml (~> 1.10)
omniauth-rails_csrf_protection
omniauth-salesforce (~> 1.0.5)!
omniauth-saml (~> 2.0.0)
omniauth-shibboleth (~> 1.3.0)
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.4.0)!
@ -1684,7 +1721,7 @@ DEPENDENCIES
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.5.1)
puma (~> 5.6.4)
puma (~> 5.6.5)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.4)
rack-attack (~> 6.6.0)
@ -1700,7 +1737,7 @@ DEPENDENCIES
rdoc (~> 6.3.2)
re2 (~> 1.4.0)
recaptcha (~> 4.11)
redis (~> 4.4.0)
redis (~> 4.7.0)
redis-actionpack (~> 5.3.0)
redis-namespace (~> 1.8.1)
request_store (~> 1.5)
@ -1735,8 +1772,8 @@ DEPENDENCIES
sentry-sidekiq (~> 5.1.1)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 5.1.0)
sidekiq (~> 6.4)
sidekiq-cron (~> 1.2)
sidekiq (~> 6.4.0)
sidekiq-cron (~> 1.4.0)
sigdump (~> 0.2.4)
simple_po_parser (~> 1.1.6)
simplecov (~> 0.21)
@ -1744,21 +1781,21 @@ DEPENDENCIES
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.6.1)
solargraph (~> 0.45.0)
spamcheck (~> 0.1.0)
solargraph (~> 0.46.0)
spamcheck (~> 1.0.0)
spring (~> 2.1.0)
spring-commands-rspec (~> 1.0.4)
sprite-factory (~> 1.7)
sprockets (~> 3.7.0)
ssh_data (~> 1.3)
stackprof (~> 0.2.15)
stackprof (~> 0.2.21)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.6)
terser (= 1.0.2)
test-prof (~> 1.0.7)
test_file_finder (~> 0.1.3)
thrift (>= 0.14.0)
thrift (>= 0.16.0)
timecop (~> 0.9.1)
timfel-krb5-auth (~> 0.8)
toml-rb (~> 2.0)
@ -1771,7 +1808,7 @@ DEPENDENCIES
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4)
view_component (~> 2.61)
view_component (~> 2.71.0)
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 2.3)

View File

@ -221,10 +221,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4";
sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd";
type = "gem";
};
version = "2.0.15";
version = "2.0.17";
};
asciidoctor-include-ext = {
dependencies = ["asciidoctor"];
@ -254,10 +254,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02knhmyd3h1yryn66xjfciz7jjsq676kl7ama0r0cf92vyyvm12x";
sha256 = "14qppm3qzfra2g2lf8jl3mbnrhi4alp8232zqz6dbpl6276lfzj0";
type = "gem";
};
version = "0.0.12";
version = "0.0.16";
};
ast = {
groups = ["default" "development" "test"];
@ -1067,10 +1067,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0syqkh0q9mcdgj68m2cf1innpxb8fv6xsayk1kgsdmq539rkv3ic";
sha256 = "0gl0b4jqf7ysv3rg99sgxa5y9va2k13p0si3a88pr7m8g6z8pm7x";
type = "gem";
};
version = "4.7.3";
version = "4.8.1";
};
devise-two-factor = {
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@ -1108,10 +1108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh";
sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n";
type = "gem";
};
version = "3.3.0";
version = "3.4.2";
};
discordrb-webhooks = {
dependencies = ["rest-client"];
@ -1394,10 +1394,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg";
sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v";
type = "gem";
};
version = "1.2.1";
version = "1.2.7";
};
ethon = {
dependencies = ["ffi"];
@ -1880,10 +1880,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav";
sha256 = "0idp3hcg50rd7nh8lywyk39s40wgq7axc9nc64si0saf3whmifm0";
type = "gem";
};
version = "1.2.1";
version = "1.2.3";
};
fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"];
@ -1977,10 +1977,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nvlnfjv5fycndri3bfbs7fsgb3cndgl3hhckiq7428yz58jgvg0";
sha256 = "1qzqyglw7akval4rxjyqygs2abdrziy6ry0cy135lq1hlwl4axj8";
type = "gem";
};
version = "15.3.0.pre.rc3";
version = "15.4.0.pre.rc2";
};
github-markup = {
groups = ["default"];
@ -2020,10 +2020,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18cs97r8msg2cvrvz9jfp6gn02xm80y4r14y7f5xpmg4k9j6ywqj";
sha256 = "07zhs9mz9gi6hgarm0px55kn6wxfah1xkcdrk217yv1vp1aqmqps";
type = "gem";
};
version = "3.5.0";
version = "3.5.2";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@ -2083,10 +2083,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11kc33j6m0nayppkb7645w0ldh8g18pgmxgb8wz39pd5vilr6qpv";
sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
type = "gem";
};
version = "1.8.0";
version = "1.8.1";
};
gitlab-net-dns = {
groups = ["default"];
@ -2104,10 +2104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nxak6q0m0nd3m5a7vp9xqww9w5fqx97viv5g6pg3q62q9binm0j";
sha256 = "0lqizfap12ica5c6q74ldarzmbpmhgl156bap9xhamrlm4za4i7a";
type = "gem";
};
version = "0.9.1";
version = "0.10.0";
};
gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"];
@ -2126,10 +2126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp";
sha256 = "1nk6gdgjs920kfzyj35im2m3rp79vhmamg8f8f3y74vh7dadhxzz";
type = "gem";
};
version = "7.1.0";
version = "8.0.0";
};
gitlab_chronic_duration = {
dependencies = ["numerizer"];
@ -2202,10 +2202,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0825yplkfp8xf0vpl25ff58xrlah98x9yv3hj9pgl82b0gqali6p";
sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9";
type = "gem";
};
version = "3.21.3";
version = "3.21.5";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -2408,10 +2408,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dwarfbc04bblljs4xg9fy57b5y8xrck6slhssa6bd7x58bh222c";
sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf";
type = "gem";
};
version = "5.1.2";
version = "5.2.2";
};
haml_lint = {
dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"];
@ -2419,10 +2419,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0imdiwxqyca1i158yrqkdv6fa8sdfk8wwx2kaq6ad9i7k7jj365a";
sha256 = "00j8wdi731wy8qnn5g4laynswxlw0d0s69wsn509wfa5n8p34n5n";
type = "gem";
};
version = "0.36.0";
version = "0.40.1";
};
hamlit = {
dependencies = ["temple" "thor" "tilt"];
@ -2907,10 +2907,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mvyr9wqgv3pp75wg8majkivzrd0imkvq5f62p1ndzm09lnv6z05";
sha256 = "0nyhh3h96c118xcyfmn2595fhavi9r0g2v7rckqzc56walncszgs";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
letter_opener = {
dependencies = ["launchy"];
@ -2961,10 +2961,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab";
type = "gem";
};
version = "9.14.1";
version = "9.15.2";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -3020,15 +3020,15 @@
version = "2.18.0";
};
lookbook = {
dependencies = ["actioncable" "htmlbeautifier" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"];
dependencies = ["actioncable" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ycj1wa1qfxiz2g2i8lqmzfhrl82n2sh6242gyp5vdzhqqyaf6yz";
sha256 = "1mmw3jklhhrvvmp2fswld7pipdgw3s5l3fg3dgv353jq6w516gn5";
type = "gem";
};
version = "0.9.3";
version = "1.0.3";
};
lru_redux = {
groups = ["default"];
@ -3511,15 +3511,15 @@
version = "3.13.21";
};
omniauth = {
dependencies = ["hashie" "rack"];
groups = ["default" "kerberos"];
dependencies = ["hashie" "rack" "rack-protection"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz";
sha256 = "0013azz7kz2q6dy8131b1q5xwl7qa9nz5iqpn8i3ccn9br7j7xxz";
type = "gem";
};
version = "1.9.1";
version = "2.1.0";
};
omniauth-alicloud = {
dependencies = ["omniauth-oauth2"];
@ -3576,17 +3576,6 @@
};
version = "1.0.0";
};
omniauth-azure-oauth2 = {
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4";
type = "gem";
};
version = "0.0.10";
};
omniauth-dingtalk-oauth2 = {
dependencies = ["omniauth-oauth2"];
groups = ["default"];
@ -3615,21 +3604,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb";
sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw";
type = "gem";
};
version = "1.4.0";
};
omniauth-google-oauth2 = {
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df";
type = "gem";
};
version = "0.6.0";
version = "2.0.0";
};
omniauth-oauth = {
dependencies = ["oauth" "omniauth"];
@ -3664,16 +3642,16 @@
};
version = "0.2.2";
};
omniauth-salesforce = {
dependencies = ["omniauth" "omniauth-oauth2"];
omniauth-rails_csrf_protection = {
dependencies = ["actionpack" "omniauth"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj";
sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w";
type = "gem";
};
version = "1.0.5";
version = "1.0.1";
};
omniauth-saml = {
dependencies = ["omniauth" "ruby-saml"];
@ -3681,10 +3659,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p";
sha256 = "1is4vnikwmd148gpyv3sm57k4cmdx4il5rm2cng6mqhdcgb4yn82";
type = "gem";
};
version = "1.10.0";
version = "2.0.0";
};
omniauth-shibboleth = {
dependencies = ["omniauth"];
@ -3849,10 +3827,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p";
type = "gem";
};
version = "3.1.2.0";
version = "3.1.2.1";
};
parslet = {
groups = ["default" "development" "test"];
@ -3902,10 +3880,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk";
sha256 = "1fyhhb5f2y5mqk5vg5ykicxp58wwhc7invfp27x8d7fgi0zkdwa8";
type = "gem";
};
version = "2.1.3";
version = "2.1.4";
};
plist = {
groups = ["default"];
@ -4045,10 +4023,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436";
type = "gem";
};
version = "5.6.4";
version = "5.6.5";
};
puma_worker_killer = {
dependencies = ["get_process_mem" "puma"];
@ -4076,10 +4054,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq";
sha256 = "10m8bln9d00dwzjil1k42i5r7l82x25ysbi45fwyv4932zsrzynl";
type = "gem";
};
version = "1.1.6";
version = "1.4.0";
};
racc = {
groups = ["default" "development" "test"];
@ -4145,6 +4123,17 @@
};
version = "1.21.2";
};
rack-protection = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx";
type = "gem";
};
version = "2.2.2";
};
rack-proxy = {
dependencies = ["rack"];
groups = ["default"];
@ -4289,10 +4278,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm";
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
type = "gem";
};
version = "0.11.1";
version = "0.11.2";
};
rb-inotify = {
dependencies = ["ffi"];
@ -4402,10 +4391,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720";
sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc";
type = "gem";
};
version = "4.4.0";
version = "4.7.1";
};
redis-actionpack = {
dependencies = ["actionpack" "redis-rack" "redis-store"];
@ -4735,10 +4724,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h8q3gwqs8afshjd2l52ywf48md9rskr3q2y4fydgm536vvahjgm";
sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg";
type = "gem";
};
version = "1.19.1";
version = "1.21.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@ -4757,10 +4746,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq";
sha256 = "1bdxal5n0q6aq457jz60jzhs3z04mv2wbvl5xd2cw3lrr6x2q3xl";
type = "gem";
};
version = "0.14.3";
version = "0.14.6";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@ -5160,10 +5149,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10pllqwracvy5nmchipg359sq9pnyg08q970xpqmpc3nkmrihxlf";
sha256 = "0b06kw7frd8hrb7373pvfd39qap00ykkvipgymgwxfjzrgz0ag0d";
type = "gem";
};
version = "6.4.0";
version = "6.4.2";
};
sidekiq-cron = {
dependencies = ["fugit" "sidekiq"];
@ -5171,10 +5160,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hxvm42zbr27k40jvdba5v8ich2ys8q7a2wbia9sxb0mmcy8v2aj";
sha256 = "0v9psfprq1x03b51mnpidfzilnm8b6spzkgap3pb8yga4pg2lq91";
type = "gem";
};
version = "1.2.0";
version = "1.4.0";
};
sigdump = {
groups = ["development" "test"];
@ -5296,10 +5285,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11c7hcgg4sflhlj9lv9yh76sxrlk9a52y6p56xc99f0w015yyslh";
sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x";
type = "gem";
};
version = "0.45.0";
version = "0.46.0";
};
sorted_set = {
dependencies = ["rbtree" "set"];
@ -5318,10 +5307,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n307r7y819gq21yqhlni3r455cgcg3nc5318rhhx1bs99qs793r";
sha256 = "177wcssfjp63vwr4rxma6sx7rc0lszrx4afp2wz3b4a0322s1vnz";
type = "gem";
};
version = "0.1.0";
version = "1.0.0";
};
spring = {
groups = ["development" "test"];
@ -5411,10 +5400,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g2zzasjdr1qnwmpmn28ddv2z9jsnv4w5raiz26y9h1jh03sagqd";
sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b";
type = "gem";
};
version = "0.2.15";
version = "0.2.21";
};
state_machines = {
groups = ["default"];
@ -5610,10 +5599,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v4q8wlc4kr952r24q9x60cvimn27g34h0j23imwqkrjcbngsj5n";
sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
type = "gem";
};
version = "0.14.0";
version = "0.16.0";
};
tilt = {
groups = ["default" "development" "test"];
@ -5947,10 +5936,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk";
sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj";
type = "gem";
};
version = "1.0.13";
version = "1.0.15";
};
validates_hostname = {
dependencies = ["activerecord" "activesupport"];
@ -5984,15 +5973,15 @@
version = "2.2.4";
};
view_component = {
dependencies = ["activesupport" "method_source"];
dependencies = ["activesupport" "concurrent-ruby" "method_source"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03my3glfw0v9g2zlwp1wad74v5n2pgz8hai8kj1n9by06vwr32v0";
sha256 = "0av6ngrfb1pyxwvy2lsp7m5lljk2vc9j7aabzw1zp70dh13hd261";
type = "gem";
};
version = "2.61.0";
version = "2.71.0";
};
vmstat = {
groups = ["default"];
@ -6010,10 +5999,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fr9n9i9r82xb6i61fdw4xgc7zjv7fsdrr4k0njchy87iw9fl454";
sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26";
type = "gem";
};
version = "1.2.8";
version = "1.2.9";
};
warning = {
groups = ["default"];

View File

@ -1,13 +1,13 @@
diff --git a/Gemfile.lock b/Gemfile.lock
index f04445e1d..b9bf34cd0 100644
index 9074b48c56b..57a1c924897 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -987,7 +987,7 @@ GEM
@@ -1019,7 +1019,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
- pg (1.4.1)
+ pg (1.4.3)
pg_query (2.1.3)
pg_query (2.1.4)
google-protobuf (>= 3.19.2)
plist (3.6.0)

View File

@ -17,7 +17,20 @@ import requests
# Always keep this in sync with the GitLaab version you're updating to.
# If you see any errors about vendored dependencies during an update, check the Gemfile.
VENDORED_GEMS = ['devise-pbkdf2-encryptable', 'omniauth-cas3', 'omniauth-gitlab', 'omniauth_crowd', 'mail-smtp_pool', 'ipynbdiff', 'error_tracking_open_api']
VENDORED_GEMS = [
"bundler-checksum",
"devise-pbkdf2-encryptable",
"omniauth-azure-oauth2",
"omniauth-cas3",
"omniauth-gitlab",
"omniauth-google-oauth2",
"omniauth_crowd",
"omniauth-salesforce",
"mail-smtp_pool",
"microsoft_graph_mailer",
"ipynbdiff",
"error_tracking_open_api",
]
logger = logging.getLogger(__name__)