diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 18:06:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 18:06:39 +0300 |
| commit | 97b63407ef0ecacc239fe320a9b87eefdebfe70c (patch) | |
| tree | 64f9ab65e07bee7d37c1559e59e1607dc819cfe1 /Gemfile.lock | |
| parent | a68e9d3318c6847436f81f83eb347b29f52d1bff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 15465cd6b03..cf78043b1ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -881,14 +881,14 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) + rspec-rails (4.0.0.beta3) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.8) + rspec-expectations (~> 3.8) + rspec-mocks (~> 3.8) + rspec-support (~> 3.8) rspec-retry (0.6.1) rspec-core (> 3.3) rspec-set (0.1.3) @@ -1307,7 +1307,7 @@ DEPENDENCIES rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.8.0) + rspec-rails (~> 4.0.0.beta3) rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter |