Skip to content

[24.05] gitlab: 17.6.1 -> 17.6.2 #367393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leona-ya merged 1 commit into from
Dec 22, 2024
Merged

[24.05] gitlab: 17.6.1 -> 17.6.2 #367393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/applications/version-management/gitlab/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "17.6.1",
"repo_hash": "1az442dj0xxkb3bdqgln7ax5779bmndbx8p8mszybgghkjl0g4nq",
"version": "17.6.2",
"repo_hash": "0j08l2rhhlm5b6cim3bq5zk6lwimf467jhqarm01mxn53qj5rfna",
"yarn_hash": "0g60lvngbvgvirjag5l539innmklh2x6a56vd38svrgx5jm6d3jc",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v17.6.1-ee",
"rev": "v17.6.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "17.6.1",
"GITLAB_PAGES_VERSION": "17.6.1",
"GITALY_SERVER_VERSION": "17.6.2",
"GITLAB_PAGES_VERSION": "17.6.2",
"GITLAB_SHELL_VERSION": "14.39.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
"GITLAB_WORKHORSE_VERSION": "17.6.1"
"GITLAB_WORKHORSE_VERSION": "17.6.2"
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}:

let
version = "17.6.1";
version = "17.6.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

Expand All @@ -21,7 +21,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-eh/dMoKnwN+xz6dMnPZUD8b/SyrxUqDAtWmCIBXbIT4=";
hash = "sha256-i+Yk5hFhtIxf12crSJRbkHNbfPy9ZbxSNFEPwFOovhE=";
};

vendorHash = "sha256-AxuAEiYV3jwWxcuTLc1i4/6sG957YIA+Fmky5Dkdzu8=";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

buildGoModule rec {
pname = "gitlab-pages";
version = "17.6.1";
version = "17.6.2";

# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-fLQ2Hd1GtSBfxUJIozf4xcXC5yvNX4xqh0H0UVL55kw=";
hash = "sha256-iO6kMggGajB7ARXsJynEVbgd7iPBBp0x6J1lKuOxgH4=";
};

vendorHash = "sha256-2feUOWcGj7eQ43rfM6IF55BawYVP4UY5sKA29Y9ozPk=";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";

version = "17.6.1";
version = "17.6.2";

# nixpkgs-update: no auto update
src = fetchFromGitLab {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi
gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory

# Remote Development
gem 'devfile', '~> 0.1.0', feature_category: :workspaces
gem 'devfile', '~> 0.1.1', feature_category: :workspaces

# Apple plist parsing
gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ GEM
thor (>= 0.19, < 2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devfile (0.1.0)
devfile (0.1.1)
device_detector (1.0.0)
devise (4.9.3)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -2018,7 +2018,7 @@ DEPENDENCIES
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
devfile (~> 0.1.0)
devfile (~> 0.1.1)
device_detector
devise (~> 4.9.3)
devise-pbkdf2-encryptable (~> 0.0.0)!
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,10 +1233,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18fbys0bf562681c96a4qcbdwxhlc9w3jz8rzkkfqns421hn024q";
sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f";
type = "gem";
};
version = "0.1.0";
version = "0.1.1";
};
device_detector = {
groups = ["default"];
Expand Down