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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
9bad736f
Commit
9bad736f
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecesary wrapper elements
parent
a70c5078
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
26 deletions
+15
-26
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-4
app/views/projects/_commit_button.html.haml
app/views/projects/_commit_button.html.haml
+1
-3
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+2
-3
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-2
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+5
-6
app/views/projects/notes/_edit_form.html.haml
app/views/projects/notes/_edit_form.html.haml
+2
-3
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+4
-5
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
9bad736f
...
...
@@ -192,10 +192,6 @@
line-height
:
1
.1
;
}
.merge-request-form-info
{
padding-top
:
15px
;
}
// hide mr close link for inline diff comment form
.diff-file
.close-mr-link
,
.diff-file
.reopen-mr-link
{
...
...
app/views/projects/_commit_button.html.haml
View file @
9bad736f
.form-actions
.commit-button-annotation
=
button_tag
'Commit Changes'
,
class:
'btn commit-btn js-commit-button btn-create'
=
button_tag
'Commit Changes'
,
class:
'btn commit-btn js-commit-button btn-create'
=
link_to
'Cancel'
,
cancel_path
,
class:
'btn btn-cancel'
,
data:
{
confirm:
leave_edit_message
}
app/views/projects/issues/_form.html.haml
View file @
9bad736f
%div
.issue-form-holder
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form'
}
do
|
f
|
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@issue
],
html:
{
class:
'form-horizontal issue-form gfm-form js-requires-input'
}
do
|
f
|
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@issue
:javascript
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
9bad736f
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form js-requires-input'
}
do
|
f
|
.merge-request-form-info
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
:javascript
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
9bad736f
...
...
@@ -11,12 +11,11 @@
=
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 js-requires-input'
}
do
|
f
|
.merge-request-form-info
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
=
render
'shared/issuable/form'
,
f:
f
,
issuable:
@merge_request
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
%ul
.merge-request-tabs
...
...
app/views/projects/notes/_edit_form.html.haml
View file @
9bad736f
...
...
@@ -6,6 +6,5 @@
=
render
'projects/notes/hints'
.note-form-actions
.buttons
=
f
.
submit
'Save Comment'
,
class:
'btn btn-primary btn-save btn-grouped js-comment-button'
=
link_to
'Cancel'
,
'#'
,
class:
'btn btn-cancel note-edit-cancel'
=
f
.
submit
'Save Comment'
,
class:
'btn btn-primary btn-save btn-grouped js-comment-button'
=
link_to
'Cancel'
,
'#'
,
class:
'btn btn-cancel note-edit-cancel'
app/views/projects/notes/_form.html.haml
View file @
9bad736f
...
...
@@ -12,8 +12,7 @@
=
render
'projects/notes/hints'
.error-alert
.note-form-actions
.buttons.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-green comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
%a
.btn.grouped.js-close-discussion-note-form
Cancel
.note-form-actions.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-create comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-close-discussion-note-form
Cancel
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