diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
-rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 3f9db28946a0..eb8425947848 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2020-08-21 12:16:22 UTC +--- Gemfile.orig 2020-09-21 16:23:36 UTC +++ Gemfile @@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0' # Supported DBs @@ -8,16 +8,16 @@ +gem 'rugged', '~> 1.0' gem 'grape-path-helpers', '~> 1.3' - gem 'faraday', '~> 0.12' -@@ -94,7 +94,6 @@ gem 'graphql', '~> 1.10.5' + gem 'faraday', '~> 1.0' +@@ -95,7 +95,6 @@ gem 'graphql', '~> 1.11.4' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' - gem 'apollo_upload_server', '~> 2.0.0.beta3' + gem 'apollo_upload_server', '~> 2.0.2' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' -@@ -233,7 +232,7 @@ gem 'redis-rails', '~> 5.0.2' +@@ -234,7 +233,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration @@ -26,27 +26,26 @@ # Jira integration gem 'jira-ruby', '~> 2.0.0' -@@ -335,95 +334,6 @@ group :metrics do +@@ -334,94 +333,6 @@ group :metrics do gem 'raindrops', '~> 0.18' end -group :development do - gem 'brakeman', '~> 4.2', require: false -- gem 'danger', '~> 6.0', require: false +- gem 'danger', '~> 8.0', require: false - - gem 'letter_opener_web', '~> 1.3.4' - - # Better errors handler - gem 'better_errors', '~> 2.7.1' -- gem 'binding_of_caller', '~> 0.8.0' - - # thin instead webrick - gem 'thin', '~> 1.7.0' -end - -group :development, :test do -- gem 'bullet', '~> 6.0.2' -- gem 'pry-byebug', '~> 3.5.1', platform: :mri +- gem 'bullet', '~> 6.1.0' +- gem 'pry-byebug', '~> 3.9.0', platform: :mri - gem 'pry-rails', '~> 0.3.9' - - gem 'awesome_print', require: false @@ -122,7 +121,7 @@ gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -465,9 +375,9 @@ end +@@ -463,9 +374,9 @@ end # Gitaly GRPC protocol definitions gem 'gitaly', '~> 13.3.0-rc1' |