Skip to content

Commit

Permalink
Bundle update to Rails 3.2.14 and also update all other things
Browse files Browse the repository at this point in the history
  • Loading branch information
tjgrathwell committed Aug 4, 2013
1 parent 5d46453 commit 95aaf04
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

ruby '2.0.0'
gem 'rails', '3.2.13'
gem 'rails', '3.2.14'
gem 'devise', '~> 2.2.3'
gem 'thin'
gem 'jquery-rails'
Expand Down
80 changes: 40 additions & 40 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
actionmailer (3.2.14)
actionpack (= 3.2.14)
mail (~> 2.5.4)
actionpack (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
Expand All @@ -16,19 +16,19 @@ GEM
sprockets (~> 2.2.1)
active_hash (1.0.1)
activesupport (>= 2.2.2)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.14)
activesupport (= 3.2.14)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
activeresource (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activesupport (3.2.14)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
arel (3.0.2)
Expand Down Expand Up @@ -73,7 +73,7 @@ GEM
crack (0.4.1)
safe_yaml (~> 0.9.0)
daemons (1.1.9)
devise (2.2.4)
devise (2.2.5)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
Expand All @@ -94,10 +94,10 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
faker (1.1.2)
faker (1.2.0)
i18n (~> 0.5)
faraday (0.8.7)
multipart-post (~> 1.1)
faraday (0.8.8)
multipart-post (~> 1.2.0)
faye-websocket (0.4.7)
eventmachine (>= 0.12.0)
ffi (1.9.0)
Expand All @@ -107,7 +107,7 @@ GEM
fssm (0.2.10)
gmaps4rails (1.5.6)
gravatar_image_tag (1.1.3)
guard (1.8.1)
guard (1.8.2)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
Expand All @@ -124,7 +124,7 @@ GEM
hike (1.2.3)
http_parser.rb (0.5.3)
httpauth (0.2.0)
i18n (0.6.1)
i18n (0.6.4)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
Expand All @@ -137,7 +137,7 @@ GEM
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.3)
jquery-ui-rails (4.0.4)
jquery-rails
railties (>= 3.1.0)
json (1.8.0)
Expand All @@ -153,10 +153,10 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
method_source (0.8.2)
mime-types (1.23)
mini_portile (0.5.1)
multi_json (1.7.7)
multi_json (1.7.8)
multipart-post (1.2.0)
nested_form (0.3.2)
nokogiri (1.6.0)
Expand Down Expand Up @@ -196,17 +196,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
rails (3.2.14)
actionmailer (= 3.2.14)
actionpack (= 3.2.14)
activerecord (= 3.2.14)
activeresource (= 3.2.14)
activesupport (= 3.2.14)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
railties (= 3.2.14)
railties (3.2.14)
actionpack (= 3.2.14)
activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -226,7 +226,7 @@ GEM
rspec-core (2.14.4)
rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.1)
rspec-mocks (2.14.2)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
Expand All @@ -238,14 +238,14 @@ GEM
safe_yaml (0.9.4)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sass (3.2.9)
sass (3.2.10)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sass_rails_patch (0.0.2)
sass-rails
select2-rails (3.4.3)
select2-rails (3.4.6)
sass-rails
thor (~> 0.14)
selenium-webdriver (2.33.0)
Expand All @@ -264,7 +264,7 @@ GEM
simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
slop (3.4.5)
slop (3.4.6)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -330,7 +330,7 @@ DEPENDENCIES
pg
poltergeist
quiet_assets
rails (= 3.2.13)
rails (= 3.2.14)
rb-fsevent
rspec-rails
sanitize
Expand Down

0 comments on commit 95aaf04

Please sign in to comment.