Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use rails-5 branch for shoulda-matchers to remove deprecation warning #556

Merged
merged 1 commit into from
Jul 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ group :test do
gem 'poltergeist', require: false
gem 'selenium-webdriver', require: false
gem 'launchy'
gem 'shoulda-matchers'
gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers.git', branch: 'rails-5'
gem 'faker'
gem 'capybara-screenshot'
gem 'database_cleaner'
Expand Down
14 changes: 10 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/thoughtbot/shoulda-matchers.git
revision: f800d62525a65f9bf001ea984ae4926a92ff5b82
branch: rails-5
specs:
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -320,8 +328,6 @@ GEM
websocket (~> 1.0)
sentry-raven (2.4.0)
faraday (>= 0.7.6, < 1.0)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
simple_form (3.4.0)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
Expand Down Expand Up @@ -413,7 +419,7 @@ DEPENDENCIES
sass-rails
selenium-webdriver
sentry-raven
shoulda-matchers
shoulda-matchers!
simple_form
sqlite3
uglifier
Expand All @@ -423,4 +429,4 @@ RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.14.2
1.14.6