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
22f8da98
Commit
22f8da98
authored
May 16, 2019
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a broken spec for EE
parent
9afe8d3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
spec/services/merge_requests/rebase_service_spec.rb
spec/services/merge_requests/rebase_service_spec.rb
+1
-1
No files found.
spec/services/merge_requests/rebase_service_spec.rb
View file @
22f8da98
...
@@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do
...
@@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do
context
'with deprecated step rebase feature'
do
context
'with deprecated step rebase feature'
do
before
do
before
do
allow
(
Feature
).
to
receive
(
:disabled?
).
with
(
:two_step_rebase
,
anything
).
and_return
(
tru
e
)
stub_feature_flags
(
two_step_rebase:
fals
e
)
end
end
it_behaves_like
'sequence of failure and success'
it_behaves_like
'sequence of failure and success'
...
...
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