aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock29
1 files changed, 15 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 28aa68468..25b156184 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,7 +27,7 @@ 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)
@@ -51,11 +51,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.5)
+ json (1.7.7)
linecache (0.46)
rbx-require-relative (> 0.0.4)
linecache19 (0.5.12)
@@ -80,20 +80,21 @@ GEM
mime-types (1.19)
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)
- rack (1.1.5)
+ rack (1.1.6)
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)
rmagick (2.13.1)
routing-filter (0.2.4)
@@ -162,7 +163,7 @@ DEPENDENCIES
fastercsv (>= 1.5.5)
gettext (~> 2.3.3)
gettext_i18n_rails (>= 0.7.1)
- json (~> 1.5.5)
+ json
locale (>= 2.0.5)
mahoro
mail
@@ -175,7 +176,7 @@ DEPENDENCIES
rack (~> 1.1.0)
rails!
rake (= 0.9.2.2)
- rdoc (~> 2.4.3)
+ rdoc
recaptcha (~> 0.3.1)
rmagick
routing-filter (~> 0.2.4)