aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock63
1 files changed, 32 insertions, 31 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 32a1e77f5..682bacf8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,12 +18,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.18)
- actionpack (= 3.2.18)
+ actionmailer (3.2.19)
+ actionpack (= 3.2.19)
mail (~> 2.5.4)
- actionpack (3.2.18)
- activemodel (= 3.2.18)
- activesupport (= 3.2.18)
+ actionpack (3.2.19)
+ activemodel (= 3.2.19)
+ activesupport (= 3.2.19)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -31,18 +31,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.18)
- activesupport (= 3.2.18)
+ activemodel (3.2.19)
+ activesupport (= 3.2.19)
builder (~> 3.0.0)
- activerecord (3.2.18)
- activemodel (= 3.2.18)
- activesupport (= 3.2.18)
+ activerecord (3.2.19)
+ activemodel (= 3.2.19)
+ activesupport (= 3.2.19)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.18)
- activemodel (= 3.2.18)
- activesupport (= 3.2.18)
- activesupport (3.2.18)
+ activeresource (3.2.19)
+ activemodel (= 3.2.19)
+ activesupport (= 3.2.19)
+ activesupport (3.2.19)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
annotate (2.5.0)
@@ -104,7 +104,6 @@ GEM
fancybox-rails (0.2.1)
railties (>= 3.1.0)
fast_gettext (0.7.0)
- fastercsv (1.5.5)
foundation-rails (5.2.1.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
@@ -145,7 +144,7 @@ GEM
thin (~> 1.5.0)
memcache-client (1.8.5)
mime-types (1.25.1)
- multi_json (1.10.0)
+ multi_json (1.10.1)
net-http-local (0.1.2)
net-purge (0.1.0)
net-scp (1.1.1)
@@ -155,13 +154,15 @@ GEM
net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.8.0.218)
+ newrelic_rpm (3.9.1.236)
nokogiri (1.5.9)
paper_trail (2.7.2)
activerecord (~> 3.0)
railties (~> 3.0)
pg (0.15.1)
- polyglot (0.3.4)
+ polyglot (0.3.5)
+ quiet_assets (1.0.2)
+ railties (>= 3.1, < 5.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@ -171,19 +172,19 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.18)
- actionmailer (= 3.2.18)
- actionpack (= 3.2.18)
- activerecord (= 3.2.18)
- activeresource (= 3.2.18)
- activesupport (= 3.2.18)
+ rails (3.2.19)
+ actionmailer (= 3.2.19)
+ actionpack (= 3.2.19)
+ activerecord (= 3.2.19)
+ activeresource (= 3.2.19)
+ activesupport (= 3.2.19)
bundler (~> 1.0)
- railties (= 3.2.18)
+ railties (= 3.2.19)
rails-i18n (0.7.3)
i18n (~> 0.5)
- railties (3.2.18)
- actionpack (= 3.2.18)
- activesupport (= 3.2.18)
+ railties (3.2.19)
+ actionpack (= 3.2.19)
+ activesupport (= 3.2.19)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -243,7 +244,7 @@ GEM
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
statistics2 (0.54)
syslog_protocol (0.9.2)
@@ -295,7 +296,6 @@ DEPENDENCIES
fakeweb
fancybox-rails
fast_gettext
- fastercsv (>= 1.5.5)
foundation-rails
gettext
gettext_i18n_rails
@@ -312,8 +312,9 @@ DEPENDENCIES
newrelic_rpm
nokogiri
pg
+ quiet_assets
rack
- rails (= 3.2.18)
+ rails (= 3.2.19)
rails-i18n
rake (= 0.9.2.2)
rdoc