diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-04 16:17:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-04 16:17:36 +0000 |
| commit | e09bdd78431371fd30ca1862f0466eacba09a0d2 (patch) | |
| tree | 1aa1188421eb8f82a572368e417c130d9271e786 /Gemfile | |
| parent | 25c66be492dc83cd1b51212007b1a17d1903ae1d (diff) | |
| parent | 3c2236cbe1b50629155b99d99bd2e44d9cbe133e (diff) | |
| download | gitlab-ce-e09bdd78431371fd30ca1862f0466eacba09a0d2.tar.gz | |
Merge branch 'upgrade-rspec-rails' into 'master'
Upgrade rspec-rails from 3.4.2 to 3.5.0.
Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286
Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/
See merge request !5051
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -276,7 +276,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.4.0' gem 'factory_girl_rails', '~> 4.6.0' - gem 'rspec-rails', '~> 3.4.0' + gem 'rspec-rails', '~> 3.5.0' gem 'rspec-retry' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' |