diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 12:06:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 12:06:03 +0000 |
| commit | 16d9f66e9651d35b52e5a167789befe7b861292c (patch) | |
| tree | 38ffe73aeffa5bc8ceaa3357db302edce6d874f6 /qa | |
| parent | 5333cb6c7c960aac58af40c898c87d050d829383 (diff) | |
| download | gitlab-ce-16d9f66e9651d35b52e5a167789befe7b861292c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index 90a2c6e5b8b..5266fc57b0a 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -8,7 +8,7 @@ gem 'rake', '~> 12.3.0' gem 'rspec', '~> 3.7' gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.2.13' -gem 'nokogiri', '~> 1.10.4' +gem 'nokogiri', '~> 1.10.5' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_junit_formatter', '~> 0.4.1' gem 'faker', '~> 1.6', '>= 1.6.6' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 6728c0cceee..84eab990c95 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -55,7 +55,7 @@ GEM mini_portile2 (2.4.0) minitest (5.11.3) netrc (0.11.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) parallel (1.17.0) parallel_tests (2.29.0) @@ -119,7 +119,7 @@ DEPENDENCIES faker (~> 1.6, >= 1.6.6) gitlab-qa knapsack (~> 1.17) - nokogiri (~> 1.10.4) + nokogiri (~> 1.10.5) parallel_tests (~> 2.29) pry-byebug (~> 3.5.1) rake (~> 12.3.0) |