-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51072 from flokli/gitlab-11.5.0-18.09
[18.09] Gitlab 11.5.0
- Loading branch information
Showing
15 changed files
with
337 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 0 additions & 27 deletions
27
pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"ce": { | ||
"version": "11.5.0", | ||
"repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb", | ||
"deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp", | ||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb", | ||
"owner": "gitlab-org", | ||
"repo": "gitlab-ce", | ||
"rev": "v11.5.0", | ||
"passthru": { | ||
"GITALY_SERVER_VERSION": "0.129.0", | ||
"GITLAB_PAGES_VERSION": "1.3.0", | ||
"GITLAB_SHELL_VERSION": "8.4.1", | ||
"GITLAB_WORKHORSE_VERSION": "7.1.0" | ||
} | ||
}, | ||
"ee": { | ||
"version": "11.5.0", | ||
"repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z", | ||
"deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c", | ||
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb", | ||
"owner": "gitlab-org", | ||
"repo": "gitlab-ee", | ||
"rev": "v11.5.0-ee", | ||
"passthru": { | ||
"GITALY_SERVER_VERSION": "0.129.0", | ||
"GITLAB_PAGES_VERSION": "1.3.0", | ||
"GITLAB_SHELL_VERSION": "8.4.1", | ||
"GITLAB_WORKHORSE_VERSION": "7.1.0" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 11 additions & 6 deletions
17
...cations/version-management/gitaly/Gemfile → .../version-management/gitlab/gitaly/Gemfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,30 @@ | ||
source 'https://rubygems.org' | ||
|
||
gem 'rugged', '~> 0.27.4' | ||
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 | ||
gem 'bundler', '>= 1.16.5' | ||
|
||
gem 'rugged', '~> 0.27' | ||
gem 'github-linguist', '~> 6.1', require: 'linguist' | ||
gem 'gitlab-markup', '~> 1.6.4' | ||
gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly' | ||
gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly' | ||
gem 'activesupport', '~> 5.0.2' | ||
gem 'rdoc', '~> 4.2' | ||
gem 'gitlab-gollum-lib', '~> 4.2', require: false | ||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false | ||
gem 'grpc', '~> 1.11.0' | ||
gem 'grpc', '~> 1.15.0' | ||
gem 'sentry-raven', '~> 2.7.2', require: false | ||
gem 'faraday', '~> 0.12' | ||
|
||
# Detects the open source license the repository includes | ||
# This version needs to be in sync with GitLab CE/EE | ||
gem 'licensee', '~> 8.9.0' | ||
|
||
# Locked until https://github.com/google/protobuf/issues/4210 is closed | ||
gem 'google-protobuf', '= 3.5.1' | ||
gem 'google-protobuf', '~> 3.6' | ||
|
||
group :development, :test do | ||
gem 'gitlab-styles', '~> 2.0.0', require: false | ||
gem 'rubocop', '~> 0.50', require: false | ||
gem 'rspec', require: false | ||
gem 'rspec-parameterized', require: false | ||
gem 'timecop', require: false | ||
gem 'factory_bot', require: false | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.