aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock77
1 files changed, 47 insertions, 30 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 548029163..55b574c2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,24 @@
GIT
remote: git://github.com/mysociety/rails.git
- revision: be86a2fd6264637a22e1a1aeb8a8ec979f53ec1e
- tag: v2.3.16.1
+ revision: 893560c501f2c3eda044938840108431dcf6ab91
+ tag: v2.3.17.1
specs:
- actionmailer (2.3.16)
- actionpack (= 2.3.16)
- actionpack (2.3.16)
- activesupport (= 2.3.16)
+ actionmailer (2.3.17)
+ actionpack (= 2.3.17)
+ actionpack (2.3.17)
+ activesupport (= 2.3.17)
rack (~> 1.1.0)
- activerecord (2.3.16)
- activesupport (= 2.3.16)
- activeresource (2.3.16)
- activesupport (= 2.3.16)
- activesupport (2.3.16)
- rails (2.3.16)
- actionmailer (= 2.3.16)
- actionpack (= 2.3.16)
- activerecord (= 2.3.16)
- activeresource (= 2.3.16)
- activesupport (= 2.3.16)
+ activerecord (2.3.17)
+ activesupport (= 2.3.17)
+ activeresource (2.3.17)
+ activesupport (= 2.3.17)
+ activesupport (2.3.17)
+ rails (2.3.17)
+ actionmailer (= 2.3.17)
+ actionpack (= 2.3.17)
+ activerecord (= 2.3.17)
+ activeresource (= 2.3.17)
+ activesupport (= 2.3.17)
rake (>= 0.8.3)
GEM
@@ -27,18 +27,25 @@ GEM
annotate (2.4.0)
archive-tar-minitar (0.5.2)
bootstrap-sass (2.1.1.0)
- capistrano (2.13.4)
+ capistrano (2.14.2)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
chunky_png (1.2.6)
+ colorize (0.5.8)
columnize (0.3.6)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
+ coveralls (0.6.0)
+ colorize
+ multi_json (~> 1.3)
+ rest-client
+ simplecov (>= 0.7)
+ thor
daemons (1.1.9)
erubis (2.7.0)
eventmachine (1.0.0)
@@ -51,11 +58,11 @@ GEM
gettext_i18n_rails (0.7.1)
fast_gettext (>= 0.4.8)
haml (3.1.7)
- highline (1.6.13)
+ highline (1.6.15)
hoe (3.0.8)
rake (~> 0.8)
i18n (0.6.1)
- json (1.5.4)
+ json (1.7.7)
linecache (0.46)
rbx-require-relative (> 0.0.4)
linecache19 (0.5.12)
@@ -78,15 +85,16 @@ GEM
thin
memcache-client (1.8.5)
mime-types (1.19)
+ multi_json (1.6.1)
net-http-local (0.1.2)
net-purge (0.1.0)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-sftp (2.0.5)
- net-ssh (>= 2.0.9)
- net-ssh (2.5.2)
- net-ssh-gateway (1.1.0)
- net-ssh (>= 1.99.1)
+ net-scp (1.1.0)
+ net-ssh (>= 2.6.5)
+ net-sftp (2.1.1)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.5)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
newrelic_rpm (3.5.4.34)
pg (0.13.2)
polyglot (0.3.3)
@@ -95,8 +103,11 @@ GEM
rack
rake (0.9.2.2)
rbx-require-relative (0.0.9)
- rdoc (2.4.3)
+ rdoc (3.12.1)
+ json (~> 1.4)
recaptcha (0.3.4)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
rmagick (2.13.1)
routing-filter (0.2.4)
actionpack
@@ -124,6 +135,10 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sass (3.2.1)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
sinatra (1.2.8)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
@@ -140,6 +155,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
+ thor (0.17.0)
tilt (1.3.3)
treetop (1.4.11)
polyglot
@@ -158,13 +174,14 @@ DEPENDENCIES
bootstrap-sass
capistrano
compass
+ coveralls
erubis
fakeweb
fast_gettext (>= 0.6.0)
fastercsv (>= 1.5.5)
gettext (~> 2.3.3)
gettext_i18n_rails (>= 0.7.1)
- json (~> 1.5.1)
+ json
locale (>= 2.0.5)
mahoro
mail
@@ -178,7 +195,7 @@ DEPENDENCIES
rack-ssl
rails!
rake (= 0.9.2.2)
- rdoc (~> 2.4.3)
+ rdoc
recaptcha (~> 0.3.1)
rmagick
routing-filter (~> 0.2.4)