diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 71 |
1 files changed, 56 insertions, 15 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index af61b620ed77..e4180cc3ef2b 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -27,21 +27,33 @@ # Authentication libraries gem 'devise', '~> 4.0' -@@ -30,12 +29,11 @@ gem 'omniauth-facebook', '~> 3.0.0' +@@ -26,20 +25,19 @@ gem 'omniauth-auth0', '~> 1.4.1' + 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', '>= 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' -gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos - gem 'omniauth-saml', '~> 1.6.0' +-gem 'omniauth-saml', '~> 1.6.0' ++gem 'omniauth-saml', '>= 1.6.0' gem 'omniauth-shibboleth', '~> 1.2.0' - gem 'omniauth-twitter', '~> 1.2.0' +-gem 'omniauth-twitter', '~> 1.2.0' ++gem 'omniauth-twitter', '>= 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '>= 1.2.1' gem 'jwt' # Spam and anti-bot protection -@@ -66,11 +64,11 @@ gem 'gollum-lib', '~> 4.2', require: fal +-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' ++gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails' + gem 'akismet', '~> 2.0' + + # Two-factor authentication +@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection @@ -56,8 +68,11 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -@@ -80,7 +78,7 @@ gem 'kaminari', '~> 0.17.0' - gem 'hamlit', '~> 2.6.1' + gem 'kaminari', '~> 0.17.0' + + # HAML +-gem 'hamlit', '~> 2.6.1' ++gem 'hamlit', '>= 2.6.1' # Files attachments -gem 'carrierwave', '~> 0.10.0' @@ -65,9 +80,12 @@ # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' -@@ -109,10 +107,10 @@ gem 'task_list', '~> 1.0.2', require +@@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' + gem 'html-pipeline', '~> 1.11.0' + gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' gem 'github-markup', '~> 1.4' - gem 'redcarpet', '~> 3.3.3' +-gem 'redcarpet', '~> 3.3.3' ++gem 'redcarpet', '>= 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '>= 3.6' @@ -78,8 +96,10 @@ gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 2.0' -@@ -121,11 +119,11 @@ gem 'rouge', '~> 2.0' - gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' + # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s + # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM +-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' ++gem 'nokogiri', '>= 1.6.7.2' # Diffs -gem 'diffy', '~> 3.0.3' @@ -135,7 +155,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -215,22 +213,22 @@ gem 'chronic_duration', '~> 0.10.6' +@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' gem 'coffee-rails', '~> 4.1.0' @@ -147,7 +167,8 @@ -gem 'addressable', '~> 2.3.8' +gem 'addressable', '>= 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' - gem 'font-awesome-rails', '~> 4.6.1' +-gem 'font-awesome-rails', '~> 4.6.1' ++gem 'font-awesome-rails', '>= 4.6.1' gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' @@ -163,7 +184,8 @@ gem 'base32', '~> 0.3.0' # Sentry integration -@@ -238,89 +236,6 @@ gem 'sentry-raven', '~> 2.0.0' +-gem 'sentry-raven', '~> 2.0.0' ++gem 'sentry-raven', '>= 2.0.0' gem 'premailer-rails', '~> 1.9.0' @@ -253,8 +275,27 @@ group :production do gem 'gitlab_meta', '7.0' end -@@ -349,5 +264,7 @@ gem 'paranoia', '~> 2.0' - gem 'health_check', '~> 2.1.0' + + gem 'newrelic_rpm', '~> 3.16' + +-gem 'octokit', '~> 4.3.0' ++gem 'octokit', '>= 4.3.0' + + gem 'mail_room', '~> 0.8' + + gem 'email_reply_parser', '~> 0.5.8' + +-gem 'ruby-prof', '~> 0.15.9' ++gem 'ruby-prof', '>= 0.15.9' + + ## CI + gem 'activerecord-session_store', '~> 1.0.0' +@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' + gem 'paranoia', '~> 2.0' + + # Health check +-gem 'health_check', '~> 2.1.0' ++gem 'health_check', '>= 2.1.0' # System information -gem 'vmstat', '~> 2.2' |