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
fa8219e0
Commit
fa8219e0
authored
Mar 22, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better MR list, dashboard pollished
parent
81da8e46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+4
-4
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+9
-7
No files found.
app/views/dashboard/index.html.haml
View file @
fa8219e0
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
.row
.row
.dashboard_block
.dashboard_block
.row
.row
.span4
.span4
.right
%div
.
prettyprint
.ipadded
%div
.
borders
.ipadded
%h1
%h1
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
-
if
current_user
.
can_create_project?
-
if
current_user
.
can_create_project?
...
@@ -34,9 +34,9 @@
...
@@ -34,9 +34,9 @@
%br
%br
=
link_to
new_project_path
,
:class
=>
"btn"
do
=
link_to
new_project_path
,
:class
=>
"btn"
do
New Project »
New Project »
.span10.
righ
t
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
.span10.
lef
t
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
-
if
@last_push
-
if
@last_push
.
ui-box.
padded.prepend-top-20
.padded.prepend-top-20
%h5
%h5
%small
Latest push was to the
#{
@last_push
.
branch_name
}
branch of
#{
@last_push
.
project
.
name
}
:
%small
Latest push was to the
#{
@last_push
.
branch_name
}
branch of
#{
@last_push
.
project
.
name
}
:
%ul
.unstyled
=
render
@last_push
%ul
.unstyled
=
render
@last_push
...
...
app/views/merge_requests/_merge_request.html.haml
View file @
fa8219e0
%li
.wll
%li
.wll
.right
.left
-
if
merge_request
.
notes
.
any?
%span
.btn.small.disabled.padded
=
pluralize
merge_request
.
notes
.
count
,
'note'
%span
.btn.small.disabled.padded
=
merge_request
.
source_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"
%span
.update-author
%span
.update-author
%strong
=
merge_request
.
author_name
%strong
=
merge_request
.
author_name
authored
authored
=
time_ago_in_words
(
merge_request
.
created_at
)
=
time_ago_in_words
(
merge_request
.
created_at
)
ago
ago
-
if
merge_request
.
notes
.
any?
%span
.pretty_label
=
pluralize
merge_request
.
notes
.
count
,
'note'
-
if
merge_request
.
upvotes
>
0
-
if
merge_request
.
upvotes
>
0
%span
.label.success
=
"+
#{
merge_request
.
upvotes
}
"
%span
.label.success
=
"+
#{
merge_request
.
upvotes
}
"
.right
%span
.label
=
merge_request
.
source_branch
→
%span
.label
=
merge_request
.
target_branch
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
10
0
)
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
8
0
)
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