Skip to content
Snippets Groups Projects
Commit fa8219e0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

better MR list, dashboard pollished

parent 81da8e46
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -20,8 +20,8 @@
.row
.dashboard_block
.row
.span4
%div.prettyprint.ipadded
.span4.right
%div.borders.ipadded
%h1
= pluralize current_user.projects.count, "project", "projects"
- if current_user.can_create_project?
Loading
Loading
@@ -34,9 +34,9 @@
%br
= link_to new_project_path, :class => "btn" do
New Project »
.span10.right= render "dashboard/projects_feed", :projects => @active_projects
.span10.left= render "dashboard/projects_feed", :projects => @active_projects
- if @last_push
.ui-box.padded.prepend-top-20
.padded.prepend-top-20
%h5
%small Latest push was to the #{@last_push.branch_name} branch of #{@last_push.project.name}:
%ul.unstyled= render @last_push
Loading
Loading
%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"
%span.update-author
%strong= merge_request.author_name
authored
= time_ago_in_words(merge_request.created_at)
ago
- if merge_request.notes.any?
%span.pretty_label= pluralize merge_request.notes.count, 'note'
- if merge_request.upvotes > 0
%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
%p.row_title= truncate(merge_request.title, :length => 100)
%p.row_title= truncate(merge_request.title, :length => 80)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment