diff --git a/Gemfile b/Gemfile index 38158387642..c4368d79d5d 100644 --- a/Gemfile +++ b/Gemfile @@ -244,7 +244,7 @@ gem 'net-ssh', '~> 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.0.0' +gem 'sentry-raven', '~> 2.4.0' gem 'premailer-rails', '~> 1.9.0' @@ -257,15 +257,14 @@ end group :development do gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.4.0', require: false + gem 'brakeman', '~> 3.6.0', require: false gem 'letter_opener_web', '~> 1.3.0' - gem 'bullet', '~> 5.2.0', require: false + gem 'bullet', '~> 5.5.0', require: false gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - gem 'web-console', '~> 2.0' # Better errors handler - gem 'better_errors', '~> 1.0.1' + gem 'better_errors', '~> 2.1.0' gem 'binding_of_caller', '~> 0.7.2' # thin instead webrick @@ -297,7 +296,7 @@ group :development, :test do gem 'capybara-screenshot', '~> 1.0.0' gem 'poltergeist', '~> 1.9.0' - gem 'spring', '~> 1.7.0' + gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.1.0' @@ -305,8 +304,8 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.12.0', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.21.0', require: false - gem 'simplecov', '0.12.0', require: false - gem 'flay', '~> 2.6.1', require: false + gem 'simplecov', '~> 0.14.0', require: false + gem 'flay', '~> 2.8.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -323,7 +322,7 @@ group :test do gem 'shoulda-matchers', '~> 2.8.0', require: false gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.6.2' - gem 'webmock', '~> 1.21.0' + gem 'webmock', '~> 1.24.0' gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' diff --git a/Gemfile.lock b/Gemfile.lock index 07be5d7aded..2cb0e88962a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,19 +75,20 @@ GEM base32 (0.3.2) bcrypt (3.1.11) benchmark-ips (2.3.0) - better_errors (1.0.1) + better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) + rack (>= 0.9.0) bindata (2.3.5) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.4.1) + brakeman (3.6.1) browser (2.2.0) builder (3.2.3) - bullet (5.2.0) + bullet (5.5.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) @@ -101,7 +102,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy carrierwave (0.11.2) @@ -117,7 +118,7 @@ GEM numerizer (~> 0.1.1) chunky_png (1.3.5) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -200,7 +201,9 @@ GEM multi_json ffaker (2.4.0) ffi (1.9.10) - flay (2.6.1) + flay (2.8.1) + erubis (~> 2.7.0) + path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) flowdock (0.7.1) @@ -340,6 +343,7 @@ GEM temple (~> 0.7.6) thor tilt + hashdiff (0.3.2) hashie (3.5.5) health_check (2.6.0) rails (>= 4.0) @@ -518,6 +522,7 @@ GEM activerecord (>= 4.0, < 5.1) parser (2.4.0.0) ast (~> 2.2) + path_expander (1.0.1) pg (0.18.4) poltergeist (1.9.0) capybara (~> 2.1) @@ -532,14 +537,14 @@ GEM premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.4.1) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) - pry-rails (0.3.4) + pry-rails (0.3.5) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) rack (1.6.5) @@ -671,7 +676,7 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.4.1) nokogiri (>= 1.5.10) - ruby_parser (3.8.2) + ruby_parser (3.8.4) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) @@ -700,10 +705,10 @@ GEM activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (2.0.2) - faraday (>= 0.7.6, < 0.10.x) + sentry-raven (2.4.0) + faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.7.0) + sexp_processor (4.8.0) sham_rack (1.3.6) rack shoulda-matchers (2.8.0) @@ -724,7 +729,7 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) - simplecov (0.12.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -741,7 +746,8 @@ GEM spinach (>= 0.4) spinach-rerun-reporter (0.0.2) spinach (~> 0.8) - spring (1.7.2) + spring (2.0.1) + activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-commands-spinach (1.1.0) @@ -813,14 +819,10 @@ GEM vmstat (2.3.0) warden (1.2.6) rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) + webmock (1.24.6) addressable (>= 2.3.6) crack (>= 0.3.2) + hashdiff webpack-rails (0.9.9) rails (>= 3.2.0) websocket-driver (0.6.3) @@ -854,12 +856,12 @@ DEPENDENCIES babosa (~> 1.0.2) base32 (~> 0.3.0) benchmark-ips (~> 2.3.0) - better_errors (~> 1.0.1) + better_errors (~> 2.1.0) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.4.0) + brakeman (~> 3.6.0) browser (~> 2.2) - bullet (~> 5.2.0) + bullet (~> 5.5.0) bundler-audit (~> 0.5.0) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) @@ -885,7 +887,7 @@ DEPENDENCIES email_spec (~> 1.6.0) factory_girl_rails (~> 4.7.0) ffaker (~> 2.4) - flay (~> 2.6.1) + flay (~> 2.8.0) fog-aws (~> 0.9) fog-core (~> 1.40) fog-google (~> 0.5) @@ -991,18 +993,18 @@ DEPENDENCIES scss_lint (~> 0.47.0) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - sentry-raven (~> 2.0.0) + sentry-raven (~> 2.4.0) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) sidekiq (~> 4.2.7) sidekiq-cron (~> 0.4.4) sidekiq-limit_fetch (~> 3.4) - simplecov (= 0.12.0) + simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) + spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) @@ -1023,8 +1025,7 @@ DEPENDENCIES version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.3.0) - web-console (~> 2.0) - webmock (~> 1.21.0) + webmock (~> 1.24.0) webpack-rails (~> 0.9.9) wikicloth (= 0.8.1)