diff options
| -rw-r--r-- | Gemfile.lock | 123 |
1 files changed, 62 insertions, 61 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3dc08590d..1864dd4fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,97 +49,98 @@ GEM annotate (2.5.0) rake arel (2.2.3) - bootstrap-sass (2.2.1.1) + bootstrap-sass (2.3.1.2) sass (~> 3.2) builder (3.0.4) - capistrano (2.13.5) + capistrano (2.15.4) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - chunky_png (1.2.6) + chunky_png (1.2.8) colorize (0.5.8) columnize (0.3.6) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - coveralls (0.6.2) + coveralls (0.6.7) colorize multi_json (~> 1.3) rest-client simplecov (>= 0.7) thor daemons (1.1.9) - debugger (1.5.0) + debugger (1.6.0) columnize (>= 0.3.1) debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.2.0) + debugger-ruby_core_source (~> 1.2.1) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.0) - diff-lcs (1.1.3) + debugger-ruby_core_source (1.2.2) + diff-lcs (1.2.4) dynamic_form (1.1.4) erubis (2.7.0) - eventmachine (1.0.0) + eventmachine (1.0.3) exception_notification (3.0.1) actionmailer (>= 3.0.4) fakeweb (1.3.0) - fast_gettext (0.6.11) + fast_gettext (0.7.0) fastercsv (1.5.5) - fssm (0.2.9) - gettext (2.3.7) - levenshtein + fssm (0.2.10) + gettext (2.3.9) locale - gettext_i18n_rails (0.8.0) + text + gettext_i18n_rails (0.9.4) fast_gettext (>= 0.4.8) - haml (3.1.7) - highline (1.6.15) - hike (1.2.1) + haml (4.0.3) + tilt + highline (1.6.19) + hike (1.2.2) i18n (0.6.4) - json (1.7.7) - levenshtein (0.2.2) + json (1.8.0) linecache (0.46) rbx-require-relative (> 0.0.4) locale (2.0.8) - mahoro (0.3) + mahoro (0.4) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mailcatcher (0.2.4) - eventmachine - haml - i18n - json - mail - sinatra - skinny (>= 0.1.2) - sqlite3-ruby - thin - mime-types (1.21) - multi_json (1.7.1) + mailcatcher (0.5.11) + activesupport (~> 3.0) + eventmachine (~> 1.0.0) + haml (>= 3.1, < 5) + mail (~> 2.3) + sinatra (~> 1.2) + skinny (~> 0.2.3) + sqlite3 (~> 1.3) + thin (~> 1.5.0) + mime-types (1.23) + multi_json (1.7.4) 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.6.2) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) - newrelic_rpm (3.5.3.25) - nokogiri (1.5.5) - paper_trail (2.7.0) + net-scp (1.1.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.6.7) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + newrelic_rpm (3.6.2.96) + nokogiri (1.5.9) + paper_trail (2.7.2) activerecord (~> 3.0) railties (~> 3.0) - pg (0.14.1) + pg (0.15.1) polyglot (0.3.3) rack (1.3.10) rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) + rack-protection (1.5.0) + rack rack-ssl (1.3.3) rack rack-test (0.6.2) @@ -165,23 +166,23 @@ GEM rbx-require-relative (0.0.9) rdoc (3.12.2) json (~> 1.4) - recaptcha (0.3.4) + recaptcha (0.3.5) rest-client (1.6.7) mime-types (>= 1.16) rmagick (2.13.2) routing-filter (0.3.1) actionpack - rspec-core (2.12.1) - rspec-expectations (2.12.0) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - rspec-rails (2.12.0) + rspec-core (2.13.1) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.13.1) + rspec-rails (2.13.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) @@ -191,14 +192,15 @@ GEM ruby-ole (>= 1.2.8) vpim (>= 0.360) ruby-ole (1.2.11.6) - sass (3.2.3) + sass (3.2.9) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - sinatra (1.2.8) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) + sinatra (1.3.3) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) skinny (0.2.3) eventmachine (~> 1.0.0) thin (~> 1.5.0) @@ -210,16 +212,15 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - sqlite3-ruby (1.3.3) - sqlite3 (>= 1.3.3) + sqlite3 (1.3.7) syslog_protocol (0.9.2) - thin (1.5.0) + text (1.2.1) + thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.14.6) - tilt (1.3.6) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) |