diff options
| author | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
|---|---|---|
| committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
| commit | 6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8 (patch) | |
| tree | c683e3d7ebcf3e188f1dd85b8701ff972e7f8a3d /qa/Gemfile | |
| parent | 9b176c65159e4186f79eae2107af80e69132ba09 (diff) | |
| parent | 740288f80d85210ada3eccc0f98e0843b2917d65 (diff) | |
| download | gitlab-ce-6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8.tar.gz | |
Merge branch 'master' into 'maintainers-can-create-subgroup'
# Conflicts:
# doc/user/permissions.md
Diffstat (limited to 'qa/Gemfile')
| -rw-r--r-- | qa/Gemfile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index 12994b85322..c46be8a0362 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' +gem 'gitlab-qa' gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'capybara', '~> 2.16.1' gem 'capybara-screenshot', '~> 1.0.18' @@ -11,3 +12,4 @@ gem 'nokogiri', '~> 1.10.3' gem 'rspec-retry', '~> 0.6.1' gem 'faker', '~> 1.6', '>= 1.6.6' gem 'knapsack', '~> 1.17' +gem 'parallel_tests', '~> 2.29' |