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
d9764a5c
Commit
d9764a5c
authored
Jan 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more spec fixes
parent
a369988b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
2 deletions
+0
-2
app/views/projects/merge_requests/creations/_new_submit.html.haml
...s/projects/merge_requests/creations/_new_submit.html.haml
+0
-1
app/views/shared/issuable/form/_branch_chooser.html.haml
app/views/shared/issuable/form/_branch_chooser.html.haml
+0
-1
No files found.
app/views/projects/merge_requests/creations/_new_submit.html.haml
View file @
d9764a5c
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request.js-merge-request-new-submit
{
'data-mr-submit-action'
:
"#{j params[:tab].presence || 'new'}"
}
.mr-compare.merge-request.js-merge-request-new-submit
{
'data-mr-submit-action'
:
"#{j params[:tab].presence || 'new'}"
}
-
if
@commits
.
empty?
-
if
@commits
.
empty?
...
...
app/views/shared/issuable/form/_branch_chooser.html.haml
View file @
d9764a5c
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
.issuable-form-select-holder
.issuable-form-select-holder
=
form
.
hidden_field
(
:target_branch
,
=
form
.
hidden_field
(
:target_branch
,
{
class:
'target_branch js-target-branch-select ref-name'
,
{
class:
'target_branch js-target-branch-select ref-name'
,
id:
''
,
disabled:
issuable
.
new_record?
,
disabled:
issuable
.
new_record?
,
data:
{
placeholder:
"Select branch"
,
endpoint:
refs_project_path
(
@project
,
sort:
'updated_desc'
,
find:
'branches'
)
}})
data:
{
placeholder:
"Select branch"
,
endpoint:
refs_project_path
(
@project
,
sort:
'updated_desc'
,
find:
'branches'
)
}})
-
if
issuable
.
new_record?
-
if
issuable
.
new_record?
...
...
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