diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 973be2fd49e5..13828112580e 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,10 +1,10 @@ ---- Gemfile.orig 2016-04-04 10:12:21 UTC +--- Gemfile.orig 2016-04-27 09:47:33 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" --gem 'rails', '4.2.5.2' -+gem 'rails', '>= 4.2.5.2' +-gem 'rails', '4.2.6' ++gem 'rails', '>= 4.2.6' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -12,8 +12,8 @@ # Specify a sprockets version due to increased performance # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 --gem 'sprockets', '~> 3.3.5' -+gem 'sprockets', '>= 3.3.5' +-gem 'sprockets', '~> 3.6.0' ++gem 'sprockets', '>= 3.6.0' # Default values for AR models -gem "default_value_for", "~> 3.0.0" @@ -130,7 +130,7 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end -@@ -162,10 +160,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. +@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration @@ -143,7 +143,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -180,17 +178,17 @@ gem 'cal-heatmap-rails', '~> 3.5.0' +@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0' gem "underscore-rails", "~> 1.8.0" # Sanitize user input @@ -152,7 +152,8 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input - gem "loofah", "~> 2.0.3" +@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3" + gem 'licensee', '~> 8.0.0' # Protect against bruteforcing -gem "rack-attack", '~> 4.3.1' @@ -164,7 +165,7 @@ # Keyboard shortcuts gem 'mousetrap-rails', '~> 1.4.6' -@@ -200,119 +198,37 @@ gem 'charlock_holmes', '~> 0.7.3' +@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3' gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' @@ -185,8 +186,8 @@ gem 'jquery-scrollto-rails', '~> 1.4.3' gem 'jquery-ui-rails', '~> 5.0.0' gem 'raphael-rails', '~> 2.1.2' --gem 'request_store', '~> 1.2.0' -+gem 'request_store', '>= 1.2.0' +-gem 'request_store', '~> 1.3.0' ++gem 'request_store', '>= 1.3.0' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' @@ -202,14 +203,13 @@ - gem 'allocations', '~> 1.0', require: false, platform: :mri - gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false -- gem 'connection_pool', '~> 2.0', require: false -end - -group :development do - gem "foreman" -- gem 'brakeman', '~> 3.1.0', require: false +- gem 'brakeman', '~> 3.2.0', require: false - -- gem "annotate", "~> 2.6.0" +- gem "annotate", "~> 2.7.0" - gem "letter_opener", '~> 1.1.2' - gem 'quiet_assets', '~> 1.0.2' - gem 'rerun', '~> 0.11.0' @@ -252,18 +252,18 @@ - gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' - -- gem 'teaspoon', '~> 1.0.0' +- gem 'teaspoon', '~> 1.1.0' - gem 'teaspoon-jasmine', '~> 2.2.0' - -- gem 'spring', '~> 1.6.4' +- gem 'spring', '~> 1.7.0' - gem 'spring-commands-rspec', '~> 1.0.4' -- gem 'spring-commands-spinach', '~> 1.0.0' +- gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' - -- gem 'rubocop', '~> 0.35.0', require: false +- gem 'rubocop', '~> 0.38.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false - gem 'coveralls', '~> 0.8.2', require: false -- gem 'simplecov', '~> 0.10.0', require: false +- gem 'simplecov', '~> 0.11.0', require: false - gem 'flog', require: false - gem 'flay', require: false - gem 'bundler-audit', require: false @@ -282,15 +282,7 @@ group :production do gem "gitlab_meta", '7.0' end - - gem "newrelic_rpm", '~> 3.14' - --gem 'octokit', '~> 3.8.0' -+gem 'octokit', '>= 3.8.0' - - gem "mail_room", "~> 0.6.1" - -@@ -324,7 +240,9 @@ gem 'activerecord-session_store', '~> 0. +@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0. gem "nested_form", '~> 0.3.2' # OAuth |