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
65cfba2d
Commit
65cfba2d
authored
May 27, 2019
by
Douwe Maan
Committed by
Mayra Cabrera
May 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable two_step_rebase feature flag
Disabling because of
https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
parent
871e2e1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/models/repository.rb
app/models/repository.rb
+1
-1
changelogs/unreleased/dm-disable-two-step-rebase.yml
changelogs/unreleased/dm-disable-two-step-rebase.yml
+5
-0
No files found.
app/models/repository.rb
View file @
65cfba2d
...
@@ -1077,7 +1077,7 @@ class Repository
...
@@ -1077,7 +1077,7 @@ class Repository
end
end
def
rebase
(
user
,
merge_request
)
def
rebase
(
user
,
merge_request
)
if
Feature
.
disabled?
(
:two_step_rebase
,
default_enabled:
tru
e
)
if
Feature
.
disabled?
(
:two_step_rebase
,
default_enabled:
fals
e
)
return
rebase_deprecated
(
user
,
merge_request
)
return
rebase_deprecated
(
user
,
merge_request
)
end
end
...
...
changelogs/unreleased/dm-disable-two-step-rebase.yml
0 → 100644
View file @
65cfba2d
---
title
:
Disable two-step rebase which could cause rebases to hang
merge_request
:
28778
author
:
type
:
other
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