diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5272f9ef3ba8..5662c120f8d3 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,15 +1,6 @@ ---- Gemfile.orig 2021-03-04 13:43:08 UTC +--- Gemfile.orig 2021-03-31 12:23:42 UTC +++ Gemfile -@@ -26,7 +26,7 @@ gem 'marginalia', '~> 1.10.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.5.0.rc2' - gem 'doorkeeper-openid_connect', '~> 1.7.5' - gem 'omniauth', '~> 1.8' -@@ -80,7 +80,7 @@ gem 'gpgme', '~> 2.0.19' +@@ -83,7 +83,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' @@ -18,7 +9,7 @@ # API gem 'grape', '~> 1.5.2' -@@ -94,7 +94,6 @@ gem 'graphql', '~> 1.11.4' +@@ -97,7 +97,6 @@ gem 'graphql', '~> 1.11.8' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.2' @@ -26,7 +17,7 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -149,7 +148,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark +@@ -152,7 +151,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' @@ -35,25 +26,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -@@ -236,7 +235,7 @@ gem 'redis-rails', '~> 5.0.2' - gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false - - # HipChat integration --gem 'hipchat', '~> 1.5.0' -+gem 'hipchat', '~> 1.6.0' - - # Jira integration - gem 'jira-ruby', '~> 2.1.4' -@@ -309,7 +308,7 @@ gem 'pg_query', '~> 1.3.0' - gem 'premailer-rails', '~> 1.10.3' - - # LabKit: Tracing and Correlation --gem 'gitlab-labkit', '0.14.0' -+gem 'gitlab-labkit', '0.15.0' - # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 - # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 - gem 'thrift', '>= 0.14.0' -@@ -332,104 +331,13 @@ gem 'snowplow-tracker', '~> 0.6.1' +@@ -335,107 +334,13 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false @@ -67,7 +40,6 @@ -group :development do - gem 'brakeman', '~> 4.2', require: false -- gem 'danger', '~> 8.0.6', require: false - gem 'lefthook', '~> 0.7', require: false - - gem 'letter_opener_web', '~> 1.3.4' @@ -101,9 +73,8 @@ - gem 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 6.0.0', require: false +- gem 'gitlab-styles', '~> 6.1.0', require: false - -- gem 'scss_lint', '~> 0.59.0', require: false - gem 'haml_lint', '~> 0.36.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false - @@ -123,6 +94,11 @@ - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false -end - +-group :development, :test, :danger do +- gem 'danger-gitlab', '~> 8.0', require: false +- gem 'gitlab-dangerfiles', '~> 0.8.0', require: false +-end +- -group :development, :test, :coverage do - gem 'simplecov', '~> 0.18.5', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false @@ -159,7 +135,7 @@ gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -473,7 +381,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1' +@@ -479,7 +384,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1' gem 'grpc', '~> 1.30.2' |