From 757ca9758f65df0a7aef9c33b8bc0444d117b14f Mon Sep 17 00:00:00 2001 From: Jeremy Prevost Date: Mon, 9 Mar 2015 22:40:01 -0400 Subject: [PATCH] Update gems and Ruby version --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 65 ++++++++++++++++++++++++++------------------------- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.ruby-version b/.ruby-version index 76521af..58f65ad 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.2.0 +ruby-2.2.1 diff --git a/.travis.yml b/.travis.yml index 0bb46b0..2f9c901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: ruby rvm: - - 2.2.0 + - 2.2.1 sudo: false diff --git a/Gemfile b/Gemfile index 243aefa..7bd26e7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.2.0' +ruby '2.2.1' gem 'rails', '4.2.0' gem 'nokogiri' gem 'newrelic_rpm' diff --git a/Gemfile.lock b/Gemfile.lock index da5b790..6b68978 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,9 +36,9 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.6) + addressable (2.3.7) arel (6.0.0) - autoprefixer-rails (5.0.0.3) + autoprefixer-rails (5.1.7) execjs json bootstrap-sass (3.3.3) @@ -56,9 +56,9 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) columnize (0.9.0) - coveralls (0.7.4) + coveralls (0.7.11) multi_json (~> 1.10) - rest-client (~> 1.7) + rest-client (>= 1.6.8, < 2) simplecov (~> 0.9.1) term-ansicolor (~> 1.3) thor (~> 0.19.1) @@ -68,8 +68,8 @@ GEM diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) - execjs (2.2.2) - globalid (0.3.0) + execjs (2.4.0) + globalid (0.3.3) activesupport (>= 4.1.0) hike (1.2.3) i18n (0.7.0) @@ -85,9 +85,9 @@ GEM mime-types (2.4.3) mini_portile (0.6.2) minitest (5.5.1) - multi_json (1.10.1) - netrc (0.10.2) - newrelic_rpm (3.9.9.275) + multi_json (1.11.0) + netrc (0.10.3) + newrelic_rpm (3.10.0.279) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) pg (0.18.1) @@ -124,40 +124,41 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - rest-client (1.7.2) + rest-client (1.7.3) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec-core (3.2.1) + rspec-support (~> 3.2.0) + rspec-expectations (3.2.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-support (~> 3.2.0) + rspec-mocks (3.2.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.2.0) + rspec-rails (3.2.1) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.2.0) + rspec-expectations (~> 3.2.0) + rspec-mocks (~> 3.2.0) + rspec-support (~> 3.2.0) + rspec-support (3.2.2) safe_yaml (1.0.4) - sass (3.4.10) + sass (3.4.13) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (~> 1.1) - simplecov (0.9.1) + simplecov (0.9.2) docile (~> 1.1.0) multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) slop (3.6.0) - spring (1.2.0) + spring (1.3.3) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (2.12.3) @@ -175,10 +176,10 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.3.3) + tins (1.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) vcr (2.9.3)