diff --git a/Gemfile b/Gemfile index e61695f..50fa59f 100644 --- a/Gemfile +++ b/Gemfile @@ -26,18 +26,18 @@ gem 'devise', '~> 3.5' # Authentication # Migration from LESS to SASS is required to drop this dependency gem 'therubyracer', '~> 0.12.3', platforms: :ruby gem 'less-rails', '~> 2.8' -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 3.2' gem 'jquery-rails' -gem 'coffee-rails', '~> 4.1.1' +gem 'coffee-rails', '~> 4.2', '>= 4.2.2' gem 'turbolinks' gem 'jquery-turbolinks' -gem 'jbuilder', '~> 2.4' +gem 'jbuilder', '~> 2.7' ## UI -gem 'font-awesome-rails', '~> 4.5.0.1' -gem 'will_paginate', '~> 3.1.0' -gem 'bootstrap-will_paginate', '~> 0.0.10' -gem 'simple_form', '~> 3.2.1' +gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2' +gem 'will_paginate', '~> 3.1', '>= 3.1.6' +gem 'bootstrap-will_paginate', '~> 1.0' +gem 'simple_form', '~> 3.5' gem 'data-confirm-modal', '~> 1.3' # Admin diff --git a/Gemfile.lock b/Gemfile.lock index 9550545..0462136 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-will_paginate (0.0.11) + bootstrap-will_paginate (1.0.0) will_paginate builder (3.2.3) byebug (9.0.6) @@ -59,9 +59,9 @@ GEM xpath (~> 2.0) chronic (0.10.2) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -106,8 +106,8 @@ GEM faker (1.7.3) i18n (~> 0.5) ffi (1.9.18) - font-awesome-rails (4.5.0.1) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.7.0.2) + railties (>= 3.2, < 5.2) foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) @@ -270,9 +270,9 @@ GEM ruby_dep (1.5.0) shellany (0.0.1) silencer (1.0.1) - simple_form (3.2.1) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -326,9 +326,9 @@ PLATFORMS DEPENDENCIES better_errors binding_of_caller - bootstrap-will_paginate (~> 0.0.10) + bootstrap-will_paginate (~> 1.0) capybara (~> 2.14, >= 2.14.4) - coffee-rails (~> 4.1.1) + coffee-rails (~> 4.2, >= 4.2.2) cron2english (~> 0.1.6) data-confirm-modal (~> 1.3) database_cleaner (~> 1.6, >= 1.6.1) @@ -338,13 +338,13 @@ DEPENDENCIES enumerize (~> 2.1, >= 2.1.2) factory_girl_rails (~> 4.8) faker - font-awesome-rails (~> 4.5.0.1) + font-awesome-rails (~> 4.7, >= 4.7.0.2) foreman (~> 0.84.0) fuubar guard guard-livereload guard-rspec - jbuilder (~> 2.4) + jbuilder (~> 2.7) jquery-rails jquery-turbolinks launchy @@ -361,7 +361,7 @@ DEPENDENCIES rspec-its rspec-rails (~> 3.6) silencer (~> 1.0, >= 1.0.1) - simple_form (~> 3.2.1) + simple_form (~> 3.5) simplecov spring spring-commands-rspec @@ -369,10 +369,10 @@ DEPENDENCIES therubyracer (~> 0.12.3) thin turbolinks - uglifier (>= 1.3.0) + uglifier (~> 3.2) unicorn whenever (~> 0.9.7) - will_paginate (~> 3.1.0) + will_paginate (~> 3.1, >= 3.1.6) yard RUBY VERSION