aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e640ad77..4a41129f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.1.0)
railties (>= 3.1.0)
- json (1.8.1)
+ json (1.8.2)
libv8 (3.16.14.3)
linecache (0.46)
rbx-require-relative (> 0.0.4)
@@ -170,7 +170,7 @@ GEM
paper_trail (2.7.2)
activerecord (~> 3.0)
railties (~> 3.0)
- pg (0.15.1)
+ pg (0.17.1)
polyglot (0.3.5)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
@@ -204,7 +204,7 @@ GEM
rbx-require-relative (0.0.9)
rdoc (3.12.2)
json (~> 1.4)
- recaptcha (0.3.5)
+ recaptcha (0.3.6)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -314,7 +314,7 @@ DEPENDENCIES
iso_country_codes
jquery-rails (~> 3.0.4)
jquery-ui-rails
- json
+ json (~> 1.8.1)
locale
mahoro
mailcatcher
@@ -323,7 +323,7 @@ DEPENDENCIES
net-purge
newrelic_rpm
nokogiri
- pg
+ pg (~> 0.17.1)
quiet_assets
rack
rails (= 3.2.21)