refresh patches

This commit is contained in:
Praveen Arimbrathodiyil 2016-01-14 19:11:10 +05:30
parent cfeda7f743
commit ca08fd48cc
3 changed files with 11 additions and 11 deletions

View file

@ -2,13 +2,13 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -211,84 +211,6 @@ gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'net-ssh', '~> 3.0.1'
@@ -220,84 +220,6 @@ group :metrics do
gem 'connection_pool', '~> 2.0', require: false
end
-group :development do
- gem "foreman"
- gem 'brakeman', '3.0.1', require: false
- gem 'brakeman', '~> 3.1.0', require: false
-
- gem "annotate", "~> 2.6.0"
- gem "letter_opener", '~> 1.1.2'
@ -33,7 +33,7 @@ Index: gitlab/Gemfile
- gem 'byebug', platform: :mri
- gem 'pry-rails'
-
- gem 'awesome_print', '~> 1.2.0'
- gem 'awesome_print', '~> 1.2.0', require: false
- gem 'fuubar', '~> 2.0.0'
-
- gem 'database_cleaner', '~> 1.4.0'

View file

@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -211,7 +211,7 @@ gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
gem 'net-ssh', '~> 3.0.1'
@@ -220,7 +220,7 @@ group :metrics do
gem 'connection_pool', '~> 2.0', require: false
end
-gem 'octokit', '~> 3.7.0'
+gem 'octokit', '~> 3.7'

View file

@ -2,10 +2,10 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -23,7 +23,7 @@ gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0'
gem 'omniauth', '~> 1.2.2'
@@ -25,7 +25,7 @@ gem 'omniauth', '~> 1.2.2'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-cas3', '~> 1.1.2'
-gem 'omniauth-facebook', '~> 3.0.0'
+gem 'omniauth-facebook', '~> 2.0.1'
gem 'omniauth-github', '~> 1.1.1'