diff --git a/Gemfile.lock b/Gemfile.lock index 4ee6b9a1..bc355a2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,9 +97,9 @@ GEM bootstrap-datepicker-rails (1.4.0) railties (>= 3.0) builder (3.2.2) - bullet (4.14.4) + bullet (4.14.5) activesupport (>= 3.0.0) - uniform_notifier (>= 1.6.0) + uniform_notifier (~> 1.9.0) callsite (0.0.11) capistrano (3.2.1) i18n @@ -108,7 +108,7 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.2) + capistrano-rails (1.1.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) @@ -130,15 +130,15 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - colorize (0.7.5) + coffee-script-source (1.9.1.1) + colorize (0.7.7) commonjs (0.2.7) - connection_pool (2.1.3) + connection_pool (2.2.0) content_for_in_controllers (0.0.2) - coveralls (0.8.0) - multi_json (~> 1.10) + coveralls (0.8.1) + json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) daemons (1.2.2) @@ -154,7 +154,7 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - domain_name (0.5.23) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) eventmachine (1.0.5) @@ -184,7 +184,6 @@ GEM has_scope (0.6.0) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) - hike (1.2.3) html2haml (2.0.0) erubis (~> 2.7.0) haml (~> 4.0.0) @@ -211,9 +210,11 @@ GEM activesupport (>= 3.0.0) less (2.6.0) commonjs (~> 0.2.7) - less-rails (2.6.0) - actionpack (>= 3.1) + less-rails (2.7.0) + actionpack (>= 4.0) less (~> 2.6.0) + sprockets (> 2, < 4) + tilt libv8 (3.16.14.7) loofah (2.0.1) nokogiri (>= 1.5.9) @@ -232,9 +233,9 @@ GEM rack-contrib (~> 1.1) railties (>= 3.0.0, < 5.0.0) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.5) mini_portile (0.6.2) - minitest (5.5.1) + minitest (5.6.1) mono_logger (1.1.0) multi_json (1.11.0) mysql2 (0.3.18) @@ -311,7 +312,7 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.2) - recurring_select (1.3.0) + recurring_select (1.3.1) coffee-rails (>= 3.1) ice_cube (>= 0.11) jquery-rails (>= 3.0) @@ -364,9 +365,9 @@ GEM rspec rspec-support (3.2.2) ruby-ole (1.2.11.8) - ruby-prof (0.15.6) + ruby-prof (0.15.8) ruby-units (1.4.5) - ruby_parser (3.6.5) + ruby_parser (3.6.6) sexp_processor (~> 4.1) rubyzip (1.1.7) sass (3.4.13) @@ -383,7 +384,7 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - sexp_processor (4.5.0) + sexp_processor (4.5.1) simple-navigation (3.14.0) activesupport (>= 2.3.2) simple-navigation-bootstrap (1.0.0) @@ -392,11 +393,11 @@ GEM simple_form (3.1.0) actionpack (~> 4.0) activemodel (~> 4.0) - simplecov (0.9.2) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) @@ -405,13 +406,10 @@ GEM eventmachine (~> 1.0.0) thin (~> 1.5.0) slop (3.6.0) - spreadsheet (1.0.0) + spreadsheet (1.0.3) ruby-ole (>= 1.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.0.3) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) @@ -433,14 +431,14 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - tins (1.3.5) + tins (1.5.1) ttfunk (1.4.0) twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) execjs rails (>= 3.1) railties (>= 3.1) - twitter-text (1.11.0) + twitter-text (1.12.0) unf (~> 0.1.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -449,8 +447,8 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.6) - uniform_notifier (1.8.0) + unf_ext (0.0.7.1) + uniform_notifier (1.9.0) vegas (0.1.11) rack (>= 1.0.0) web-console (2.1.2) @@ -458,7 +456,7 @@ GEM binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - websocket (1.2.1) + websocket (1.2.2) whenever (0.9.4) chronic (>= 0.6.3) wikicloth (0.8.3)