Download as
Browse Code »

Commit ff94f29be5330ebaad3efe9e541360deff2b0d70

Authored by Andrew8xx8
1 parent 231d9e04
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

States events fixed

Showing 7 changed files with 17 additions and 16 deletions   Show diff stats
app/views/issues/_show.html.haml
  Diff comments   View file @ff94f29
@@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
9 = issue.notes.count 9 = issue.notes.count
10 - if can? current_user, :modify_issue, issue 10 - if can? current_user, :modify_issue, issue
11 - if issue.closed? 11 - if issue.closed?
12 - = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state: :reopened }, status_only: true), method: :put, class: "btn btn-small grouped reopen_issue", remote: true 12 + = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-small grouped reopen_issue", remote: true
13 - else 13 - else
14 - = link_to 'Close', project_issue_path(issue.project, issue, issue: {state: :closed }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true 14 + = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
15 = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do 15 = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
16 %i.icon-edit 16 %i.icon-edit
17 Edit 17 Edit
app/views/issues/show.html.haml
  Diff comments   View file @ff94f29
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
8 %span.pull-right 8 %span.pull-right
9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 9 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
10 - if @issue.closed? 10 - if @issue.closed?
11 - = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state: :reopened }, status_only: true), method: :put, class: "btn grouped reopen_issue" 11 + = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped reopen_issue"
12 - else 12 - else
13 - = link_to 'Close', project_issue_path(@project, @issue, issue: {state: :closed }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue" 13 + = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
14 - if can?(current_user, :admin_project, @project) || @issue.author == current_user 14 - if can?(current_user, :admin_project, @project) || @issue.author == current_user
15 = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do 15 = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
16 %i.icon-edit 16 %i.icon-edit
app/views/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @ff94f29
@@ -23,12 +23,12 @@ @@ -23,12 +23,12 @@
23 23
24 - if @merge_request.closed? 24 - if @merge_request.closed?
25 .ui-box-bottom 25 .ui-box-bottom
26 - - if @merge_request.merged?  
27 - %span  
28 - Merged by #{link_to_member(@project, @merge_request.merge_event.author)}  
29 - %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.  
30 - - elsif @merge_request.closed_event  
31 - %span  
32 - Closed by #{link_to_member(@project, @merge_request.closed_event.author)}  
33 - %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. 26 + %span
  27 + Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
  28 + %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
  29 + - if @merge_request.merged?
  30 + .ui-box-bottom
  31 + %span
  32 + Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
  33 + %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
34 34
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @ff94f29
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch) 17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff) 18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
19 19
20 - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request" 20 + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
  21 + = p project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close })
21 22
22 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do 23 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
23 %i.icon-edit 24 %i.icon-edit
app/views/milestones/_milestone.html.haml
  Diff comments   View file @ff94f29
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 Edit 6 Edit
7 %h4 7 %h4
8 = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone) 8 = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone)
9 - - if milestone.expired? and not milestone.closed 9 + - if milestone.expired? and not milestone.closed?
10 %span.cred (Expired) 10 %span.cred (Expired)
11 %small 11 %small
12 = milestone.expires_at 12 = milestone.expires_at
app/views/milestones/show.html.haml
  Diff comments   View file @ff94f29
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 %hr 25 %hr
26 %p 26 %p
27 %span All issues for this milestone are closed. You may close milestone now. 27 %span All issues for this milestone are closed. You may close milestone now.
28 - = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state: :closed }), method: :put, class: "btn btn-small btn-remove" 28 + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-small btn-remove"
29 29
30 .ui-box.ui-box-show 30 .ui-box.ui-box-show
31 .ui-box-head 31 .ui-box-head
features/steps/project/project_merge_requests.rb
  Diff comments   View file @ff94f29
@@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps @@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
64 64
65 And 'project "Shop" have "Bug NS-04" open merge request' do 65 And 'project "Shop" have "Bug NS-04" open merge request' do
66 project = Project.find_by_name("Shop") 66 project = Project.find_by_name("Shop")
67 - create(:closed_merge_request, 67 + create(:merge_request,
68 title: "Bug NS-04", 68 title: "Bug NS-04",
69 project: project, 69 project: project,
70 author: project.users.first) 70 author: project.users.first)