summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-21 23:33:57 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-21 23:33:57 +0000
commit8e11f1fa89d4064d9de402c40e2b6cfeb3e91949 (patch)
treeb68723023a937f6f06b036e8c607a9a2f768bc15 /qa
parent7e1583171d5d17e75395eabf928e77681ae6603d (diff)
parent5d077fabae3eeb720af7942093d8d5f643dee81e (diff)
downloadgitlab-ce-8e11f1fa89d4064d9de402c40e2b6cfeb3e91949.tar.gz
Merge branch '54201-update-rack-to-2.0.6' into 'master'
Update rack to 2.0.6 Closes #54201 See merge request gitlab-org/gitlab-ce!23171
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile.lock4
-rw-r--r--qa/qa/fixtures/auto_devops_rack/Gemfile.lock4
2 files changed, 4 insertions, 4 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 8d28fcacc05..d61ecf8fbb5 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
byebug (~> 9.1)
pry (~> 0.10)
public_suffix (3.0.1)
- rack (2.0.3)
+ rack (2.0.6)
rack-test (0.8.2)
rack (>= 1.0, < 3)
rake (12.3.0)
@@ -103,4 +103,4 @@ DEPENDENCIES
selenium-webdriver (~> 3.8.0)
BUNDLED WITH
- 1.16.4
+ 1.17.1
diff --git a/qa/qa/fixtures/auto_devops_rack/Gemfile.lock b/qa/qa/fixtures/auto_devops_rack/Gemfile.lock
index 09cf72c48ac..d44ccbb5e69 100644
--- a/qa/qa/fixtures/auto_devops_rack/Gemfile.lock
+++ b/qa/qa/fixtures/auto_devops_rack/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- rack (2.0.4)
+ rack (2.0.6)
rake (12.3.0)
PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
rake
BUNDLED WITH
- 1.16.1
+ 1.17.1