From 686cb55a843c15a1e5899a78141111d237cea74b Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Thu, 22 Sep 2016 23:18:42 +0100 Subject: [PATCH] Update ruby and bundle --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 208 +++++++++++++++++++++++++------------------------- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/.ruby-version b/.ruby-version index 276cbf9..2bf1c1c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.0 +2.3.1 diff --git a/Gemfile b/Gemfile index c1e8d8e..c3d4224 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'http://rubygems.org' -ruby '2.3.0' +ruby '2.3.1' gem 'dotenv-rails', :groups => [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index 0265240..a9a821b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - administrate (0.1.5) + administrate (0.2.2) autoprefixer-rails (~> 6.0) datetime_picker_rails (~> 0.0.7) jquery-rails (~> 4.0) @@ -49,15 +49,15 @@ GEM sass-rails (~> 5.0) selectize-rails (~> 0.6) arel (6.0.3) - ast (2.2.0) - autoprefixer-rails (6.3.6) + ast (2.3.0) + autoprefixer-rails (6.4.1.1) execjs - aws-sdk (2.2.34) - aws-sdk-resources (= 2.2.34) - aws-sdk-core (2.2.34) + aws-sdk (2.6.3) + aws-sdk-resources (= 2.6.3) + aws-sdk-core (2.6.3) jmespath (~> 1.0) - aws-sdk-resources (2.2.34) - aws-sdk-core (= 2.2.34) + aws-sdk-resources (2.6.3) + aws-sdk-core (= 2.6.3) bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) @@ -69,27 +69,27 @@ GEM sass (~> 3.4) thor (~> 0.19) builder (3.2.2) - capybara (2.7.0) + capybara (2.9.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.12) + capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy cliver (0.3.2) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0, < 5.2.x) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.1) - database_cleaner (1.5.2) + concurrent-ruby (1.0.2) + database_cleaner (1.5.3) datetime_picker_rails (0.0.7) momentjs-rails (>= 2.8.1) debug_inspector (0.0.2) @@ -107,22 +107,22 @@ GEM dragonfly (~> 1.0) fog-aws erubis (2.7.0) - excon (0.49.0) - execjs (2.6.0) + excon (0.52.0) + execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) fivemat (1.3.2) - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.11.0) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.37.0) + fog-core (1.42.0) builder - excon (~> 0.45) + excon (~> 0.49) formatador (~> 0.2) fog-json (1.0.2) fog-core (~> 1.0) @@ -131,22 +131,20 @@ GEM fog-core nokogiri (~> 1.5, >= 1.5.11) formatador (0.2.5) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) i18n (0.7.0) ipaddress (0.8.3) - jmespath (1.2.4) - json_pure (>= 1.8.1) - jquery-rails (4.1.1) + jmespath (1.3.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - json_pure (1.8.3) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kramdown (1.10.0) + kramdown (1.12.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -156,59 +154,58 @@ GEM mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (3.0) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) + mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.8.4) - momentjs-rails (2.11.1) + minitest (5.9.0) + momentjs-rails (2.15.1) railties (>= 3.1) - monban (0.3.1) + monban (1.1.0) bcrypt rails warden monban-generators (0.0.5) monban (>= 0.0.12) - multi_json (1.11.2) - neat (1.7.4) - bourbon (>= 4.0) + multi_json (1.12.1) + neat (1.8.0) sass (>= 3.3) - nokogiri (1.6.8.rc3) + thor (~> 0.19) + nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) normalize-rails (3.0.3) - parser (2.3.0.7) + parser (2.3.1.4) ast (~> 2.2) - pg (0.18.4) + pg (0.19.0) pkg-config (1.1.7) - poltergeist (1.9.0) + poltergeist (1.10.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyamorous (1.1.0) activerecord (>= 3.0) powder (0.3.0) thor (>= 0.11.5) powerpack (0.1.1) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (3.4.0) + puma (3.6.0) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -223,47 +220,47 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - rake (11.1.2) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rake (11.3.0) + rspec-core (3.5.3) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - rubocop (0.39.0) - parser (>= 2.3.0.7, < 3.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + rubocop (0.43.0) + parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.7.5) - ruby_parser (3.8.1) + ruby-progressbar (1.8.1) + ruby_parser (3.8.2) sexp_processor (~> 4.1) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selectize-rails (0.12.1) + selectize-rails (0.12.3) sexp_processor (4.7.0) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) @@ -271,20 +268,20 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - simple_form (3.2.1) + simple_form (3.3.1) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) slugtastic (1.3.1) - sprockets (3.6.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -294,18 +291,18 @@ GEM polyamorous (~> 1.1.0) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.2) + tilt (2.0.5) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.3) + unicode-display_width (1.1.1) warden (1.2.6) rack (>= 1.0) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -356,5 +353,8 @@ DEPENDENCIES uglifier unf +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH - 1.11.2 + 1.12.5