Merge pull request #166869 from mweinelt/gitlab
This commit is contained in:
commit
557959c7c5
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
"version": "14.9.1",
|
"version": "14.9.2",
|
||||||
"repo_hash": "0jkhvglisaj3h9ls8q8wrxnnp4xp3zggc8vmwg6jqqjsmbpi332h",
|
"repo_hash": "sha256-+tZN6isOb7LtUVwGshx9TP+P42sftJmQGVk1L9UJqcY=",
|
||||||
"yarn_hash": "1bq1ka0nlb2nkjx70qpwpm8x6crbkfj0c8m39pwwc42j8wn10r9g",
|
"yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj",
|
||||||
"owner": "gitlab-org",
|
"owner": "gitlab-org",
|
||||||
"repo": "gitlab",
|
"repo": "gitlab",
|
||||||
"rev": "v14.9.1-ee",
|
"rev": "v14.9.2-ee",
|
||||||
"passthru": {
|
"passthru": {
|
||||||
"GITALY_SERVER_VERSION": "14.9.1",
|
"GITALY_SERVER_VERSION": "14.9.2",
|
||||||
"GITLAB_PAGES_VERSION": "1.56.0",
|
"GITLAB_PAGES_VERSION": "1.56.1",
|
||||||
"GITLAB_SHELL_VERSION": "13.24.0",
|
"GITLAB_SHELL_VERSION": "13.24.0",
|
||||||
"GITLAB_WORKHORSE_VERSION": "14.9.1"
|
"GITLAB_WORKHORSE_VERSION": "14.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ let
|
||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "14.9.1";
|
version = "14.9.2";
|
||||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ buildGoModule {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-mk6JZuu6b2r/OqRI4ZUf8AV/ObRKhTIQT9bQE8sH894=";
|
sha256 = "sha256-eEo+WZ2N/5bLfvwJCNf9qt+h/V5dIVqCjVJeomzw/Ps=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";
|
vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";
|
||||||
|
|
|
@ -5,7 +5,7 @@ in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-workhorse";
|
pname = "gitlab-workhorse";
|
||||||
|
|
||||||
version = "14.9.1";
|
version = "14.9.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = data.owner;
|
owner = data.owner;
|
||||||
|
|
|
@ -67,7 +67,7 @@ gem 'akismet', '~> 3.0'
|
||||||
gem 'invisible_captcha', '~> 1.1.0'
|
gem 'invisible_captcha', '~> 1.1.0'
|
||||||
|
|
||||||
# Two-factor authentication
|
# Two-factor authentication
|
||||||
gem 'devise-two-factor', '~> 4.0.0'
|
gem 'devise-two-factor', '~> 4.0.2'
|
||||||
gem 'rqrcode-rails3', '~> 0.1.7'
|
gem 'rqrcode-rails3', '~> 0.1.7'
|
||||||
gem 'attr_encrypted', '~> 3.1.0'
|
gem 'attr_encrypted', '~> 3.1.0'
|
||||||
gem 'u2f', '~> 0.2.1'
|
gem 'u2f', '~> 0.2.1'
|
||||||
|
|
|
@ -263,11 +263,11 @@ GEM
|
||||||
railties (>= 4.1.0)
|
railties (>= 4.1.0)
|
||||||
responders
|
responders
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-two-factor (4.0.0)
|
devise-two-factor (4.0.2)
|
||||||
activesupport (< 6.2)
|
activesupport (< 7.1)
|
||||||
attr_encrypted (>= 1.3, < 4, != 2)
|
attr_encrypted (>= 1.3, < 4, != 2)
|
||||||
devise (~> 4.0)
|
devise (~> 4.0)
|
||||||
railties (< 6.2)
|
railties (< 7.1)
|
||||||
rotp (~> 6.0)
|
rotp (~> 6.0)
|
||||||
diff-lcs (1.4.4)
|
diff-lcs (1.4.4)
|
||||||
diff_match_patch (0.1.0)
|
diff_match_patch (0.1.0)
|
||||||
|
@ -1450,7 +1450,7 @@ DEPENDENCIES
|
||||||
derailed_benchmarks
|
derailed_benchmarks
|
||||||
device_detector
|
device_detector
|
||||||
devise (~> 4.7.2)
|
devise (~> 4.7.2)
|
||||||
devise-two-factor (~> 4.0.0)
|
devise-two-factor (~> 4.0.2)
|
||||||
diff_match_patch (~> 0.1.0)
|
diff_match_patch (~> 0.1.0)
|
||||||
diffy (~> 3.3)
|
diffy (~> 3.3)
|
||||||
discordrb-webhooks (~> 3.4)
|
discordrb-webhooks (~> 3.4)
|
||||||
|
|
|
@ -1088,10 +1088,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "148pfr6g8dwikdq3994gsid2a3n6p5h4z1a1dzh1898shr5f9znc";
|
sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "4.0.0";
|
version = "4.0.2";
|
||||||
};
|
};
|
||||||
diff-lcs = {
|
diff-lcs = {
|
||||||
groups = ["default" "development" "test"];
|
groups = ["default" "development" "test"];
|
||||||
|
|
Loading…
Reference in a new issue