Skip to content
This repository has been archived by the owner on Jun 5, 2020. It is now read-only.

Commit

Permalink
Update ruby and rails and gems
Browse files Browse the repository at this point in the history
  • Loading branch information
JPrevost committed Nov 2, 2014
1 parent e788d82 commit a12add6
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
ruby-2.1.2
ruby-2.1.4
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,3 +1,3 @@
language: ruby
rvm:
- 2.1.2
- 2.1.4
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
ruby '2.1.2'
gem 'rails', '4.1.6'
ruby '2.1.4'
gem 'rails', '4.1.7'
gem 'nokogiri'
gem 'newrelic_rpm'
gem 'bootstrap-sass', '~> 3.2.0'
Expand Down
88 changes: 44 additions & 44 deletions Gemfile.lock
@@ -1,35 +1,35 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.6)
activesupport (= 4.1.6)
actionview (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.6)
activesupport (= 4.1.6)
activemodel (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
arel (~> 5.0.0)
activesupport (4.1.6)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (5.0.1.20140414130214)
autoprefixer-rails (3.1.1.20141001)
autoprefixer-rails (3.1.2.20141016)
execjs
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
Expand All @@ -38,7 +38,7 @@ GEM
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
capybara (2.4.3)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand All @@ -57,7 +57,7 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
execjs (2.2.1)
execjs (2.2.2)
hike (1.2.3)
i18n (0.6.11)
jquery-rails (3.1.2)
Expand All @@ -66,48 +66,48 @@ GEM
json (1.8.1)
mail (2.6.1)
mime-types (>= 1.16, < 3)
mime-types (2.3)
mime-types (2.4.3)
mini_portile (0.6.0)
minitest (5.4.2)
multi_json (1.10.1)
netrc (0.7.7)
newrelic_rpm (3.9.5.251)
netrc (0.8.0)
newrelic_rpm (3.9.6.257)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
pg (0.17.1)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.6)
railties (= 4.1.7)
sprockets-rails (~> 2.0)
rails_12factor (0.0.2)
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.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-core (3.1.5)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.2)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
Expand All @@ -117,13 +117,13 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.1)
rspec-support (3.1.2)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.3)
sass-rails (4.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0)
simplecov (0.9.1)
docile (~> 1.1.0)
Expand All @@ -134,16 +134,16 @@ GEM
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
sprockets (2.11.0)
sprockets (2.11.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.4)
sprockets-rails (2.2.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
Expand All @@ -156,7 +156,7 @@ GEM
execjs (>= 0.3.0)
json (>= 1.8.0)
vcr (2.9.3)
webmock (1.19.0)
webmock (1.20.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
xpath (2.0.0)
Expand All @@ -175,7 +175,7 @@ DEPENDENCIES
newrelic_rpm
nokogiri
pg
rails (= 4.1.6)
rails (= 4.1.7)
rails_12factor
rspec-rails
sass-rails (>= 3.2)
Expand Down

0 comments on commit a12add6

Please sign in to comment.