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
d49b9939
Commit
d49b9939
authored
May 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small UI improvements to MR form
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cd108a82
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
app/views/projects/_aside.html.haml
app/views/projects/_aside.html.haml
+5
-0
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+3
-4
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
No files found.
app/views/projects/_aside.html.haml
View file @
d49b9939
...
@@ -39,6 +39,11 @@
...
@@ -39,6 +39,11 @@
=
link_to
url_for_new_issue
(
@project
,
only_path:
true
),
title:
"New Issue"
,
class:
'btn btn-sm'
do
=
link_to
url_for_new_issue
(
@project
,
only_path:
true
),
title:
"New Issue"
,
class:
'btn btn-sm'
do
%i
.fa.fa-fw.fa-exclamation-circle
%i
.fa.fa-fw.fa-exclamation-circle
New issue
New issue
-
if
can?
current_user
,
:write_merge_request
,
@project
=
link_to
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-sm"
,
title:
"New Merge Request"
do
%i
.fa.fa-plus
New Merge Request
...
...
app/views/projects/merge_requests/_new_compare.html.haml
View file @
d49b9939
%h3
.page-title
Compare branches for new Merge Request
%p
.lead
Compare branches for new Merge Request
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline"
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
new_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline"
}
do
|
f
|
.hide.alert.alert-danger.mr-compare-errors
.hide.alert.alert-danger.mr-compare-errors
...
@@ -52,8 +51,8 @@
...
@@ -52,8 +51,8 @@
are the same.
are the same.
%
hr
%
div
=
f
.
submit
'Compare branches'
,
class:
"btn btn-primary
mr-compare-btn"
=
f
.
submit
'Compare branches'
,
class:
"btn btn-new
mr-compare-btn"
:javascript
:javascript
var
source_branch
=
$
(
"
#merge_request_source_branch
"
)
var
source_branch
=
$
(
"
#merge_request_source_branch
"
)
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
d49b9939
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
%span
.pull-right
%span
.pull-right
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
%hr
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form'
}
do
|
f
|
.merge-request-form-info
.merge-request-form-info
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@merge_request
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@merge_request
...
...
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