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
80f2ef2d
Commit
80f2ef2d
authored
Jul 17, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MR index pollished
parent
2a705c4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+1
-1
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+12
-0
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+6
-4
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
80f2ef2d
...
@@ -429,7 +429,7 @@ form {
...
@@ -429,7 +429,7 @@ form {
*/
*/
.ui-box
{
.ui-box
{
background
:
#F9F9F9
;
background
:
#F9F9F9
;
margin-bottom
:
40
px
;
margin-bottom
:
25
px
;
@include
round-borders-all
(
4px
);
@include
round-borders-all
(
4px
);
border-color
:
#CCC
;
border-color
:
#CCC
;
...
...
app/assets/stylesheets/sections/merge_requests.scss
View file @
80f2ef2d
...
@@ -82,3 +82,15 @@
...
@@ -82,3 +82,15 @@
}
}
}
}
}
}
li
.merge_request
{
padding
:
7px
10px
;
img
.avatar
{
width
:
32px
;
margin-top
:
4px
;
}
p
{
padding
:
0px
;
padding-bottom
:
2px
;
}
}
app/views/merge_requests/_merge_request.html.haml
View file @
80f2ef2d
...
@@ -15,12 +15,14 @@
...
@@ -15,12 +15,14 @@
→
→
=
merge_request
.
target_branch
=
merge_request
.
target_branch
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
merge_request
.
author_email
),
:class
=>
"avatar"
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
80
)
%span
.update-author
%span
.update-author
%s
trong
=
merge_request
.
author_name
%s
mall
.cdark
=
"#
#{
merge_request
.
id
}
"
authored
authored
by
#{
merge_request
.
author_name
}
=
time_ago_in_words
(
merge_request
.
created_at
)
=
time_ago_in_words
(
merge_request
.
created_at
)
ago
ago
-
if
merge_request
.
upvotes
>
0
-
if
merge_request
.
upvotes
>
0
%span
.badge.badge-success
=
"+
#{
merge_request
.
upvotes
}
"
%span
.badge.badge-success
=
"+
#{
merge_request
.
upvotes
}
"
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
80
)
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