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
99422e7d
Commit
99422e7d
authored
Jan 11, 2021
by
Dmytro Zaporozhets (DZ)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Apply 1 suggestion(s) to 1 file(s)"
This reverts commit
73fb4437
parent
73fb4437
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb
...ions/merge_request/rebase_quick_action_shared_examples.rb
+1
-1
No files found.
spec/support/shared_examples/quick_actions/merge_request/rebase_quick_action_shared_examples.rb
View file @
99422e7d
...
...
@@ -65,7 +65,7 @@ RSpec.shared_examples 'rebase quick action' do
end
context
'when there are conflicts in the merge request'
do
let
_it_be
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
source_branch:
'conflict-missing-side'
,
target_branch:
'conflict-start'
,
merge_status: :cannot_be_merged
)
}
let
!
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
source_branch:
'conflict-missing-side'
,
target_branch:
'conflict-start'
,
merge_status: :cannot_be_merged
)
}
it
'does not rebase the MR'
do
add_note
(
"/rebase"
)
...
...
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