diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 12:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 12:08:51 +0000 |
| commit | 8c4198cbe631278e87fee04157d23494fbb80cdb (patch) | |
| tree | d35cf498af480389796fd9e5cb4bcc903aea60f3 /Gemfile.lock | |
| parent | 1ac794623a8be5dee111716a44dd04ff708f3541 (diff) | |
| download | gitlab-ce-8c4198cbe631278e87fee04157d23494fbb80cdb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fd8ada1235b..19b107f41f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -894,36 +894,36 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.9.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.0.beta3) + rspec-rails (4.0.0.beta4) 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-core (~> 3.9) + rspec-expectations (~> 3.9) + rspec-mocks (~> 3.9) + rspec-support (~> 3.9) rspec-retry (0.6.1) rspec-core (> 3.3) rspec-set (0.1.3) - rspec-support (3.8.2) + rspec-support (3.9.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) @@ -1350,7 +1350,7 @@ DEPENDENCIES rouge (~> 3.16.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.0.beta3) + rspec-rails (~> 4.0.0.beta4) rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter |