Skip to content
This repository has been archived by the owner on Nov 22, 2017. It is now read-only.

Commit

Permalink
Merge pull request #35 from alphagov/rails-3.2.9
Browse files Browse the repository at this point in the history
Upgrade to rails 3.2.9
  • Loading branch information
saulius committed Nov 26, 2012
2 parents 158f1e6 + 65a5d02 commit 31de955
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 34 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"
source "https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/"

gem "rails", "3.2.8"
gem "rails", "3.2.9"

gem "mysql2"
gem "multi_json"
Expand Down
67 changes: 34 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ GEM
remote: https://rubygems.org/
remote: https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/
specs:
actionmailer (3.2.8)
actionpack (= 3.2.8)
actionmailer (3.2.9)
actionpack (= 3.2.9)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
Expand All @@ -60,7 +60,7 @@ GEM
ruby_parser (= 2.3.1)
sass (~> 3.0)
terminal-table (~> 1.4)
builder (3.0.3)
builder (3.0.4)
capistrano (2.13.5)
highline
net-scp (>= 1.0.0)
Expand Down Expand Up @@ -115,7 +115,7 @@ GEM
mime-types (1.19)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.3.6)
multi_json (1.3.7)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
Expand Down Expand Up @@ -145,25 +145,25 @@ GEM
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
bundler (~> 1.0)
railties (= 3.2.8)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
railties (= 3.2.9)
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (0.9.2.2)
rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
Expand Down Expand Up @@ -204,8 +204,9 @@ GEM
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.3.3)
sprockets (2.1.3)
sprockets (2.2.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
terminal-table (1.4.5)
Expand All @@ -219,10 +220,10 @@ GEM
multi_json (~> 1.0)
rake
rest-client (~> 1.6)
treetop (1.4.10)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -265,7 +266,7 @@ DEPENDENCIES
plek (= 0.5.0)
pry-rails
rabl (= 0.7.6)
rails (= 3.2.8)
rails (= 3.2.9)
railties
router-client (= 3.0.1)
rspec-rails
Expand Down

0 comments on commit 31de955

Please sign in to comment.