Download as
Browse Code »

Commit 6b941cf92ce3accbac5656973d3204becc908f9a

Authored by Dmitriy Zaporozhets
1 parent 6d460aa2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

merge request list

Showing 6 changed files with 58 additions and 32 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @6b941cf
@@ -328,12 +328,16 @@ body.project-page table .commit { @@ -328,12 +328,16 @@ body.project-page table .commit {
328 border:none; 328 border:none;
329 text-shadow:none; 329 text-shadow:none;
330 330
331 - &.high { 331 + &.inline {
  332 + display:inline;
  333 + }
  334 +
  335 + &.high, &.closed {
332 background: #D12F19; 336 background: #D12F19;
333 color:white; 337 color:white;
334 } 338 }
335 339
336 - &.today { 340 + &.today, &.open {
337 background: #44aa22; 341 background: #44aa22;
338 color:white; 342 color:white;
339 } 343 }
@@ -399,6 +403,19 @@ body.project-page .merge-request-commits a.commit span.update-author{color: #999 @@ -399,6 +403,19 @@ body.project-page .merge-request-commits a.commit span.update-author{color: #999
399 body.project-page .merge-request-commits a.commit span.update-author strong{font-weight: bold; font-style: normal;} 403 body.project-page .merge-request-commits a.commit span.update-author strong{font-weight: bold; font-style: normal;}
400 404
401 405
  406 +/** Update entry **/
  407 +.update-data { padding: 0 }
  408 +.update-data { width:100%; }
  409 +.update-data.ui-box .data { padding:0; }
  410 +a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  411 +a.update-item:last-child{border-bottom: 0}
  412 +a.update-item img{float: left; margin-right: 10px;}
  413 +a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
  414 +a.update-item span.update-title{margin-bottom: 10px}
  415 +a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;}
  416 +a.update-item span.update-author strong{font-weight: bold; font-style: normal;}
  417 +
  418 +
402 body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; } 419 body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
403 420
404 body.projects-page input.text.git-url.project_list_url { width:165px; } 421 body.projects-page input.text.git-url.project_list_url { width:165px; }
app/controllers/merge_requests_controller.rb
  Diff comments   View file @6b941cf
@@ -10,7 +10,7 @@ class MergeRequestsController < ApplicationController @@ -10,7 +10,7 @@ class MergeRequestsController < ApplicationController
10 before_filter :authorize_write_project!, :only => [:new, :create, :edit, :update] 10 before_filter :authorize_write_project!, :only => [:new, :create, :edit, :update]
11 11
12 def index 12 def index
13 - @merge_requests = @project.merge_requests.all 13 + @merge_requests = @project.merge_requests
14 end 14 end
15 15
16 def show 16 def show
app/views/issues/show.html.haml
  Diff comments   View file @6b941cf
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 = "Issue ##{@issue.id}" 3 = "Issue ##{@issue.id}"
4 .right 4 .right
5 - if @issue.closed 5 - if @issue.closed
6 - %span.tag.high Resolved 6 + %span.tag.closed Closed
7 - else 7 - else
8 - %span.tag.today Open 8 + %span.tag.open Open
9 9
10 .data 10 .data
11 %p= @issue.title 11 %p= @issue.title
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 - if @issue.closed 28 - if @issue.closed
29 = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button" 29 = link_to 'Reopen', project_issue_path(@project, @issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button"
30 - else 30 - else
31 - = link_to 'Resolve', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" 31 + = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button"
32 .right 32 .right
33 = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "grey-button positive" 33 = link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "grey-button positive"
34 34
app/views/merge_requests/_merge_request.html.haml 0 → 100644
  Diff comments   View file @6b941cf
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +%a.update-item{:href => project_merge_request_path(@project, merge_request)}
  2 + = image_tag gravatar_icon(merge_request.author_email), :class => "left", :width => 40
  3 + %span.update-title
  4 + = merge_request.title
  5 + %span.update-author
  6 + %strong= merge_request.author_name
  7 + authored
  8 + = time_ago_in_words(merge_request.created_at)
  9 + ago
  10 + .right
  11 + %span.tag.commit= merge_request.source_branch
  12 + →
  13 + %span.tag.commit= merge_request.target_branch
  14 +
app/views/merge_requests/index.html.haml
  Diff comments   View file @6b941cf
1 -%table  
2 - %thead  
3 - %th Target branch  
4 - %th Source branch  
5 - %th Author  
6 - %th Assignee  
7 - %th Title  
8 - %th  
9 - %th  
10 - %th 1 +- if @merge_requests.opened.count > 0
  2 + %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
  3 + %h3
  4 + %span.tag.open Open
  5 + .data
  6 + = render @merge_requests.opened
11 7
12 - - @merge_requests.each do |merge_request|  
13 - %tr  
14 - %td= merge_request.target_branch  
15 - %td= merge_request.source_branch  
16 - %td= merge_request.author_id  
17 - %td= merge_request.assignee_id  
18 - %td= merge_request.title  
19 - %td= link_to 'Show', [@project, merge_request]  
20 - %td= link_to 'Edit', edit_project_merge_request_path(@project, merge_request)  
21 - %td= link_to 'Destroy', [@project, merge_request], :confirm => 'Are you sure?', :method => :delete 8 + .clear
  9 + %br
22 10
23 -%br 11 +- if @merge_requests.closed.count > 0
  12 + %div{ :class => "update-data ui-box ui-box-small ui-box-big" }
  13 + %h3
  14 + %span.tag.closed Closed
  15 + .data
  16 + = render @merge_requests.closed
  17 + .clear
  18 + %br
24 19
25 -= link_to 'New Merge request', new_project_merge_request_path(@project) 20 += link_to 'New Merge request', new_project_merge_request_path(@project), :class => "grey-button"
app/views/merge_requests/show.html.haml
  Diff comments   View file @6b941cf
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 %h3 2 %h3
3 = "Merge Request ##{@merge_request.id}:" 3 = "Merge Request ##{@merge_request.id}:"
4   4  
5 - = "'#{@merge_request.source_branch}'" 5 + .tag.commit.inline= @merge_request.source_branch
6 → 6 →
7 - = "'#{@merge_request.target_branch}'" 7 + .tag.commit.inline= @merge_request.target_branch
8 .right 8 .right
9 - if @merge_request.closed 9 - if @merge_request.closed
10 - %span.tag.high Resolved 10 + %span.tag.high Closed
11 - else 11 - else
12 %span.tag.today Open 12 %span.tag.today Open
13 13
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 - if @merge_request.closed 32 - if @merge_request.closed
33 = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button" 33 = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "grey-button"
34 - else 34 - else
35 - = link_to 'Resolve', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button" 35 + = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "grey-button"
36 .right 36 .right
37 = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), :class => "grey-button positive" 37 = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), :class => "grey-button positive"
38 38