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
0ec3e8c6
Commit
0ec3e8c6
authored
Jan 07, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Textual change
parent
c356fae5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/merge_requests/widget/open/_rebase.html.haml
...ews/projects/merge_requests/widget/open/_rebase.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/widget/open/_rebase.html.haml
View file @
0ec3e8c6
...
...
@@ -14,9 +14,9 @@
=
icon
(
"exclamation-triangle"
)
Fast-forward merge is not possible
%p
Please rebase this branch on
Rebase the source branch onto
%span
.label-branch
=
@merge_request
.
target_branch
and try again
.
to allow this merge request to be merged
.
-
else
=
form_for
[
:rebase
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
remote:
true
,
method: :post
,
html:
{
class:
'rebase-mr-form js-requires-input'
}
do
|
f
|
=
hidden_field_tag
:authenticity_token
,
form_authenticity_token
...
...
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