diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 178e7ffea7..1a7ec297e4 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -113,7 +113,7 @@ gitlab Gemfile -gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.1' +gem 'html-pipeline', '~> 1.11' -+gem 'deckar01-task_list', '1.0', '>= 1.0.6', require: 'task_list/railtie' ++gem 'deckar01-task_list', '~> 1.0', '>= 1.0.6', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5','>= 1.5.1' gem 'redcarpet', '~> 3.4' -gem 'RedCloth', '~> 4.3.2' @@ -311,3 +311,49 @@ gitlab Gemfile gem 'gettext', '~> 3.2.2', require: false, group: :development # Metrics +@@ -337,17 +337,17 @@ + end + + group :test do +- gem 'shoulda-matchers', '~> 2.8.0', require: false +- gem 'email_spec', '~> 1.6.0' +- gem 'json-schema', '~> 2.6.2' ++ gem 'shoulda-matchers', '~> 2.8', require: false ++ gem 'email_spec', '~> 1.6' ++ gem 'json-schema', '~> 2.6', '>= 2.6.2' + gem 'webmock', '~> 1.24.0' + gem 'test_after_commit', '~> 1.1' +- gem 'sham_rack', '~> 1.3.6' ++ gem 'sham_rack', '~> 1.3', '>= 1.3.6' + gem 'timecop', '~> 0.8.0' +- gem 'concurrent-ruby', '~> 1.0.5' ++ gem 'concurrent-ruby', '~> 1.0','>= 1.0.5' + end + +-gem 'octokit', '~> 4.6.2' ++gem 'octokit', '~> 4.6', '>= 4.6.2' + + gem 'mail_room', '~> 0.9.1' + +@@ -357,17 +357,17 @@ + gem 'ruby-prof', '~> 0.16.2' + + # OAuth +-gem 'oauth2', '~> 1.3.0' ++gem 'oauth2', '~> 1.3' + + # Soft deletion + gem 'paranoia', '~> 2.2' + + # Health check +-gem 'health_check', '~> 2.6.0' ++gem 'health_check', '~> 2.6' + + # System information +-gem 'vmstat', '~> 2.3.0' +-gem 'sys-filesystem', '~> 1.1.6' ++gem 'vmstat', '~> 2.3' ++gem 'sys-filesystem', '~> 1.1', '>= 1.1.6' + + # Gitaly GRPC client + gem 'gitaly', '~> 0.6.0' diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch index 4239baf6eb..46c887e97a 100644 --- a/debian/patches/0100-remove-development-test.patch +++ b/debian/patches/0100-remove-development-test.patch @@ -71,5 +71,5 @@ Bundler will fail when it can't find these locally -end - group :test do - gem 'shoulda-matchers', '~> 2.8.0', require: false - gem 'email_spec', '~> 1.6.0' + gem 'shoulda-matchers', '~> 2.8', require: false + gem 'email_spec', '~> 1.6' diff --git a/debian/patches/0220-relax-dependencies.patch b/debian/patches/0220-relax-dependencies.patch index 785299472b..5356e6916f 100644 --- a/debian/patches/0220-relax-dependencies.patch +++ b/debian/patches/0220-relax-dependencies.patch @@ -10,11 +10,11 @@ # Sentry integration @@ -277,7 +277,7 @@ - gem 'shoulda-matchers', '~> 2.8.0', require: false - gem 'email_spec', '~> 1.6.0' - gem 'json-schema', '~> 2.6.2' + gem 'shoulda-matchers', '~> 2.8', require: false + gem 'email_spec', '~> 1.6' + gem 'json-schema', '~> 2.6', '>= 2.6.2' - gem 'webmock', '~> 1.24.0' + gem 'webmock', '>= 1.24.0' gem 'test_after_commit', '~> 1.1' - gem 'sham_rack', '~> 1.3.6' + gem 'sham_rack', '~> 1.3', '>= 1.3.6' gem 'timecop', '~> 0.8.0' diff --git a/debian/patches/0240-relax-google-api-client.patch b/debian/patches/0240-relax-google-api-client.patch new file mode 100644 index 0000000000..c3cada96c1 --- /dev/null +++ b/debian/patches/0240-relax-google-api-client.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -100,7 +100,7 @@ + gem 'fog-rackspace', '~> 0.1.1' + + # for Google storage +-gem 'google-api-client', '~> 0.8.6' ++gem 'google-api-client', '~> 0.8' + + # for aws storage + gem 'unf', '~> 0.1.4' diff --git a/debian/patches/0250-relax-licensee.patch b/debian/patches/0250-relax-licensee.patch new file mode 100644 index 0000000000..2ae1ab8aef --- /dev/null +++ b/debian/patches/0250-relax-licensee.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -214,7 +214,7 @@ + gem 'loofah', '~> 2.0', '>= 2.0.3' + + # Working with license +-gem 'licensee', '~> 8.7' ++gem 'licensee', '~> 8.0' + + # Protect against bruteforcing + gem 'rack-attack', '~> 4.4', '>= 4.4.1' diff --git a/debian/patches/0260-relax-ruby-parser.patch b/debian/patches/0260-relax-ruby-parser.patch new file mode 100644 index 0000000000..4dd86f241b --- /dev/null +++ b/debian/patches/0260-relax-ruby-parser.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -261,7 +261,7 @@ + gem 'premailer-rails', '~> 1.9' + + # I18n +-gem 'ruby_parser', '~> 3.8', '>= 3.8.4', require: false ++gem 'ruby_parser', '~> 3.8', '>= 3.8.2', require: false + gem 'gettext_i18n_rails', '~> 1.8' + gem 'gettext_i18n_rails_js', '~> 1.2' + gem 'gettext', '~> 3.2.2', require: false, group: :development diff --git a/debian/patches/series b/debian/patches/series index 148df2994e..62695a8864 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,6 @@ pid-log-paths.patch 0200-remove-order-dependency-in-label-finder-spec.patch 0220-relax-dependencies.patch 0230-relax-rugged.patch +0240-relax-google-api-client.patch +0250-relax-licensee.patch +0260-relax-ruby-parser.patch