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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
eb3e7bdf
Commit
eb3e7bdf
authored
Jan 12, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge request close message moved and merge request now refered by `!`.
parent
e85faec9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+5
-0
app/views/projects/issues/_closed_by_box.html.haml
app/views/projects/issues/_closed_by_box.html.haml
+2
-2
app/views/projects/issues/_merge_requests.html.haml
app/views/projects/issues/_merge_requests.html.haml
+3
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+0
-3
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
eb3e7bdf
...
@@ -24,6 +24,7 @@ $gl-gray: #5a5a5a;
...
@@ -24,6 +24,7 @@ $gl-gray: #5a5a5a;
$gl-padding
:
16px
;
$gl-padding
:
16px
;
$gl-padding-top
:
10px
;
$gl-padding-top
:
10px
;
$gl-avatar-size
:
46px
;
$gl-avatar-size
:
46px
;
$quote-gray
:
#7f8fa4
;
/*
/*
* Color schema
* Color schema
...
...
app/assets/stylesheets/pages/issues.scss
View file @
eb3e7bdf
...
@@ -144,3 +144,8 @@ form.edit-issue {
...
@@ -144,3 +144,8 @@ form.edit-issue {
.issue-form
.select2-container
{
.issue-form
.select2-container
{
width
:
250px
!
important
;
width
:
250px
!
important
;
}
}
.issue-closed-by-widget
{
color
:
$quote-gray
;
margin-left
:
52px
;
}
\ No newline at end of file
app/views/projects/issues/_closed_by_box.html.haml
View file @
eb3e7bdf
.issue-closed-by-widget.
gray-content-block.second-block.white
.issue-closed-by-widget.
second-block
This issue will be closed automatically when merge request
#{
markdown
(
merge_requests_sentence
(
@closed_by_merge_requests
),
pipeline: :gfm
)
}
is accepted
.
When this merge request is accepted, this issue will be closed automatically
.
app/views/projects/issues/_merge_requests.html.haml
View file @
eb3e7bdf
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
-
elsif
has_any_ci
-
elsif
has_any_ci
=
icon
(
'blank fw'
)
=
icon
(
'blank fw'
)
%span
.merge-request-id
%span
.merge-request-id
\
#
#{merge_request.iid}
\
!
#{
merge_request
.
iid
}
%span
.merge-request-info
%span
.merge-request-info
%strong
%strong
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
...
@@ -24,3 +24,5 @@
...
@@ -24,3 +24,5 @@
MERGED
MERGED
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
CLOSED
CLOSED
-
if
@closed_by_merge_requests
.
present?
=
render
'projects/issues/closed_by_box'
app/views/projects/issues/show.html.haml
View file @
eb3e7bdf
...
@@ -53,9 +53,6 @@
...
@@ -53,9 +53,6 @@
.gray-content-block.second-block.oneline-block
.gray-content-block.second-block.oneline-block
=
render
'votes/votes_block'
,
votable:
@issue
=
render
'votes/votes_block'
,
votable:
@issue
-
if
@closed_by_merge_requests
.
present?
=
render
'projects/issues/closed_by_box'
.row
.row
%section
.col-md-9
%section
.col-md-9
.issuable-discussion
.issuable-discussion
...
...
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