aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock64
1 files changed, 32 insertions, 32 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cf91b2d02..6c190836f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,12 +18,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.1.11)
- actionpack (= 3.1.11)
- mail (~> 2.3.3)
- actionpack (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
+ actionmailer (3.1.12)
+ actionpack (= 3.1.12)
+ mail (~> 2.4.4)
+ actionpack (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
@@ -32,19 +32,19 @@ GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
- activemodel (3.1.11)
- activesupport (= 3.1.11)
+ activemodel (3.1.12)
+ activesupport (= 3.1.12)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
+ activerecord (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
- activesupport (3.1.11)
+ activeresource (3.1.12)
+ activemodel (= 3.1.12)
+ activesupport (= 3.1.12)
+ activesupport (3.1.12)
multi_json (~> 1.0)
annotate (2.5.0)
rake
@@ -96,14 +96,14 @@ GEM
haml (3.1.7)
highline (1.6.15)
hike (1.2.1)
- i18n (0.6.2)
- json (1.5.5)
+ i18n (0.6.4)
+ json (1.7.7)
levenshtein (0.2.2)
linecache (0.46)
rbx-require-relative (> 0.0.4)
locale (2.0.8)
mahoro (0.3)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -119,7 +119,7 @@ GEM
thin
memcache-client (1.8.5)
mime-types (1.21)
- multi_json (1.6.1)
+ multi_json (1.7.1)
net-http-local (0.1.2)
net-purge (0.1.0)
net-scp (1.0.4)
@@ -145,17 +145,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.11)
- actionmailer (= 3.1.11)
- actionpack (= 3.1.11)
- activerecord (= 3.1.11)
- activeresource (= 3.1.11)
- activesupport (= 3.1.11)
+ rails (3.1.12)
+ actionmailer (= 3.1.12)
+ actionpack (= 3.1.12)
+ activerecord (= 3.1.12)
+ activeresource (= 3.1.12)
+ activesupport (= 3.1.12)
bundler (~> 1.0)
- railties (= 3.1.11)
- railties (3.1.11)
- actionpack (= 3.1.11)
- activesupport (= 3.1.11)
+ railties (= 3.1.12)
+ railties (3.1.12)
+ actionpack (= 3.1.12)
+ activesupport (= 3.1.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -218,11 +218,11 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
- tilt (1.3.3)
+ tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
vpim (0.695)
webrat (0.7.3)
nokogiri (>= 1.2.0)
@@ -262,7 +262,7 @@ DEPENDENCIES
newrelic_rpm
pg
rack
- rails (= 3.1.11)
+ rails (= 3.1.12)
rake (= 0.9.2.2)
rdoc
recaptcha (~> 0.3.1)