diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index fd27741726ae..79ad55c4ceef 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,15 +1,15 @@ ---- Gemfile.orig 2022-03-21 09:13:50 UTC +--- Gemfile.orig 2022-04-21 11:10:02 UTC +++ Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' - gem 'rails', '~> 6.1.4.6' + gem 'rails', '~> 6.1.4.7' -gem 'bootsnap', '~> 1.9.1', require: false +gem 'bootsnap', '~> 1.9', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' -@@ -91,7 +91,7 @@ gem 'gpgme', '~> 2.0.19' +@@ -92,7 +92,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 +18,7 @@ # API gem 'grape', '~> 1.5.2' -@@ -102,7 +102,6 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +@@ -103,7 +103,6 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' gem 'graphql', '~> 1.11.10' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' @@ -26,7 +26,16 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -333,118 +332,14 @@ gem 'batch-loader', '~> 2.0.1' +@@ -207,7 +206,7 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek + gem 'fugit', '~> 1.2.1' + + # HTTP requests +-gem 'httparty', '~> 0.16.4' ++gem 'httparty', '~> 0.16' + + # Colored output to console + gem 'rainbow', '~> 3.0' +@@ -334,118 +333,18 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -42,7 +51,7 @@ -group :development do - gem 'lefthook', '~> 0.7.0', require: false -- gem 'solargraph', '~> 0.43', require: false +- gem 'solargraph', '~> 0.44.3', require: false - - gem 'letter_opener_web', '~> 2.0.0' - @@ -87,7 +96,7 @@ - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false - -- gem 'simple_po_parser', '~> 1.1.2', require: false +- gem 'simple_po_parser', '~> 1.1.6', require: false - - gem 'timecop', '~> 0.9.1' - @@ -100,10 +109,10 @@ - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' -end - --group :development, :test, :danger do -- gem 'gitlab-dangerfiles', '~> 2.11.0', require: false --end -- + group :development, :test, :danger do + gem 'gitlab-dangerfiles', '~> 3.0', require: false + end + -group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false @@ -146,9 +155,9 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -543,3 +438,5 @@ gem 'ipaddress', '~> 0.8.3' +@@ -544,3 +443,5 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' - gem 'ipynbdiff', '0.4.4' + gem 'ipynbdiff', '0.4.5' + +gem 'parser' |