BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7e42084f
Unverified
Commit
7e42084f
authored
Feb 18, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move author/date info for Issue#show, MR#show pages to issue-box
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a718a9af
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
25 deletions
+31
-25
issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+7
-0
_issue_context.html.haml
app/views/projects/issues/_issue_context.html.haml
+9
-10
show.html.haml
app/views/projects/issues/show.html.haml
+3
-3
_context.html.haml
app/views/projects/merge_requests/show/_context.html.haml
+9
-10
_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+3
-0
_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+0
-2
No files found.
app/assets/stylesheets/generic/issue_box.scss
View file @
7e42084f
...
...
@@ -17,6 +17,13 @@
margin-bottom
:
0
;
}
.creator
{
padding
:
8px
25px
;
background
:
#eee
;
border-bottom
:
1px
solid
#DDD
;
color
:
#777
;
}
.title
{
font-size
:
22px
;
font-weight
:
500
;
...
...
app/views/projects/issues/_issue_context.html.haml
View file @
7e42084f
=
form_for
[
@project
,
@issue
],
remote:
true
,
html:
{
class:
'edit-issue inline-update'
}
do
|
f
|
Created by
#{
link_to_member
(
@project
,
issue
.
author
)
}
-
if
issue
.
assignee
\ and currently assigned to
%strong
.append-right-10
Assignee:
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
=
project_users_select_tag
(
'issue[assignee_id]'
,
placeholder:
'Select assignee'
,
class:
'custom-form-control'
,
selected:
@issue
.
assignee_id
)
-
elsif
issue
.
assignee
=
link_to_member
(
@project
,
@issue
.
assignee
)
-
else
None
.pull-right.hidden-sm.hidden-xs
-
if
issue
.
milestone
-
milestone
=
issue
.
milestone
%cite
.cgray
Attached to milestone
.pull-right
%strong
.append-right-10
Milestone:
-
if
can?
(
current_user
,
:modify_issue
,
@issue
)
=
f
.
select
(
:milestone_id
,
milestone_options
(
@issue
),
{
include_blank:
"Select milestone (none):"
},
{
class:
'select2 select2-compact'
})
=
hidden_field_tag
:issue_context
=
f
.
submit
class:
'btn'
-
elsif
issue
.
milestone
=
link_to
issue
.
milestone
.
title
,
project_milestone_path
-
else
None
app/views/projects/issues/show.html.haml
View file @
7e42084f
%h3
.page-title
Issue ##{@issue.iid}
%small
created
#{
time_ago_with_tooltip
(
@issue
.
created_at
)
}
-
if
@issue
.
closed?
%span
.state-label.state-label-red
Closed
-
else
...
...
@@ -38,6 +35,9 @@
=
@issue
.
milestone
.
title
.issue-box
.creator
Created by
#{
link_to_member
(
@project
,
@issue
.
author
)
}
#{
time_ago_with_tooltip
(
@issue
.
created_at
)
}
%h4
.title
=
gfm
escape_once
(
@issue
.
title
)
...
...
app/views/projects/merge_requests/show/_context.html.haml
View file @
7e42084f
=
form_for
[
@project
,
@merge_request
],
remote:
true
,
html:
{
class:
'edit-merge_request inline-update'
}
do
|
f
|
Created by
#{
link_to_member
(
@project
,
merge_request
.
author
)
}
-
if
merge_request
.
assignee
\ and currently assigned to
%strong
.append-right-10
Assignee:
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
project_users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select assignee'
,
class:
'custom-form-control'
,
selected:
@merge_request
.
assignee_id
)
-
elsif
merge_request
.
assignee
=
link_to_member
(
@project
,
@merge_request
.
assignee
)
-
else
None
.pull-right.hidden-sm.hidden-xs
-
if
merge_request
.
milestone
-
milestone
=
merge_request
.
milestone
%cite
.cgray
Attached to milestone
.pull-right
%strong
.append-right-10
Milestone:
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone (none):"
},
{
class:
'select2 select2-compact'
})
=
hidden_field_tag
:merge_request_context
=
f
.
submit
class:
'btn'
-
elsif
merge_request
.
milestone
=
link_to
merge_request
.
milestone
.
title
,
project_milestone_path
-
else
None
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
7e42084f
.issue-box
.creator
Created by
#{
link_to_member
(
@project
,
@merge_request
.
author
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
created_at
)
}
%h4
.title
=
gfm
escape_once
(
@merge_request
.
title
)
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
7e42084f
%h3
.page-title
=
"Merge Request #
#{
@merge_request
.
iid
}
"
%small
created
#{
time_ago_with_tooltip
(
@merge_request
.
created_at
)
}
-
if
@merge_request
.
merged?
%span
.state-label.state-label-green
...
...
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