Skip to content

Commit

Permalink
Update Rails and RSpec.
Browse files Browse the repository at this point in the history
  • Loading branch information
JunichiIto committed Feb 12, 2015
1 parent b531f84 commit b717a4f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.2
2.2.0
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby "2.1.2"
ruby "2.2.0"

gem 'rails', '4.0.4'

Expand All @@ -26,12 +26,12 @@ group :production, :staging do
end

group :development, :test do
gem 'sqlite3'
gem 'sqlite3', '~> 1.3.10'
gem 'heroku_san'
gem 'heroku'
end

group :test do
gem "rspec-rails", "~> 3.0.1"
gem "rspec-rails", "~> 3.2.0"
gem 'capybara'
end
43 changes: 22 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
kgio (2.8.1)
kgio (2.9.3)
launchy (2.2.0)
addressable (~> 2.3)
less (2.5.0)
Expand Down Expand Up @@ -122,27 +122,28 @@ GEM
activesupport (= 4.0.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
raindrops (0.13.0)
rake (10.3.2)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec-core (3.0.0)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.0)
rspec-core (3.2.0)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.0)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.0)
rspec-support (~> 3.2.0)
rspec-mocks (3.2.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.0)
actionpack (>= 3.0, <= 4.2)
activesupport (>= 3.0, <= 4.2)
railties (>= 3.0, <= 4.2)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.0)
rubyzip (0.9.9)
sass (3.2.19)
sass-rails (4.0.3)
Expand All @@ -160,7 +161,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
sqlite3 (1.3.10)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
Expand Down Expand Up @@ -190,7 +191,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.7.0)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
Expand All @@ -212,9 +213,9 @@ DEPENDENCIES
pg
rails (= 4.0.4)
rails_12factor
rspec-rails (~> 3.0.1)
rspec-rails (~> 3.2.0)
sass-rails (~> 4.0.3)
sqlite3
sqlite3 (~> 1.3.10)
therubyracer
twitter (~> 5.8.0)
twitter-bootstrap-rails
Expand Down

0 comments on commit b717a4f

Please sign in to comment.