diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5a7050ca77f6..4feeee01fe58 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2020-10-01 12:48:52 UTC +--- Gemfile.orig 2020-10-21 18:16:04 UTC +++ Gemfile @@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0' # Supported DBs @@ -6,18 +6,27 @@ -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0' - gem 'grape-path-helpers', '~> 1.3' + gem 'grape-path-helpers', '~> 1.4' gem 'faraday', '~> 1.0' -@@ -95,7 +95,6 @@ gem 'graphql', '~> 1.11.4' +@@ -27,7 +27,7 @@ gem 'marginalia', '~> 1.9.0' + # Authentication libraries + gem 'devise', '~> 4.7.2' + # TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) +-gem 'bcrypt', '3.1.12' ++gem 'bcrypt', '~> 3.1.12' + gem 'doorkeeper', '~> 5.3.0' + gem 'doorkeeper-openid_connect', '~> 1.7.4' + gem 'omniauth', '~> 1.8' +@@ -97,7 +97,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.2' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] + gem 'hashie' # Disable strong_params so that Mash does not respond to :permitted? - gem 'hashie-forbidden_attributes' -@@ -148,7 +147,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark +@@ -151,7 +150,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark gem 'commonmarker', '~> 0.20' gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' @@ -26,7 +35,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -@@ -234,7 +233,7 @@ gem 'redis-rails', '~> 5.0.2' +@@ -237,7 +236,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration @@ -35,15 +44,15 @@ # Jira integration gem 'jira-ruby', '~> 2.0.0' -@@ -332,94 +331,6 @@ group :metrics do +@@ -334,97 +333,6 @@ group :metrics do # Prometheus - gem 'prometheus-client-mmap', '~> 0.11.0' + gem 'prometheus-client-mmap', '~> 0.12.0' gem 'raindrops', '~> 0.18' -end - -group :development do - gem 'brakeman', '~> 4.2', require: false -- gem 'danger', '~> 8.0', require: false +- gem 'danger', '~> 8.0.6', require: false - - gem 'letter_opener_web', '~> 1.3.4' - @@ -82,8 +91,6 @@ - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false -- gem 'simplecov', '~> 0.18.5', require: false -- gem 'simplecov-cobertura', '~> 1.3.1', require: false - gem 'bundler-audit', '~> 0.6.1', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false @@ -101,9 +108,14 @@ - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false -end - +-group :development, :test, :coverage do +- gem 'simplecov', '~> 0.18.5', require: false +- gem 'simplecov-cobertura', '~> 1.3.1', require: false +-end +- -# Gems required in omnibus-gitlab pipeline -group :development, :test, :omnibus do -- gem 'license_finder', '~> 5.4', require: false +- gem 'license_finder', '~> 6.0', require: false -end - -group :test do @@ -118,7 +130,7 @@ - - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' -- gem 'webmock', '~> 3.5.1' +- gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.12.0' |