diff --git a/Gemfile b/Gemfile index c9f338fd4..05d1379c5 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'responders', '~> 2.4.0' gem 'foundation-rails', '~> 6.2.4.0' gem 'foundation_rails_helper', '~> 2.0.0' gem 'acts_as_votable' -gem 'ckeditor', '~> 4.2.2' +gem 'ckeditor', '~> 4.2.3' gem 'invisible_captcha', '~> 0.9.2' gem 'cancancan', '~> 1.16.0' gem 'social-share-button', '~> 0.10' @@ -73,14 +73,14 @@ group :development, :test do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-commands-rspec' - gem 'rspec-rails', '~> 3.5' - gem 'capybara', '~> 2.13.0' + gem 'rspec-rails', '~> 3.6' + gem 'capybara', '~> 2.14.0' gem 'factory_girl_rails', '~> 4.8.0' gem 'fuubar' gem 'launchy' gem 'quiet_assets' gem 'letter_opener_web', '~> 1.3.1' - gem 'i18n-tasks', '~> 0.9.13' + gem 'i18n-tasks', '~> 0.9.15' gem 'capistrano', '~> 3.8.1', require: false gem 'capistrano-bundler', '~> 1.2', require: false gem "capistrano-rails", '~> 1.2.3', require: false @@ -94,7 +94,7 @@ end group :test do gem 'database_cleaner' - gem 'poltergeist', '~> 1.14.0' + gem 'poltergeist', '~> 1.15.0' gem 'coveralls', '~> 0.8.21', require: false gem 'email_spec' end diff --git a/Gemfile.lock b/Gemfile.lock index c1dc671a8..dd2917b68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM acts-as-taggable-on (4.0.0) activerecord (>= 4.0) acts_as_votable (0.10.0) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) ahoy_matey (1.6.0) addressable @@ -86,7 +86,7 @@ GEM capistrano3-delayed-job (1.7.3) capistrano (~> 3.0, >= 3.0.0) daemons (~> 1.2.4) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -94,11 +94,10 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) chronic (0.10.2) - ckeditor (4.2.2) + ckeditor (4.2.3) cocaine orm_adapter (~> 0.5.0) - climate_control (0.0.3) - activesupport (>= 3.0) + climate_control (0.1.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -137,7 +136,7 @@ GEM devise_security_extension (0.10.0) devise (>= 3.0.0, < 4.0) railties (>= 3.2.6, < 5.0) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) easy_translate (0.5.0) json @@ -185,7 +184,7 @@ GEM httpi (2.4.1) rack i18n (0.8.1) - i18n-tasks (0.9.13) + i18n-tasks (0.9.15) activesupport (>= 4.0.2) ast (>= 2.1.0) easy_translate (>= 0.5.0) @@ -293,7 +292,7 @@ GEM activerecord (>= 4.2) activesupport (>= 4.2) arel (>= 6) - poltergeist (1.14.0) + poltergeist (1.15.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -332,7 +331,8 @@ GEM activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.1) + rainbow (2.2.2) + rake raindrops (0.18.0) rake (12.0.0) redcarpet (3.4.0) @@ -344,23 +344,23 @@ GEM rinku (2.0.2) rollbar (2.14.1) multi_json - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -480,8 +480,8 @@ DEPENDENCIES capistrano-bundler (~> 1.2) capistrano-rails (~> 1.2.3) capistrano3-delayed-job (~> 1.7.3) - capybara (~> 2.13.0) - ckeditor (~> 4.2.2) + capybara (~> 2.14.0) + ckeditor (~> 4.2.3) coffee-rails (~> 4.2.1) coveralls (~> 0.8.21) daemons @@ -498,7 +498,7 @@ DEPENDENCIES foundation_rails_helper (~> 2.0.0) fuubar groupdate (~> 3.2.0) - i18n-tasks (~> 0.9.13) + i18n-tasks (~> 0.9.15) initialjs-rails (= 0.2.0.4) invisible_captcha (~> 0.9.2) jquery-rails (~> 4.3.1) @@ -516,14 +516,14 @@ DEPENDENCIES paranoia (~> 2.3.1) pg (~> 0.20.0) pg_search - poltergeist (~> 1.14.0) + poltergeist (~> 1.15.0) quiet_assets rails (= 4.2.8) redcarpet (~> 3.4.0) responders (~> 2.4.0) rinku (~> 2.0.2) rollbar (~> 2.14.1) - rspec-rails (~> 3.5) + rspec-rails (~> 3.6) rubocop (~> 0.48.1) rvm1-capistrano3 sass-rails (~> 5.0, >= 5.0.4)