diff options
author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-25 11:54:14 +0200 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-14 22:59:39 -0400 |
commit | b64e96b7512260c11afe3206d377f45bc15e8262 (patch) | |
tree | e2c7913c167f5df9d8906762ebb3fc4ada249061 | |
parent | 82b801fdea54b254fa4c19a01f6ca628790e2de4 (diff) | |
download | gitlab-ce-b64e96b7512260c11afe3206d377f45bc15e8262.tar.gz |
Upgrade to newer version of Capybara
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -226,7 +226,7 @@ group :development, :test do gem 'rubocop', '0.28.0', require: false gem 'spinach-rails' gem "rspec-rails", '3.0.0' - gem "capybara", '~> 2.2.1' + gem "capybara", '~> 2.3' gem 'capybara-screenshot', '~> 1.0.0' gem "pry-rails" gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index 38407ee653f..f4f455024ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) cal-heatmap-rails (0.0.1) - capybara (2.2.1) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -736,7 +736,7 @@ DEPENDENCIES browser (~> 0.8.0) byebug cal-heatmap-rails (~> 0.0.1) - capybara (~> 2.2.1) + capybara (~> 2.3) capybara-screenshot (~> 1.0.0) carrierwave charlock_holmes |