2016-03-15 21:57:01 +05:30
|
|
|
Index: gitlab/Gemfile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gitlab.orig/Gemfile
|
|
|
|
|
+++ gitlab/Gemfile
|
|
|
|
|
@@ -30,7 +30,7 @@ gem 'omniauth-github', '~> 1.1.1'
|
|
|
|
|
gem 'omniauth-gitlab', '~> 1.0.0'
|
|
|
|
|
gem 'omniauth-google-oauth2', '~> 0.2.0'
|
|
|
|
|
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
2016-04-02 18:29:19 +05:30
|
|
|
-gem 'omniauth-saml', '~> 1.4.2'
|
|
|
|
|
+gem 'omniauth-saml', '~> 1.4', '>= 1.4.2'
|
2016-03-15 21:57:01 +05:30
|
|
|
gem 'omniauth-shibboleth', '~> 1.2.0'
|
|
|
|
|
gem 'omniauth-twitter', '~> 1.2.0'
|
|
|
|
|
gem 'omniauth_crowd', '~> 2.2.0'
|
2016-04-02 18:29:19 +05:30
|
|
|
@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
|
2016-03-15 21:57:01 +05:30
|
|
|
# Markdown and HTML processing
|
|
|
|
|
gem 'html-pipeline', '~> 1.11.0'
|
|
|
|
|
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
|
|
|
|
-gem 'github-markup', '~> 1.3.1'
|
|
|
|
|
+gem 'github-markup', '~> 1.3'
|
|
|
|
|
gem 'redcarpet', '~> 3.3.3'
|
|
|
|
|
gem 'RedCloth', '~> 4.2.9'
|
|
|
|
|
gem 'rdoc', '~> 4.1'
|
