diff --git a/Gemfile b/Gemfile index 2f00b43..735cd7d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,12 +3,12 @@ source 'https://rubygems.org' ruby "2.2.7" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.0.2' +gem 'rails', '~> 4.2.10' gem 'dotenv-rails' # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0.6' +gem 'sass-rails', '~> 5.0.7' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 3.2.0' @@ -48,7 +48,7 @@ group :development, :test do gem 'sqlite3' gem 'webmock' gem 'vcr' - gem 'rspec-rails', '~> 3.6' + gem 'rspec-rails', '~> 3.7' gem 'cucumber-rails', require: false gem 'database_cleaner' gem 'coveralls', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3e138c7..7cca0e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,42 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.13) - actionpack (= 4.0.13) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) - actionpack (4.0.13) - activesupport (= 4.0.13) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) + rack (~> 1.6) rack-test (~> 0.6.2) - activemodel (4.0.13) - activesupport (= 4.0.13) - builder (~> 3.1.0) - activerecord (4.0.13) - activemodel (= 4.0.13) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.13) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.4) - activesupport (4.0.13) - i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) + globalid (>= 0.3.0) + activemodel (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) + arel (~> 6.0) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) addressable (2.4.0) - arel (4.0.2) + arel (6.0.4) autoprefixer-rails (7.1.2.1) execjs backports (3.8.0) @@ -35,7 +45,7 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap-switch-rails (1.9.0) - builder (3.1.4) + builder (3.2.3) capybara (2.16.1) addressable mini_mime (>= 0.1.3) @@ -44,7 +54,7 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) cliver (0.3.2) - coderay (1.1.1) + coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -61,7 +71,8 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - cucumber (2.4.0) + crass (1.0.3) + cucumber (2.99.0) builder (>= 2.1.2) cucumber-core (~> 1.5.0) cucumber-wire (~> 0.0.1) @@ -86,12 +97,11 @@ GEM delayed_job (>= 3.0, < 5) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.10) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.2) responders - thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.3) docile (1.1.5) @@ -131,6 +141,8 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) guard (2.14.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -152,13 +164,14 @@ GEM hashdiff (0.3.4) hashie (3.5.5) highline (1.7.8) - i18n (0.9.0) + i18n (0.9.1) concurrent-ruby (~> 1.0) jbuilder (2.6.4) activesupport (>= 3.0.0) multi_json (>= 1.2) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) jwt (1.5.6) @@ -169,14 +182,17 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) lumberjack (1.0.12) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) mime-types (2.99.3) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (4.7.5) + minitest (5.10.3) multi_json (1.12.2) multi_test (0.1.2) multi_xml (0.6.0) @@ -210,69 +226,84 @@ GEM capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) + method_source (~> 0.9.0) pusher-client (0.6.2) json websocket (~> 1.0) - rack (1.5.5) + rack (1.6.8) rack-google-analytics (1.2.0) actionpack activesupport rack-test (0.6.3) rack (>= 1.0) - rails (4.0.13) - actionmailer (= 4.0.13) - actionpack (= 4.0.13) - activerecord (= 4.0.13) - activesupport (= 4.0.13) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.13) - sprockets-rails (~> 2.0) + railties (= 4.2.10) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.2) rails_stdout_logging (0.0.3) - railties (4.0.13) - actionpack (= 4.0.13) - activesupport (= 4.0.13) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.2.1) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdoc (4.3.0) - responders (1.1.2) - railties (>= 3.2, < 4.2) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.4.25) - sass-rails (5.0.6) + sass (3.5.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -287,20 +318,19 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.1) - slop (3.6.0) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.13) term-ansicolor (1.6.0) tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.7) + tilt (2.0.8) timecop (0.9.1) tins (1.14.0) travis (1.8.8) @@ -317,7 +347,8 @@ GEM turbolinks-source (5.0.3) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (0.3.53) + tzinfo (1.2.4) + thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) vcr (3.0.3) @@ -361,10 +392,10 @@ DEPENDENCIES pg poltergeist rack-google-analytics - rails (~> 4.0.2) + rails (~> 4.2.10) rails_12factor - rspec-rails (~> 3.6) - sass-rails (~> 5.0.6) + rspec-rails (~> 3.7) + sass-rails (~> 5.0.7) sdoc sqlite3 timecop