Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2018-04-08 03:01:25 +0300
committerBenjamin Neff <benjamin@coding4coffee.ch>2018-04-12 03:41:56 +0300
commit5432a9183944dee51194783c8acd2c3bff0fa664 (patch)
tree1a3da436170679d5418bcef20d3e0e5d4a32283e
parent1a6afa54e828fbb804af0620684d3236fce86983 (diff)
Bump capybara
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 994b12da7..2f4925ef1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -282,7 +282,7 @@ group :test do
# Cucumber (integration tests)
- gem "capybara", "2.15.1"
+ gem "capybara", "2.18.0"
gem "database_cleaner", "1.6.1"
gem "poltergeist", "1.16.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5de267339..fb83b834d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,13 +72,13 @@ GEM
buftok (0.2.0)
builder (3.2.3)
byebug (10.0.2)
- capybara (2.15.1)
+ capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- xpath (~> 2.0)
+ xpath (>= 2.0, < 4.0)
carrierwave (1.2.2)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
@@ -756,8 +756,8 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
will_paginate (3.1.6)
- xpath (2.1.0)
- nokogiri (~> 1.3)
+ xpath (3.0.0)
+ nokogiri (~> 1.8)
yard (0.9.12)
PLATFORMS
@@ -773,7 +773,7 @@ DEPENDENCIES
autoprefixer-rails (= 8.2.0)
bootstrap-sass (= 3.3.7)
bootstrap-switch-rails (= 3.3.3)
- capybara (= 2.15.1)
+ capybara (= 2.18.0)
carrierwave (= 1.2.2)
compass-rails (= 3.0.2)
configurate (= 0.3.1)