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
7b57a98c
Commit
7b57a98c
authored
May 25, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflict in app/views/projects/commit/_change.html.haml
parent
3c3a149d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+0
-4
No files found.
app/views/projects/commit/_change.html.haml
View file @
7b57a98c
...
...
@@ -22,11 +22,7 @@
%p
.append-bottom-20
=
description
=
form_tag
[
type
.
underscore
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
commit
],
method: :post
,
remote:
false
,
class:
"js-
#{
type
}
-form js-requires-input"
do
.form-group.row.branch
<
<<<<<<
HEAD
=
label_tag
'start_branch'
,
branch_label
,
class:
'col-form-label'
==
=====
=
label_tag
'start_branch'
,
branch_label
,
class:
'col-form-label col-sm-2'
>
>>>>>> gitlab-ce/master
.col-sm-10
=
hidden_field_tag
:start_branch
,
@project
.
default_branch
,
id:
'start_branch'
=
dropdown_tag
(
@project
.
default_branch
,
options:
{
title:
s_
(
"BranchSwitcherTitle|Switch branch"
),
filter:
true
,
placeholder:
s_
(
"BranchSwitcherPlaceholder|Search branches"
),
toggle_class:
'js-project-refs-dropdown dynamic'
,
dropdown_class:
'dropdown-menu-selectable'
,
data:
{
field_name:
"start_branch"
,
selected:
@project
.
default_branch
,
start_branch:
@project
.
default_branch
,
refs_url:
project_branches_path
(
@project
),
submit_form_on_click:
false
}
})
...
...
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