aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock28
1 files changed, 17 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d86425d16..422424ffc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,7 @@
-GEM
- remote: http://rubygems.org/
+GIT
+ remote: git://github.com/mysociety/rails.git
+ revision: 541c061c13337b8235a1dcc2357b962f88868ff9
+ branch: 2-3-stable
specs:
actionmailer (2.3.15)
actionpack (= 2.3.15)
@@ -11,6 +13,17 @@ GEM
activeresource (2.3.15)
activesupport (= 2.3.15)
activesupport (2.3.15)
+ rails (2.3.15)
+ actionmailer (= 2.3.15)
+ actionpack (= 2.3.15)
+ activerecord (= 2.3.15)
+ activeresource (= 2.3.15)
+ activesupport (= 2.3.15)
+ rake (>= 0.8.3)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
annotate (2.4.0)
archive-tar-minitar (0.5.2)
bootstrap-sass (2.1.1.0)
@@ -77,14 +90,7 @@ GEM
newrelic_rpm (3.5.4.34)
pg (0.13.2)
polyglot (0.3.3)
- rack (1.1.4)
- rails (2.3.15)
- actionmailer (= 2.3.15)
- actionpack (= 2.3.15)
- activerecord (= 2.3.15)
- activeresource (= 2.3.15)
- activesupport (= 2.3.15)
- rake (>= 0.8.3)
+ rack (1.1.5)
rake (0.9.2.2)
rbx-require-relative (0.0.9)
rdoc (2.4.3)
@@ -167,7 +173,7 @@ DEPENDENCIES
newrelic_rpm
pg
rack (~> 1.1.0)
- rails (= 2.3.15)
+ rails!
rake (= 0.9.2.2)
rdoc (~> 2.4.3)
recaptcha (~> 0.3.1)