diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 4a64239360..6d633d6d4e 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -1,8 +1,10 @@ We should be able to update minor versions of stable libs without breaking gitlab Gemfile ---- a/Gemfile -+++ b/Gemfile +Index: gitlab/Gemfile +=================================================================== +--- gitlab.orig/Gemfile ++++ gitlab/Gemfile @@ -1,16 +1,16 @@ source 'https://rubygems.org' @@ -24,7 +26,7 @@ gitlab Gemfile # Supported DBs gem 'mysql2', '~> 0.3.16', group: :mysql -@@ -18,22 +18,22 @@ +@@ -18,22 +18,22 @@ gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.2' @@ -59,7 +61,7 @@ gitlab Gemfile gem 'jwt' # Spam and anti-bot protection -@@ -41,9 +41,9 @@ +@@ -41,9 +41,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec gem 'akismet', '~> 2.0' # Two-factor authentication @@ -71,12 +73,12 @@ gitlab Gemfile gem 'u2f', '~> 0.2.1' # Browser detection -@@ -51,12 +51,12 @@ +@@ -51,12 +51,12 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library --gem 'gitlab_git', '~> 10.6.8' -+gem 'gitlab_git', '~> 10.6','>= 10.6.8' +-gem 'gitlab_git', '~> 10.7.0' ++gem 'gitlab_git', '~> 10.7' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -86,7 +88,7 @@ gitlab Gemfile # Git Wiki # Required manually in config/initializers/gollum.rb to control load order -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection @@ -95,7 +97,7 @@ gitlab Gemfile # API gem 'grape', '~> 0.15.0' -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ gem 'rack-cors', '~> 0.4.0', require: gem 'kaminari', '~> 0.17.0' # HAML @@ -104,7 +106,7 @@ gitlab Gemfile # Files attachments gem 'carrierwave', '~> 0.10.0' -@@ -96,39 +96,39 @@ +@@ -96,39 +96,39 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'unf', '~> 0.1.4' # Seed data @@ -156,7 +158,7 @@ gitlab Gemfile # Issue tags gem 'acts-as-taggable-on', '~> 4.0' -@@ -136,39 +136,39 @@ +@@ -136,39 +136,39 @@ gem 'acts-as-taggable-on', '~> 4.0' # Background jobs gem 'sidekiq', '~> 4.2' gem 'sidekiq-cron', '~> 0.4.0' @@ -204,7 +206,7 @@ gitlab Gemfile # Asana integration gem 'asana', '~> 0.4.0' -@@ -177,64 +177,64 @@ +@@ -177,64 +177,64 @@ gem 'asana', '~> 0.4.0' gem 'ruby-fogbugz', '~> 0.2.1' # d3 @@ -296,7 +298,7 @@ gitlab Gemfile # Metrics group :metrics do -@@ -324,7 +324,7 @@ +@@ -324,7 +324,7 @@ end gem 'newrelic_rpm', '~> 3.16' @@ -305,7 +307,7 @@ gitlab Gemfile gem 'mail_room', '~> 0.8.1' -@@ -333,18 +333,18 @@ +@@ -333,18 +333,18 @@ gem 'email_reply_parser', '~> 0.5.8' gem 'ruby-prof', '~> 0.16.2' ## CI diff --git a/debian/patches/053-relax-omniauth-facebook.patch b/debian/patches/053-relax-omniauth-facebook.patch deleted file mode 100644 index ceda2cb89d..0000000000 --- a/debian/patches/053-relax-omniauth-facebook.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -25,7 +25,7 @@ - gem 'omniauth-azure-oauth2', '~> 0.0.6' - gem 'omniauth-bitbucket', '~> 0.0.2' - gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2' --gem 'omniauth-facebook', '~> 4.0' -+gem 'omniauth-facebook', '>= 3.0', '< 5.0' - gem 'omniauth-github', '~> 1.1', '>= 1.1.1' - gem 'omniauth-gitlab', '~> 1.0' - gem 'omniauth-google-oauth2', '~> 0.4.1' diff --git a/debian/patches/series b/debian/patches/series index 785d69184a..03610b9339 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ source-init-functions.patch pid-log-paths.patch 052-relax-grape.patch -053-relax-omniauth-facebook.patch