diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-04 20:07:29 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-06-04 20:07:29 +0000 |
| commit | dffa6ca4c7942285ea3f2ae5472001f61b1feb96 (patch) | |
| tree | 1a9501436dfd7d9e118398924735386a6eb88b46 /www/gitlab-ce/files/patch-Gemfile | |
| parent | Update xfce4-stopwatch-plugin to 0.4.0 (diff) | |
Update to gitlab-ce 13.0.5.
Changelog:
https://about.gitlab.com/releases/2020/05/06/gitlab-com-13-0-breaking-changes/
https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/
https://about.gitlab.com/releases/2020/06/03/critical-security-release-13-0-4-released/
Make sure you read the upgrade manual very carefully, there is a manual change in file:
/usr/local/share/gitaly/config.toml
required that the diff does not show.
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 08f241dfb3b8..43e4ccb870ae 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,13 +1,5 @@ ---- Gemfile.orig 2020-05-04 10:07:41 UTC +--- Gemfile.orig 2020-05-21 17:04:27 UTC +++ Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '6.0.2' -+gem 'rails', '6.0.3.1' - - gem 'bootsnap', '~> 1.4.6' - @@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0' # Supported DBs gem 'pg', '~> 1.1' @@ -33,8 +25,8 @@ +gem 'hipchat', '~> 1.6.0' # Jira integration - gem 'jira-ruby', '~> 1.7' -@@ -329,91 +328,6 @@ group :metrics do + gem 'jira-ruby', '~> 2.0.0' +@@ -325,94 +324,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.10.0' gem 'raindrops', '~> 0.18' @@ -64,7 +56,7 @@ - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' -- gem 'rspec-rails', '~> 4.0.0.beta4' +- gem 'rspec-rails', '~> 4.0.0' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' @@ -123,6 +115,9 @@ - gem 'test-prof', '~> 0.10.0' - gem 'rspec_junit_formatter' - gem 'guard-rspec' +- +- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 +- gem 'derailed_benchmarks', require: false end gem 'octokit', '~> 4.15' |