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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-23 20:50:53 +0300
committerStan Hu <stanhu@gmail.com>2018-07-23 20:52:09 +0300
commit0da5e427ec32ed750e80f19621dfe97ba90f3f57 (patch)
tree32020a90f6d1f1bc9c8ab60d69d9a194d009eed7
parent9d7920fb8cc133bea541375a23de789bf70f375f (diff)
Bump rspec from 3.6.0 to 3.7.0
This brings the version in line with the Gemfile in CE so we aren't shipping different versions in Omnibus. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3698
-rw-r--r--changelogs/unreleased/sh-bump-rspec-3-7-0.yml5
-rw-r--r--ruby/Gemfile.lock22
2 files changed, 16 insertions, 11 deletions
diff --git a/changelogs/unreleased/sh-bump-rspec-3-7-0.yml b/changelogs/unreleased/sh-bump-rspec-3-7-0.yml
new file mode 100644
index 000000000..1e478f112
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-rspec-3-7-0.yml
@@ -0,0 +1,5 @@
+---
+title: Bump rspec from 3.6.0 to 3.7.0
+merge_request: 830
+author:
+type: other
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index bdfa51ab7..036b6104d 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -98,19 +98,19 @@ GEM
rake (12.1.0)
rdoc (4.3.0)
rouge (3.1.1)
- rspec (3.6.0)
- rspec-core (~> 3.6.0)
- rspec-expectations (~> 3.6.0)
- rspec-mocks (~> 3.6.0)
- rspec-core (3.6.0)
- rspec-support (~> 3.6.0)
- rspec-expectations (3.6.0)
+ rspec (3.7.0)
+ rspec-core (~> 3.7.0)
+ rspec-expectations (~> 3.7.0)
+ rspec-mocks (~> 3.7.0)
+ rspec-core (3.7.1)
+ rspec-support (~> 3.7.0)
+ rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.6.0)
- rspec-mocks (3.6.0)
+ rspec-support (~> 3.7.0)
+ rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.6.0)
- rspec-support (3.6.0)
+ rspec-support (~> 3.7.0)
+ rspec-support (3.7.1)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)