diff --git a/Gemfile b/Gemfile index 25ec6cb..c7ed4f4 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,8 @@ else end gem 'rails', '4.1.1' -gem 'sass-rails', '~> 4.0.2' +#gem 'sprockets', '2.12.1' +gem 'sass-rails', '~> 4.0.3' gem 'coffee-rails', '~> 4.0.1' gem 'uglifier', '>= 1.3.0' gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 28e726f..81e9bac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ GEM tzinfo (~> 1.1) angularjs-rails (1.2.16) arel (5.0.1.20140414130214) - bson (2.2.3) + bson (2.2.4) builder (3.2.2) capybara (2.2.1) mime-types (>= 1.16) @@ -48,9 +48,6 @@ GEM mongoid-grid_fs (>= 1.3, < 3.0) celluloid (0.15.2) timers (~> 1.1.0) - celluloid-io (0.15.0) - celluloid (>= 0.15.0) - nio4r (>= 0.5.0) chunky_png (1.3.1) coderay (1.1.0) coffee-rails (4.0.1) @@ -61,7 +58,7 @@ GEM execjs coffee-script-source (1.7.0) connection_pool (2.0.0) - database_cleaner (1.2.0) + database_cleaner (1.3.0) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) @@ -74,7 +71,7 @@ GEM figaro (0.7.0) bundler (~> 1.0) rails (>= 3, < 5) - formatador (0.2.4) + formatador (0.2.5) foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) @@ -103,10 +100,9 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - kgio (2.8.0) - listen (2.7.4) + kgio (2.9.2) + listen (2.7.5) celluloid (>= 0.15.2) - celluloid-io (>= 0.15.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.5) @@ -117,8 +113,8 @@ GEM mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.5.3) - minitest (5.3.3) + mini_portile (0.6.0) + minitest (5.3.4) mongoid (4.0.0.beta1) activemodel (>= 4.0.0) moped (~> 2.0.beta6) @@ -138,11 +134,10 @@ GEM bson (~> 2.2) connection_pool (~> 2.0) optionable (~> 0.2.0) - multi_json (1.10.0) + multi_json (1.10.1) newrelic_rpm (3.8.1.221) - nio4r (1.0.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) optionable (0.2.0) origin (2.1.1) polyglot (0.3.4) @@ -174,12 +169,12 @@ GEM activesupport (= 4.1.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.11.0) - rake (10.3.1) + raindrops (0.13.0) + rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.4) ffi (>= 0.5.0) - redcarpet (3.1.1) + redcarpet (3.1.2) redis (3.0.7) redis-namespace (1.4.1) redis (~> 3.0.4) @@ -213,7 +208,7 @@ GEM sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - sidekiq (3.0.2) + sidekiq (3.1.0) celluloid (>= 0.15.2) connection_pool (>= 2.0.0) json @@ -231,8 +226,8 @@ GEM railties (>= 3.0, < 4.2) slim (~> 2.0) slop (3.5.0) - spring (1.1.2) - sprockets (2.8.0) + spring (1.1.3) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -255,7 +250,7 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) - unicorn (4.6.3) + unicorn (4.8.3) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -298,7 +293,7 @@ DEPENDENCIES rqrcode-with-patches rspec-rails (>= 2.8.1) rspec-sidekiq - sass-rails (~> 4.0.2) + sass-rails (~> 4.0.3) sidekiq simple_form slim-rails