diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 13828112580e..c0c52969d652 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-04-27 09:47:33 UTC +--- Gemfile.orig 2016-06-15 01:41:18 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" @@ -25,14 +25,13 @@ # Authentication libraries gem 'devise', '~> 3.5.4' + gem 'doorkeeper', '~> 3.1' -gem 'devise-async', '~> 0.9.0' --gem 'doorkeeper', '~> 2.2.0' +gem 'devise-async', '>= 0.9.0' -+gem 'doorkeeper', '>= 2.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' -@@ -29,25 +28,24 @@ gem 'omniauth-cas3', '~> 1.1.2' +@@ -29,13 +28,12 @@ gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' @@ -45,9 +44,10 @@ 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 - gem 'recaptcha', require: 'recaptcha/rails' +@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai gem 'akismet', '~> 2.0' # Two-factor authentication @@ -63,7 +63,7 @@ # Extracting information from a git repository # Provide access to Gitlab::Git library -@@ -60,15 +58,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', +@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', # Git Wiki # Required manually in config/initializers/gollum.rb to control load order @@ -83,7 +83,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -@@ -78,13 +76,13 @@ gem "kaminari", "~> 0.16.3" +@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3" gem "haml-rails", '~> 0.9.0' # Files attachments @@ -99,7 +99,7 @@ gem "unf", '~> 0.1.4' # Authorization -@@ -96,13 +94,13 @@ gem "seed-fu", '~> 2.3.5' +@@ -97,13 +95,13 @@ gem "seed-fu", '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' @@ -116,7 +116,7 @@ gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 1.10.1' -@@ -111,11 +109,11 @@ gem 'rouge', '~> 1.10.1' +@@ -112,16 +110,16 @@ gem 'rouge', '~> 1.10.1' gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs @@ -130,7 +130,13 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end -@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. + # State machine +-gem "state_machines-activerecord", '~> 0.3.0' ++gem "state_machines-activerecord", '>= 0.3.0' + # Run events after state machine commits + gem 'after_commit_queue' + +@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration @@ -143,7 +149,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0' +@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0' gem "underscore-rails", "~> 1.8.0" # Sanitize user input @@ -152,20 +158,19 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3" - gem 'licensee', '~> 8.0.0' + gem "loofah", "~> 2.0.3" + + # Working with license +-gem 'licensee', '~> 8.0.0' ++gem 'licensee', '>= 8.0.0' # Protect against bruteforcing -gem "rack-attack", '~> 4.3.1' +gem "rack-attack", '>= 4.3.1' # Ace editor --gem 'ace-rails-ap', '~> 2.0.1' -+gem 'ace-rails-ap', '>= 2.0.1' - - # Keyboard shortcuts - gem 'mousetrap-rails', '~> 1.4.6' -@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3' + gem 'ace-rails-ap', '~> 4.0.2' +@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3' gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' @@ -179,11 +184,8 @@ gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.3.0' - gem 'gon', '~> 6.0.1' - gem 'jquery-atwho-rails', '~> 1.3.2' --gem 'jquery-rails', '~> 4.0.0' -+gem 'jquery-rails', '>= 4.0.0' - gem 'jquery-scrollto-rails', '~> 1.4.3' +@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2' + gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' gem 'raphael-rails', '~> 2.1.2' -gem 'request_store', '~> 1.3.0' @@ -192,9 +194,10 @@ gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' +gem 'net-ssh', '>= 3.0.1' + gem 'base32', '~> 0.3.0' # Sentry integration - gem 'sentry-raven', '~> 0.15' +@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15' gem 'premailer-rails', '~> 1.9.0' @@ -209,8 +212,7 @@ - gem "foreman" - gem 'brakeman', '~> 3.2.0', require: false - -- gem "annotate", "~> 2.7.0" -- gem "letter_opener", '~> 1.1.2' +- gem 'letter_opener_web', '~> 1.3.0' - gem 'quiet_assets', '~> 1.0.2' - gem 'rerun', '~> 0.11.0' - gem 'bullet', require: false @@ -237,7 +239,7 @@ - - gem 'database_cleaner', '~> 1.4.0' - gem 'factory_girl_rails', '~> 4.6.0' -- gem 'rspec-rails', '~> 3.3.0' +- gem 'rspec-rails', '~> 3.4.0' - gem 'rspec-retry' - gem 'spinach-rails', '~> 0.2.1' - gem 'spinach-rerun-reporter', '~> 0.0.2' @@ -282,7 +284,7 @@ group :production do gem "gitlab_meta", '7.0' end -@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0. +@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0. gem "nested_form", '~> 0.3.2' # OAuth @@ -291,5 +293,8 @@ # Soft deletion gem "paranoia", "~> 2.0" -+ + +gem "rinku" ++ + # Health check + gem 'health_check', '~> 1.5.1' |