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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-02 00:09:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-02 00:09:29 +0300
commit1f96548c39f3f9b03d1b2156e7cb707e748193d8 (patch)
tree119c750ef16ffcf90f82f0a62931de193ccc8699 /qa
parent102255f6d4209b9ee54c6f36d9391aae0a4b0dfb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile.lock6
-rw-r--r--qa/qa/fixtures/auto_devops_rack/Gemfile.lock2
-rw-r--r--qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb2
3 files changed, 3 insertions, 7 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 883c5480689..3ad9b4fed9e 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -39,9 +39,6 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.7)
- debase (0.2.4.1)
- debase-ruby_core_source (>= 0.10.2)
- debase-ruby_core_source (0.10.6)
diff-lcs (1.3)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
@@ -88,7 +85,7 @@ GEM
byebug (~> 9.1)
pry (~> 0.10)
public_suffix (4.0.1)
- rack (2.2.2)
+ rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rake (12.3.3)
@@ -155,7 +152,6 @@ DEPENDENCIES
airborne (~> 0.3.4)
capybara (~> 3.29.0)
capybara-screenshot (~> 1.0.23)
- debase (~> 0.2.4.1)
faker (~> 1.6, >= 1.6.6)
gitlab-qa
knapsack (~> 1.17)
diff --git a/qa/qa/fixtures/auto_devops_rack/Gemfile.lock b/qa/qa/fixtures/auto_devops_rack/Gemfile.lock
index 9c7c93fb553..04a85be4b2f 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.6)
+ rack (2.2.3)
rake (12.3.3)
PLATFORMS
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 9550572bd5c..688f42c48c6 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -19,7 +19,7 @@ module QA
end
end
- it 'closes an issue', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225303', type: :bug }, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1085' do
+ it 'closes an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1085' do
closed_issue.visit!
Page::Project::Issue::Show.perform do |issue_page|