diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b5f5671f3..4a41129f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,14 +125,17 @@ GEM tilt highline (1.6.19) hike (1.2.3) + holidays (1.0.8) i18n (0.6.11) + icalendar (1.4.3) + iso_country_codes (0.6.1) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) 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) @@ -167,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) @@ -201,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) @@ -230,6 +233,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + secure_headers (1.3.4) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -305,9 +309,12 @@ DEPENDENCIES gettext gettext_i18n_rails globalize3! + holidays + icalendar (= 1.4.3) + iso_country_codes jquery-rails (~> 3.0.4) jquery-ui-rails - json + json (~> 1.8.1) locale mahoro mailcatcher @@ -316,7 +323,7 @@ DEPENDENCIES net-purge newrelic_rpm nokogiri - pg + pg (~> 0.17.1) quiet_assets rack rails (= 3.2.21) @@ -330,6 +337,7 @@ DEPENDENCIES ruby-debug ruby-msg (~> 1.5.0)! sass-rails (~> 3.2.3) + secure_headers spork-rails statistics2 (~> 0.54) syslog_protocol |