Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e2533fe2
Commit
e2533fe2
authored
Jun 03, 2021
by
Tiffany Rea
Committed by
Mayra Cabrera
Jun 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove flaky test from smoke for investigation
parent
f5cdda20
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
...reate/merge_request/merge_merge_request_from_fork_spec.rb
+2
-1
No files found.
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
View file @
e2533fe2
...
...
@@ -2,7 +2,8 @@
module
QA
RSpec
.
describe
'Create'
do
describe
'Merge request creation from fork'
,
:smoke
do
describe
'Merge request creation from fork'
do
# TODO: Please add this back to :smoke suite as soon as https://gitlab.com/gitlab-org/gitlab/-/issues/332588 is addressed
it
'can merge feature branch fork to mainline'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1701'
do
merge_request
=
Resource
::
MergeRequestFromFork
.
fabricate_via_browser_ui!
do
|
merge_request
|
merge_request
.
fork_branch
=
'feature-branch'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment