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
Boxiang Sun
gitlab-ce
Commits
f10bd7df
Commit
f10bd7df
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak merge request list item
parent
9517b621
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+6
-6
No files found.
app/views/projects/merge_requests/_merge_request.html.haml
View file @
f10bd7df
...
@@ -33,7 +33,12 @@
...
@@ -33,7 +33,12 @@
\##{merge_request.iid}
·
\##{merge_request.iid}
·
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
-
if
merge_request
.
milestone_id?
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
=
link_to
namespace_project_commits_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
merge_request
.
target_branch
)
do
=
icon
(
'code-fork'
)
=
merge_request
.
target_branch
-
if
merge_request
.
milestone
=
link_to
namespace_project_merge_requests_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
milestone_title:
merge_request
.
milestone
.
title
)
do
=
link_to
namespace_project_merge_requests_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
milestone_title:
merge_request
.
milestone
.
title
)
do
=
icon
(
'clock-o'
)
=
icon
(
'clock-o'
)
...
@@ -42,11 +47,6 @@
...
@@ -42,11 +47,6 @@
-
merge_request
.
labels
.
each
do
|
label
|
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
project:
merge_request
.
project
)
=
link_to_label
(
label
,
project:
merge_request
.
project
)
-
if
merge_request
.
target_project
.
default_branch
!=
merge_request
.
target_branch
=
link_to
namespace_project_commits_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
merge_request
.
target_branch
)
do
=
icon
(
'code-fork'
)
=
merge_request
.
target_branch
-
if
merge_request
.
tasks?
-
if
merge_request
.
tasks?
%span
.task-status
%span
.task-status
...
...
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