diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-05-20 06:14:24 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-05-20 06:14:24 +0000 |
| commit | 34032f2dc124a8c869111fd6e9b49f83e04ade69 (patch) | |
| tree | 8ac1a13fa17df115b0e58469bd8c56e86e44cc1e /www/gitlab-ce/files/patch-Gemfile | |
| parent | Update to 8.30.1 which is required for gitlab-ce 12.10 upgrade. (diff) | |
Update to 12.10.6.
Changelogs:
https://about.gitlab.com/releases/2020/04/22/gitlab-12-10-released/
https://about.gitlab.com/releases/2020/04/24/gitlab-12-10-1-released/
https://about.gitlab.com/releases/2020/04/30/security-release-12-10-2-released/
https://about.gitlab.com/releases/2020/05/04/gitlab-12-10-3-released/
https://about.gitlab.com/releases/2020/05/13/gitlab-12-10-5-released/
https://about.gitlab.com/releases/2020/05/15/gitlab-12-10-6-released/
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 636db2842e31..08f241dfb3b8 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,10 +1,10 @@ ---- Gemfile.orig 2020-04-14 21:01:52 UTC +--- Gemfile.orig 2020-05-04 10:07:41 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '6.0.2' -+gem 'rails', '6.0.2.2' ++gem 'rails', '6.0.3.1' gem 'bootsnap', '~> 1.4.6' @@ -17,7 +17,7 @@ gem 'grape-path-helpers', '~> 1.2' gem 'faraday', '~> 0.12' -@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.19' +@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.10.5' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' @@ -34,7 +34,7 @@ # Jira integration gem 'jira-ruby', '~> 1.7' -@@ -329,92 +328,6 @@ group :metrics do +@@ -329,91 +328,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.10.0' gem 'raindrops', '~> 0.18' @@ -75,7 +75,7 @@ - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 3.1.0', require: false +- gem 'gitlab-styles', '~> 3.2.0', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.74.0' - gem 'rubocop-performance', '~> 1.4.1' @@ -108,7 +108,6 @@ - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' -- gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false - - gem 'capybara', '~> 3.22.0' |