Permalink
Browse files

Merge pull request #33 from alphagov/bumping_rails_version

bumping rails to 3.2.10
  • Loading branch information...
2 parents 9255f4c + 4f31a5f commit 41e238aa0ca3463c4f2ed45624882240a38081a0 @jamiecobbett jamiecobbett committed Jan 3, 2013
Showing with 34 additions and 33 deletions.
  1. +1 −1 Gemfile
  2. +33 −32 Gemfile.lock
View
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
source 'https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/'
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.10'
group :assets do
gem 'less-rails-bootstrap', '2.1.1'
View
@@ -2,31 +2,31 @@ GEM
remote: https://rubygems.org/
remote: https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/
specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.10)
+ actionpack (= 3.2.10)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
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.10)
+ activesupport (= 3.2.10)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
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.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
+ activesupport (3.2.10)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
@@ -102,7 +102,7 @@ GEM
jquery-ui-rails (2.0.2)
jquery-rails
railties (>= 3.1.0)
- json (1.7.5)
+ json (1.7.6)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.7.4)
@@ -124,7 +124,7 @@ GEM
mime-types (1.19)
mocha (0.12.6)
metaclass (~> 0.0.1)
- multi_json (1.3.6)
+ multi_json (1.5.0)
multipart-post (1.1.5)
nokogiri (1.5.5)
oauth2 (0.8.0)
@@ -159,23 +159,23 @@ GEM
rack
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.10)
+ actionmailer (= 3.2.10)
+ actionpack (= 3.2.10)
+ activerecord (= 3.2.10)
+ activeresource (= 3.2.10)
+ activesupport (= 3.2.10)
bundler (~> 1.0)
- railties (= 3.2.8)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (= 3.2.10)
+ railties (3.2.10)
+ actionpack (= 3.2.10)
+ activesupport (= 3.2.10)
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.3)
rdoc (3.12)
json (~> 1.4)
rubyzip (0.9.9)
@@ -195,19 +195,20 @@ GEM
shoulda-context (1.0.1)
shoulda-matchers (1.4.1)
activesupport (>= 3.0.0)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
timeliness (0.3.7)
- treetop (1.4.11)
+ 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)
@@ -251,7 +252,7 @@ DEPENDENCIES
mocha (= 0.12.6)
plek (= 0.5.0)
poltergeist (= 0.7.0)
- rails (= 3.2.8)
+ rails (= 3.2.10)
sass-rails (~> 3.2.3)
shoulda (~> 3.3.2)
therubyracer (~> 0.9.4)

0 comments on commit 41e238a

Please sign in to comment.