From f8281d6503c4a9700e63d84de11622a880cd16e2 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Thu, 3 Nov 2016 18:18:01 +0530
Subject: [PATCH] fix Gemfile syntax errors

---
 debian/patches/0050-relax-stable-libs.patch   | 28 +++++++++----------
 .../patches/053-relax-omniauth-facebook.patch | 10 +++----
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 97e4a9c28a..4a64239360 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -1,10 +1,8 @@
 We should be able to update minor versions of stable libs without breaking
 gitlab Gemfile
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
+--- a/Gemfile
++++ b/Gemfile
 @@ -1,16 +1,16 @@
  source 'https://rubygems.org'
  
@@ -26,7 +24,7 @@ Index: gitlab/Gemfile
  
  # Supported DBs
  gem 'mysql2', '~> 0.3.16', group: :mysql
-@@ -18,22 +18,22 @@ gem 'pg', '~> 0.18.2', group: :postgres
+@@ -18,22 +18,22 @@
  
  # Authentication libraries
  gem 'devise',                 '~> 4.2'
@@ -61,7 +59,7 @@ Index: gitlab/Gemfile
  gem 'jwt'
  
  # Spam and anti-bot protection
-@@ -41,9 +41,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
+@@ -41,9 +41,9 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -73,7 +71,7 @@ Index: gitlab/Gemfile
  gem 'u2f', '~> 0.2.1'
  
  # Browser detection
-@@ -51,12 +51,12 @@ gem 'browser', '~> 2.2'
+@@ -51,12 +51,12 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
@@ -88,7 +86,7 @@ Index: gitlab/Gemfile
  
  # Git Wiki
  # Required manually in config/initializers/gollum.rb to control load order
-@@ -64,7 +64,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -64,7 +64,7 @@
  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
@@ -97,7 +95,7 @@ Index: gitlab/Gemfile
  
  # API
  gem 'grape',        '~> 0.15.0'
-@@ -75,7 +75,7 @@ gem 'rack-cors',    '~> 0.4.0', require:
+@@ -75,7 +75,7 @@
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
@@ -106,7 +104,7 @@ Index: gitlab/Gemfile
  
  # Files attachments
  gem 'carrierwave', '~> 0.10.0'
-@@ -96,39 +96,39 @@ gem 'fog-rackspace', '~> 0.1.1'
+@@ -96,39 +96,39 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -158,7 +156,7 @@ Index: gitlab/Gemfile
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -136,39 +136,39 @@ gem 'acts-as-taggable-on', '~> 4.0'
+@@ -136,39 +136,39 @@
  # Background jobs
  gem 'sidekiq', '~> 4.2'
  gem 'sidekiq-cron', '~> 0.4.0'
@@ -206,7 +204,7 @@ Index: gitlab/Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.4.0'
-@@ -177,64 +177,64 @@ gem 'asana', '~> 0.4.0'
+@@ -177,64 +177,64 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # d3
@@ -277,7 +275,7 @@ Index: gitlab/Gemfile
 -gem 'jquery-rails',       '~> 4.1.0'
 -gem 'jquery-ui-rails',    '~> 5.0.0'
 +gem 'gon',                '~> 6.1'
-+gem 'jquery-atwho-rails', '~> 1.3' '>= 1.3.2'
++gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
 +gem 'jquery-rails',       '~> 4.1'
 +gem 'jquery-ui-rails',    '~> 5.0'
  gem 'request_store',      '~> 1.3'
@@ -298,7 +296,7 @@ Index: gitlab/Gemfile
  
  # Metrics
  group :metrics do
-@@ -324,7 +324,7 @@ end
+@@ -324,7 +324,7 @@
  
  gem 'newrelic_rpm', '~> 3.16'
  
@@ -307,7 +305,7 @@ Index: gitlab/Gemfile
  
  gem 'mail_room', '~> 0.8.1'
  
-@@ -333,18 +333,18 @@ gem 'email_reply_parser', '~> 0.5.8'
+@@ -333,18 +333,18 @@
  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
index e1bc65d4dc..ceda2cb89d 100644
--- a/debian/patches/053-relax-omniauth-facebook.patch
+++ b/debian/patches/053-relax-omniauth-facebook.patch
@@ -1,13 +1,11 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -25,7 +25,7 @@ gem 'omniauth-auth0',         '~> 1.4',
+--- 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-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'