Merge branch 'feature/reopen_mr' into 'master'

Feature: reopen closed merge request

Merge branch 'feature/reopen_mr' into 'master'
Feature: reopen closed merge request
Dmitriy Zaporozhets
2 parents 03920b96 fe8552ef
Showing 11 changed files with 39 additions and 15 deletions Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
app/controllers/projects/merge_requests_controller.rb
app/models/concerns/issuable.rb
app/models/issue.rb
app/models/merge_request.rb
app/observers/merge_request_observer.rb
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
features/project/merge_requests.feature
features/steps/project/project_merge_requests.rb
@@ -91,6 +91,7 @@
 }
  
 // hide mr close link for inline diff comment form
-.diff-file .close-mr-link {
- display: none;
+.diff-file .close-mr-link,
+.diff-file .reopen-mr-link {
+  display: none;
 }
@@ -135,7 +135,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
   def automerge
     return access_denied! unless allowed_to_merge?
  
-    if @merge_request.opened? && @merge_request.can_be_merged?
+    if @merge_request.open? && @merge_request.can_be_merged?
       @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
       @merge_request.automerge!(current_user, params[:merge_commit_message])
       @status = true
@@ -230,7 +230,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
  
     @merge_request_diff = @merge_request.merge_request_diff
     @allowed_to_merge = allowed_to_merge?
-    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
+    @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
   end
  
   def allowed_to_merge?
@@ -23,7 +23,8 @@ module Issuable
     scope :assigned, -> { where("assignee_id IS NOT NULL") }
     scope :unassigned, -> { where("assignee_id IS NULL") }
     scope :of_projects, ->(ids) { where(project_id: ids) }
-
+    scope :opened, -> { with_state(:opened, :reopened) }
+    scope :closed, -> { with_state(:closed) }
  
     delegate :name,
              :email,
@@ -28,8 +28,6 @@ class Issue &lt; ActiveRecord::Base
  
   scope :of_group, ->(group) { where(project_id: group.project_ids) }
   scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
-  scope :opened, -> { with_state(:opened, :reopened) }
-  scope :closed, -> { with_state(:closed) }
  
   attr_accessible :title, :assignee_id, :position, :description,
                   :milestone_id, :label_list, :author_id_of_changes,
@@ -50,9 +48,7 @@ class Issue &lt; ActiveRecord::Base
     end
  
     state :opened
-
     state :reopened
-
     state :closed
   end
  
@@ -100,8 +100,6 @@ class MergeRequest &lt; ActiveRecord::Base
  
   scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
   scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
-  scope :opened, -> { with_state(:opened) }
-  scope :closed, -> { with_state(:closed) }
   scope :merged, -> { with_state(:merged) }
   scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
   scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
@@ -160,6 +158,10 @@ class MergeRequest &lt; ActiveRecord::Base
     MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
   end
  
+  def open?
+    opened? || reopened?
+  end
+
   def mr_and_commit_notes
     # Fetch comments only from last 100 commits
     commits_for_notes_limit = 100
@@ -22,6 +22,8 @@ class MergeRequestObserver &lt; ActivityObserver
     create_event(merge_request, Event::REOPENED)
     create_note(merge_request)
     execute_hooks(merge_request)
+    merge_request.reload_code
+    merge_request.mark_as_unchecked
   end
  
   def after_update(merge_request)
@@ -2,7 +2,7 @@
   = render "projects/merge_requests/show/mr_title"
   = render "projects/merge_requests/show/how_to_merge"
   = render "projects/merge_requests/show/mr_box"
-  - if @merge_request.opened?
+  - if @merge_request.open?
     - if @merge_request.source_branch_exists? && @merge_request.target_branch_exists?
       = render "projects/merge_requests/show/mr_accept"
     - else
@@ -26,7 +26,8 @@
     - if can?(current_user, :modify_merge_request, @merge_request)
       - unless @merge_request.closed? || @merge_request.merged?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link", title: "Close merge request"
-
+      - if @merge_request.closed?
+        = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
  
   .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
     = render "projects/notes/notes_with_form"
@@ -36,7 +36,7 @@
       %i.icon-ok
       Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
       #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
-- if !@closes_issues.empty? && @merge_request.opened?
+- if !@closes_issues.empty? && @merge_request.open?
   .alert.alert-info.alert-info
     %span
       %i.icon-ok
@@ -3,7 +3,7 @@
  
   %span.pull-right
     - if can?(current_user, :modify_merge_request, @merge_request)
-      - if @merge_request.opened?
+      - if @merge_request.open?
         .btn-group.pull-left
           %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
             %i.icon-download-alt
@@ -18,6 +18,8 @@
         = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
           %i.icon-edit
           Edit
+      - if @merge_request.closed?
+        = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
  
 .votes-holder.hidden-sm.hidden-xs
   #votes= render 'votes/votes_block', votable: @merge_request
@@ -29,6 +29,13 @@ Feature: Project Merge Requests
     And I click link "Close"
     Then I should see closed merge request "Bug NS-04"
  
+  Scenario: I reopen merge request page
+    Given I click link "Bug NS-04"
+    And I click link "Close"
+    Then I should see closed merge request "Bug NS-04"
+    When I click link "Reopen"
+    Then I should see reopened merge request "Bug NS-04"
+
   Scenario: I submit new unassigned merge request
     Given I click link "New Merge Request"
     And I submit new merge request "Wiki Feature"
@@ -170,6 +170,18 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
     end
   end
  
+  step 'I click link "Reopen"' do
+    within '.page-title' do
+      click_link "Reopen"
+    end
+  end
+
+  step 'I should see reopened merge request "Bug NS-04"' do
+    within '.state-label' do
+      page.should have_content "Open"
+    end
+  end
+
   def project
     @project ||= Project.find_by!(name: "Shop")
   end
...	...	@@ -91,6 +91,7 @@
91	91	}
92	92
93	93	// hide mr close link for inline diff comment form
94		-.diff-file .close-mr-link {
95		- display: none;
	94	+.diff-file .close-mr-link,
	95	+.diff-file .reopen-mr-link {
	96	+ display: none;
96	97	}
...	...
...	...	@@ -135,7 +135,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
135	135	def automerge
136	136	return access_denied! unless allowed_to_merge?
137	137
138		- if @merge_request.opened? && @merge_request.can_be_merged?
	138	+ if @merge_request.open? && @merge_request.can_be_merged?
139	139	@merge_request.should_remove_source_branch = params[:should_remove_source_branch]
140	140	@merge_request.automerge!(current_user, params[:merge_commit_message])
141	141	@status = true
...	...	@@ -230,7 +230,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
230	230
231	231	@merge_request_diff = @merge_request.merge_request_diff
232	232	@allowed_to_merge = allowed_to_merge?
233		- @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
	233	+ @show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
234	234	end
235	235
236	236	def allowed_to_merge?
...	...
...	...	@@ -23,7 +23,8 @@ module Issuable
23	23	scope :assigned, -> { where("assignee_id IS NOT NULL") }
24	24	scope :unassigned, -> { where("assignee_id IS NULL") }
25	25	scope :of_projects, ->(ids) { where(project_id: ids) }
26		-
	26	+ scope :opened, -> { with_state(:opened, :reopened) }
	27	+ scope :closed, -> { with_state(:closed) }
27	28
28	29	delegate :name,
29	30	:email,
...	...
...	...	@@ -28,8 +28,6 @@ class Issue < ActiveRecord::Base
28	28
29	29	scope :of_group, ->(group) { where(project_id: group.project_ids) }
30	30	scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
31		- scope :opened, -> { with_state(:opened, :reopened) }
32		- scope :closed, -> { with_state(:closed) }
33	31
34	32	attr_accessible :title, :assignee_id, :position, :description,
35	33	:milestone_id, :label_list, :author_id_of_changes,
...	...	@@ -50,9 +48,7 @@ class Issue < ActiveRecord::Base
50	48	end
51	49
52	50	state :opened
53		-
54	51	state :reopened
55		-
56	52	state :closed
57	53	end
58	54
...	...
...	...	@@ -100,8 +100,6 @@ class MergeRequest < ActiveRecord::Base
100	100
101	101	scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
102	102	scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
103		- scope :opened, -> { with_state(:opened) }
104		- scope :closed, -> { with_state(:closed) }
105	103	scope :merged, -> { with_state(:merged) }
106	104	scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
107	105	scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
...	...	@@ -160,6 +158,10 @@ class MergeRequest < ActiveRecord::Base
160	158	MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
161	159	end
162	160
	161	+ def open?
	162	+ opened? \|\| reopened?
	163	+ end
	164	+
163	165	def mr_and_commit_notes
164	166	# Fetch comments only from last 100 commits
165	167	commits_for_notes_limit = 100
...	...
...	...	@@ -22,6 +22,8 @@ class MergeRequestObserver < ActivityObserver
22	22	create_event(merge_request, Event::REOPENED)
23	23	create_note(merge_request)
24	24	execute_hooks(merge_request)
	25	+ merge_request.reload_code
	26	+ merge_request.mark_as_unchecked
25	27	end
26	28
27	29	def after_update(merge_request)
...	...
...	...	@@ -2,7 +2,7 @@
2	2	= render "projects/merge_requests/show/mr_title"
3	3	= render "projects/merge_requests/show/how_to_merge"
4	4	= render "projects/merge_requests/show/mr_box"
5		- - if @merge_request.opened?
	5	+ - if @merge_request.open?
6	6	- if @merge_request.source_branch_exists? && @merge_request.target_branch_exists?
7	7	= render "projects/merge_requests/show/mr_accept"
8	8	- else
...	...	@@ -26,7 +26,8 @@
26	26	- if can?(current_user, :modify_merge_request, @merge_request)
27	27	- unless @merge_request.closed? \|\| @merge_request.merged?
28	28	= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link", title: "Close merge request"
29		-
	29	+ - if @merge_request.closed?
	30	+ = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
30	31
31	32	.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
32	33	= render "projects/notes/notes_with_form"
...	...
...	...	@@ -36,7 +36,7 @@
36	36	%i.icon-ok
37	37	Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
38	38	#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
39		-- if !@closes_issues.empty? && @merge_request.opened?
	39	+- if !@closes_issues.empty? && @merge_request.open?
40	40	.alert.alert-info.alert-info
41	41	%span
42	42	%i.icon-ok
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	%span.pull-right
5	5	- if can?(current_user, :modify_merge_request, @merge_request)
6		- - if @merge_request.opened?
	6	+ - if @merge_request.open?
7	7	.btn-group.pull-left
8	8	%a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
9	9	%i.icon-download-alt
...	...	@@ -18,6 +18,8 @@
18	18	= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-grouped", id:"edit_merge_request" do
19	19	%i.icon-edit
20	20	Edit
	21	+ - if @merge_request.closed?
	22	+ = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
21	23
22	24	.votes-holder.hidden-sm.hidden-xs
23	25	#votes= render 'votes/votes_block', votable: @merge_request
...	...
...	...	@@ -29,6 +29,13 @@ Feature: Project Merge Requests
29	29	And I click link "Close"
30	30	Then I should see closed merge request "Bug NS-04"
31	31
	32	+ Scenario: I reopen merge request page
	33	+ Given I click link "Bug NS-04"
	34	+ And I click link "Close"
	35	+ Then I should see closed merge request "Bug NS-04"
	36	+ When I click link "Reopen"
	37	+ Then I should see reopened merge request "Bug NS-04"
	38	+
32	39	Scenario: I submit new unassigned merge request
33	40	Given I click link "New Merge Request"
34	41	And I submit new merge request "Wiki Feature"
...	...