From 5888dcc83b45283ced320842cea19c1096a652c2 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Wed, 14 Oct 2015 12:17:28 +0100 Subject: [PATCH] Update Ruby version and gems --- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 66 ++++++++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.ruby-version b/.ruby-version index b1b25a5..5859406 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.2 +2.2.3 diff --git a/Gemfile b/Gemfile index 1d24058..8fa9a71 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'http://rubygems.org' -ruby '2.2.2' +ruby '2.2.3' gem 'dotenv-rails', :groups => [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index c77cf01..4aee0ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GEM tzinfo (~> 1.1) addressable (2.3.8) arel (5.0.1.20140414130214) - aws-sdk (2.1.17) - aws-sdk-resources (= 2.1.17) - aws-sdk-core (2.1.17) + aws-sdk (2.1.29) + aws-sdk-resources (= 2.1.29) + aws-sdk-core (2.1.29) jmespath (~> 1.0) - aws-sdk-resources (2.1.17) - aws-sdk-core (= 2.1.17) + aws-sdk-resources (2.1.29) + aws-sdk-core (= 2.1.29) bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) @@ -48,7 +48,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bourbon (4.2.4) + bourbon (4.2.5) sass (~> 3.4) thor (~> 0.19) builder (3.2.2) @@ -70,7 +70,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - database_cleaner (1.4.1) + database_cleaner (1.5.0) debug_inspector (0.0.2) devise (3.5.2) bcrypt (~> 3.0) @@ -85,7 +85,7 @@ GEM dotenv-rails (2.0.2) dotenv (= 2.0.2) railties (~> 4.0) - dragonfly (1.0.10) + dragonfly (1.0.12) addressable (~> 2.3) multi_json (~> 1.0) rack (>= 1.3.0) @@ -122,13 +122,12 @@ GEM formatador (0.2.5) haml (4.0.7) tilt - highline (1.7.3) + highline (1.7.8) hpricot (0.8.6) i18n (0.7.0) ipaddress (0.8.0) - jmespath (1.0.2) - multi_json (~> 1.0) - jquery-rails (3.1.3) + jmespath (1.1.3) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.3) @@ -139,19 +138,19 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.6.1) + mime-types (2.6.2) mini_portile (0.6.2) - minitest (5.8.0) + minitest (5.8.1) multi_json (1.11.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - newrelic_rpm (3.13.0.299) + net-ssh (3.0.1) + newrelic_rpm (3.13.2.302) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) orm_adapter (0.5.0) - pg (0.18.2) - poltergeist (1.6.0) + pg (0.18.3) + poltergeist (1.7.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -160,11 +159,11 @@ GEM activerecord (>= 3.0) powder (0.3.0) thor (>= 0.11.5) - pry (0.10.1) + pry (0.10.2) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (2.13.4) + puma (2.14.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -189,7 +188,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - redcarpet (3.3.2) + redcarpet (3.3.3) responders (1.1.2) railties (>= 3.2, < 4.2) rspec-core (3.3.2) @@ -211,17 +210,17 @@ GEM rspec-support (3.3.0) ruby_parser (3.7.1) sexp_processor (~> 4.1) - sass (3.4.18) - sass-rails (5.0.3) + sass (3.4.19) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) sexp_processor (4.6.0) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - simple_form (3.1.1) + shoulda-matchers (3.0.0) + activesupport (>= 4.0.0) + simple_form (3.2.0) actionpack (~> 4.0) activemodel (~> 4.0) simplecov (0.10.0) @@ -231,20 +230,20 @@ GEM simplecov-html (0.10.0) slop (3.6.0) slugtastic (1.2.1) - sprockets (3.3.3) - rack (~> 1.0) - sprockets-rails (2.3.2) + sprockets (3.4.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) + sqlite3 (1.3.11) squeel (1.2.3) activerecord (>= 3.0) activesupport (>= 3.0) polyamorous (~> 1.1.0) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.1) tunnel (0.0.3) highline (~> 1.6) thor @@ -309,3 +308,6 @@ DEPENDENCIES uglifier unf will_paginate + +BUNDLED WITH + 1.10.6