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
Kazuhiko Shiozaki
gitlab-ce
Commits
9409f2a3
Commit
9409f2a3
authored
Apr 24, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9065 from rumpelsepp/issues
Tweak issue page a bit
parents
b0ed2ff1
149d67f7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
47 deletions
+40
-47
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+2
-11
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+9
-4
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+13
-20
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+15
-11
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+1
-1
No files found.
app/assets/stylesheets/pages/issues.scss
View file @
9409f2a3
...
@@ -25,17 +25,8 @@
...
@@ -25,17 +25,8 @@
display
:
inline-block
;
display
:
inline-block
;
}
}
.issue-actions
{
.issue-no-comments
{
display
:
none
;
opacity
:
0
.5
;
position
:
absolute
;
top
:
10px
;
right
:
15px
;
}
&
:hover
{
.issue-actions
{
display
:
block
;
}
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
9409f2a3
...
@@ -91,11 +91,16 @@
...
@@ -91,11 +91,16 @@
.merge-request-info
{
.merge-request-info
{
color
:
#999
;
color
:
#999
;
font-size
:
13px
;
font-size
:
13px
;
}
}
.merge-request-labels
{
.merge-request-labels
{
display
:
inline-block
;
display
:
inline-block
;
}
}
}
.merge-request-no-comments
{
opacity
:
0
.5
;
}
}
}
}
...
...
app/views/projects/issues/_issue.html.haml
View file @
9409f2a3
...
@@ -6,24 +6,34 @@
...
@@ -6,24 +6,34 @@
.issue-title
.issue-title
%span
.str-truncated
%span
.str-truncated
=
link_to_gfm
issue
.
title
,
issue_path
(
issue
),
class:
"row_title"
=
link_to_gfm
issue
.
title
,
issue_path
(
issue
),
class:
"row_title"
.issue-labels
-
issue
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_issues_path
(
issue
.
project
.
namespace
,
issue
.
project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
.pull-right.light
.pull-right.light
-
if
issue
.
closed?
-
if
issue
.
closed?
%span
%span
CLOSED
CLOSED
-
if
issue
.
assignee
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
)
-
note_count
=
issue
.
notes
.
user
.
count
-
note_count
=
issue
.
notes
.
user
.
count
-
if
note_count
>
0
-
if
note_count
>
0
%span
%span
%i
.fa.fa-comments
%i
.fa.fa-comments
=
note_count
=
note_count
-
else
%span
.issue-no-comments
%i
.fa.fa-comments
=
0
.issue-info
.issue-info
=
link_to
"#
#{
issue
.
iid
}
"
,
issue_path
(
issue
),
class:
"light"
=
"#
#{
issue
.
iid
}
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
'bottom'
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
"
.
html_safe
-
if
issue
.
assignee
assigned to
#{
link_to_member
(
@project
,
issue
.
assignee
)
}
-
if
issue
.
votes_count
>
0
-
if
issue
.
votes_count
>
0
=
render
'votes/votes_inline'
,
votable:
issue
=
render
'votes/votes_inline'
,
votable:
issue
-
if
issue
.
milestone
-
if
issue
.
milestone
%span
%span
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
=
issue
.
milestone
.
title
=
issue
.
milestone
.
title
...
@@ -33,20 +43,3 @@
...
@@ -33,20 +43,3 @@
.pull-right.issue-updated-at
.pull-right.issue-updated-at
%small
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
'bottom'
,
'issue_update_ago'
)
}
%small
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
'bottom'
,
'issue_update_ago'
)
}
.issue-labels
-
issue
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_issues_path
(
issue
.
project
.
namespace
,
issue
.
project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
.issue-actions
-
if
can?
current_user
,
:modify_issue
,
issue
-
if
issue
.
closed?
=
link_to
'Reopen'
,
issue_path
(
issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
"btn btn-sm btn-grouped reopen_issue btn-reopen"
,
remote:
true
-
else
=
link_to
'Close'
,
issue_path
(
issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
"btn btn-sm btn-grouped close_issue btn-close"
,
remote:
true
=
link_to
edit_namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
),
class:
"btn btn-sm edit-issue-link btn-grouped"
do
%i
.fa.fa-pencil-square-o
Edit
app/views/projects/merge_requests/_merge_request.html.haml
View file @
9409f2a3
...
@@ -2,6 +2,10 @@
...
@@ -2,6 +2,10 @@
.merge-request-title
.merge-request-title
%span
.str-truncated
%span
.str-truncated
=
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"
.merge-request-labels
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_merge_requests_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
.pull-right.light
.pull-right.light
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
%span
%span
...
@@ -17,20 +21,26 @@
...
@@ -17,20 +21,26 @@
%i
.fa.fa-code-fork
%i
.fa.fa-code-fork
%span
=
merge_request
.
target_branch
%span
=
merge_request
.
target_branch
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
if
merge_request
.
assignee
&
nbsp
;
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
)
-
if
note_count
>
0
-
if
note_count
>
0
&
nbsp
;
&
nbsp
;
%span
%span
%i
.fa.fa-comments
%i
.fa.fa-comments
=
note_count
=
note_count
.merge-request-info
=
link_to
"#
#{
merge_request
.
iid
}
"
,
merge_request_path
(
merge_request
),
class:
"light"
-
if
merge_request
.
assignee
assigned
to
#{
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
)
}
-
else
-
else
Unassigned
&
nbsp
;
%span
.merge-request-no-comments
%i
.fa.fa-comments
=
0
.merge-request-info
=
"#
#{
merge_request
.
iid
}
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
'bottom'
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
"
.
html_safe
-
if
merge_request
.
votes_count
>
0
-
if
merge_request
.
votes_count
>
0
=
render
'votes/votes_inline'
,
votable:
merge_request
=
render
'votes/votes_inline'
,
votable:
merge_request
-
if
merge_request
.
milestone_id?
-
if
merge_request
.
milestone_id?
&
nbsp
;
%span
%span
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
=
merge_request
.
milestone
.
title
=
merge_request
.
milestone
.
title
...
@@ -38,11 +48,5 @@
...
@@ -38,11 +48,5 @@
%span
.task-status
%span
.task-status
=
merge_request
.
task_status
=
merge_request
.
task_status
.pull-right.hidden-xs
.pull-right.hidden-xs
%small
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
'bottom'
,
'merge_request_updated_ago'
)
}
%small
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
'bottom'
,
'merge_request_updated_ago'
)
}
.merge-request-labels
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to
namespace_project_merge_requests_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
label_name:
label
.
name
)
do
=
render_colored_label
(
label
)
spec/features/issues_spec.rb
View file @
9409f2a3
...
@@ -21,7 +21,7 @@ describe 'Issues', feature: true do
...
@@ -21,7 +21,7 @@ describe 'Issues', feature: true do
end
end
before
do
before
do
visit
namespace_project_issues_path
(
project
.
namespace
,
project
)
visit
edit_namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
click_link
"Edit"
click_link
"Edit"
end
end
...
...
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