diff --git a/Gemfile.lock b/Gemfile.lock index 182a315..1fa2fc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.0.3) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) + activerecord-deprecated_finders (1.0.4) activerecord-jdbc-adapter (1.2.9.1) activerecord-jdbcsqlite3-adapter (1.2.9) activerecord-jdbc-adapter (~> 1.2.9) @@ -52,8 +52,6 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.15) - atomic (1.1.15-java) builder (3.1.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -63,6 +61,8 @@ GEM execjs coffee-script-source (1.7.1) colorize (0.5.8) + commonjs (0.2.7) + concurrent-ruby (1.2.2) coveralls (0.6.7) colorize multi_json (~> 1.3) @@ -73,18 +73,25 @@ GEM dotenv-rails (0.9.0) dotenv (= 0.9.0) erubis (2.7.0) - execjs (2.0.1) + execjs (2.8.1) ffi2-generators (0.1.1) hike (1.2.3) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jdbc-sqlite3 (3.7.2.1) jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) json (1.8.1-java) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) libv8 (3.16.14.3) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) @@ -96,13 +103,13 @@ GEM mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.0) - multi_json (1.8.4) - polyglot (0.3.4) + multi_json (1.15.0) + polyglot (0.3.5) racc (1.4.10) - rack (1.5.2) + rack (1.5.5) rack-protection (1.5.2) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.0.3) actionmailer (= 4.0.3) @@ -117,7 +124,7 @@ GEM activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (13.0.6) rdoc (4.0.1) json (~> 1.4) redcard (1.1.0) @@ -361,21 +368,19 @@ GEM therubyrhino (2.0.2) therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) - thor (0.18.1) - thread_safe (0.2.0) - atomic (>= 1.1.7, < 2) - thread_safe (0.2.0-java) - atomic (>= 1.1.7, < 2) + thor (1.2.1) + thread_safe (0.3.6) + thread_safe (0.3.6-java) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.2.8) + twitter-bootstrap-rails (3.2.2) actionpack (>= 3.1) - execjs - rails (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) railties (>= 3.1) - tzinfo (0.3.38) + tzinfo (0.3.61) uglifier (2.2.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)