diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c9ae1e860..903562017 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: 9e452eaf296d3732f8058ad31cf18e0b659f27a6 + 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,13 +90,6 @@ GEM 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) rake (0.9.2.2) rbx-require-relative (0.0.9) rdoc (2.4.3) @@ -157,6 +163,7 @@ DEPENDENCIES json (~> 1.5.1) locale (>= 2.0.5) mahoro + mail mailcatcher memcache-client net-http-local @@ -164,8 +171,8 @@ DEPENDENCIES newrelic_rpm pg rack (~> 1.1.0) - rails (= 2.3.15) - rake (~> 0.9.2.2) + rails! + rake (= 0.9.2.2) rdoc (~> 2.4.3) recaptcha (~> 0.3.1) rmagick |