Skip to content

Commit

Permalink
Merge pull request #97 from rescuedcode/bump_rails_to_3.2.13
Browse files Browse the repository at this point in the history
Bumped Rails version to 3.2.13
  • Loading branch information
fermion committed Mar 19, 2013
2 parents 8fca439 + a7f6db3 commit 998ff59
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.2.11'
gem 'rails', '3.2.13'

gem 'backbone-support', '0.3.0'
gem 'bcrypt-ruby', '~> 3.0.1'
Expand Down
74 changes: 37 additions & 37 deletions Gemfile.lock
@@ -1,32 +1,32 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
Expand Down Expand Up @@ -121,20 +121,20 @@ GEM
addressable (~> 2.3)
libwebsocket (0.1.5)
addressable
mail (2.4.4)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcache-client (1.8.5)
metaclass (0.0.1)
method_source (0.8)
mime-types (1.19)
mime-types (1.21)
mobile-fu (1.1.0)
rack-mobile-detect
rails
mocha (0.12.3)
metaclass (~> 0.0.1)
multi_json (1.5.0)
multi_json (1.7.1)
netrc (0.7.7)
newrelic_rpm (3.5.3.25)
nokogiri (1.5.5)
Expand All @@ -149,35 +149,35 @@ GEM
slop (~> 3.3.1)
quiet_assets (1.0.1)
railties (~> 3.1)
rack (1.4.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-mobile-detect (0.4.0)
rack
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.11)
railties (= 3.2.13)
rails-behaviors (0.4.0)
coffee-script-source (~> 1.1)
sprockets (~> 2.0)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
Expand Down Expand Up @@ -224,12 +224,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
thor (0.17.0)
tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
tzinfo (0.3.37)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -273,7 +273,7 @@ DEPENDENCIES
pg
pry
quiet_assets
rails (= 3.2.11)
rails (= 3.2.13)
rails-behaviors
rspec-rails (= 2.8.1)
sass-rails (~> 3.2)
Expand Down

0 comments on commit 998ff59

Please sign in to comment.