summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-06-05 20:21:28 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-06-05 20:21:28 +0200
commit2545b0f85851d1e4ebc1137a2c8786a238e02ee4 (patch)
tree21a69bc5fb3e8e24d95c41618d1ef5a5be63e70d /Gemfile
parenta76bf07ae2ecaf47dab58cbeac37cb82ae8d3ad8 (diff)
downloadgitlab-ce-2545b0f85851d1e4ebc1137a2c8786a238e02ee4.tar.gz
Revert "Fix for failing specs"
This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31. Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> Conflicts: Gemfile.lock
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 5b45b8bdcc2..71855b5866e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -199,7 +199,7 @@ group :development, :test do
# gem 'rails-dev-tweaks'
gem 'spinach-rails'
gem "rspec-rails"
- gem "capybara", '~> 2.2.1'
+ gem "capybara"
gem "pry"
gem "awesome_print"
gem "database_cleaner"
@@ -222,7 +222,7 @@ group :development, :test do
gem 'rb-inotify', require: linux_only('rb-inotify')
# PhantomJS driver for Capybara
- gem 'poltergeist', '~> 1.5.1'
+ gem 'poltergeist', '~> 1.4.1'
gem 'jasmine', '2.0.2'