gitlab: 15.6.1 -> 15.6.2

This commit is contained in:
= 2022-12-08 05:43:16 +00:00 committed by Yureka
parent d8258a3908
commit 2198c022f8
6 changed files with 17 additions and 15 deletions

View file

@ -1,15 +1,15 @@
{
"version": "15.6.1",
"repo_hash": "sha256-cdwfljmJvApU2q0pmWSmcMnHkQH4hfN7+cld5oP880g=",
"version": "15.6.2",
"repo_hash": "sha256-WMDst9BHjqK5UIYKzqJJnhrLPHxV0PmW+r8FGBueBs8=",
"yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.6.1-ee",
"rev": "v15.6.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.6.1",
"GITALY_SERVER_VERSION": "15.6.2",
"GITLAB_PAGES_VERSION": "1.63.0",
"GITLAB_SHELL_VERSION": "14.13.0",
"GITLAB_WORKHORSE_VERSION": "15.6.1"
"GITLAB_WORKHORSE_VERSION": "15.6.2"
},
"vendored_gems": [
"bundler-checksum",

View file

@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.6.1";
version = "15.6.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-mzX+6kMXqdrxqMaUwN2tG5kJgKSRv0/tNN8ibHqBbzU=";
sha256 = "sha256-or5Z96BCLFUC4r9bAZf9ytUOt4WozqwwuWGFuX2ix9k=";
};
vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo=";

View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.6.1";
version = "15.6.2";
src = fetchFromGitLab {
owner = data.owner;

View file

@ -336,8 +336,7 @@ gem 'pg_query', '~> 2.2'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.28.0'
gem 'gitlab-labkit', '~> 0.29.0'
gem 'thrift', '>= 0.16.0'
# I18n

View file

@ -575,7 +575,7 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.28.0)
gitlab-labkit (0.29.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
@ -1668,7 +1668,7 @@ DEPENDENCIES
gitlab-dangerfiles (~> 3.6.2)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.4.0)
gitlab-labkit (~> 0.28.0)
gitlab-labkit (~> 0.29.0)
gitlab-license (~> 2.2.1)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.8.0)

View file

@ -290,6 +290,9 @@
};
version = "0.2.0";
};
attr_encrypted = {
dependencies = ["encryptor"];
};
attr_required = {
groups = ["default"];
platforms = [];
@ -1093,7 +1096,7 @@
version = "4.8.1";
};
devise-two-factor = {
dependencies = ["activesupport" "devise" "railties" "rotp"];
dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
groups = ["default"];
platforms = [];
source = {
@ -2084,10 +2087,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7";
sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb";
type = "gem";
};
version = "0.28.0";
version = "0.29.0";
};
gitlab-license = {
groups = ["default"];