State renamed to merge_status

Andrew8xx8
1 parent 26d4574a
Showing 5 changed files with 19 additions and 14 deletions Show diff stats
app/controllers/merge_requests_controller.rb
app/models/merge_request.rb
app/views/merge_requests/_show.html.haml
db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb
spec/models/merge_request_spec.rb
@@ -73,9 +73,9 @@ class MergeRequestsController &lt; ProjectResourceController
     if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
-    render json: {state: @merge_request.human_state}
+    render json: {merge_status: @merge_request.human_merge_status}
   rescue Gitlab::SatelliteNotExistError
-    render json: {state: :no_satellite}
+    render json: {merge_status: :no_satellite}
   end
  
   def automerge
@@ -15,7 +15,7 @@
 #  st_commits    :text(2147483647)
 #  st_diffs      :text(2147483647)
 #  merged        :boolean          default(FALSE), not null
-#  state         :integer          default(1), not null
+#  merge_status  :integer          default(1), not null
 #  milestone_id  :integer
 #
  
@@ -51,13 +51,13 @@ class MergeRequest &lt; ActiveRecord::Base
     where("milestone_id = :milestone_id", milestone_id: milestone)
   end
  
-  def human_state
-    states = {
+  def human_merge_status
+    merge_statuses = {
       CAN_BE_MERGED =>  "can_be_merged",
       CANNOT_BE_MERGED => "cannot_be_merged",
       UNCHECKED => "unchecked"
     }
-    states[self.state]
+    merge_statuses[self.merge_status]
   end
  
   def validate_branches
@@ -72,20 +72,20 @@ class MergeRequest &lt; ActiveRecord::Base
   end
  
   def unchecked?
-    state == UNCHECKED
+    merge_status == UNCHECKED
   end
  
   def mark_as_unchecked
-    self.state = UNCHECKED
+    self.merge_status = UNCHECKED
     self.save
   end
  
   def can_be_merged?
-    state == CAN_BE_MERGED
+    merge_status == CAN_BE_MERGED
   end
  
   def check_if_can_be_merged
-    self.state = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
+    self.merge_status = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
                    CAN_BE_MERGED
                  else
                    CANNOT_BE_MERGED
@@ -160,7 +160,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
  
   def mark_as_unmergable
-    self.state = CANNOT_BE_MERGED
+    self.merge_status = CANNOT_BE_MERGED
     self.save
   end
  
@@ -29,10 +29,10 @@
   $(function(){
     merge_request = new MergeRequest({
       url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
-      check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
+      check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"},
       url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
       ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
-      current_state: "#{@merge_request.human_state}",
+      current_status: "#{@merge_request.human_merge_status}",
       action: "#{controller.action_name}"
     });
   });
@@ -0,0 +1,5 @@
+class RenameStateToMergeStatusInMilestone < ActiveRecord::Migration
+  def change
+    rename_column :merge_requests, :state, :merge_status
+  end
+end
@@ -15,7 +15,7 @@
 #  st_commits    :text(2147483647)
 #  st_diffs      :text(2147483647)
 #  merged        :boolean          default(FALSE), not null
-#  state         :integer          default(1), not null
+#  merge_status  :integer          default(1), not null
 #  milestone_id  :integer
 #
...	...	@@ -73,9 +73,9 @@ class MergeRequestsController < ProjectResourceController
73	73	if @merge_request.unchecked?
74	74	@merge_request.check_if_can_be_merged
75	75	end
76		- render json: {state: @merge_request.human_state}
	76	+ render json: {merge_status: @merge_request.human_merge_status}
77	77	rescue Gitlab::SatelliteNotExistError
78		- render json: {state: :no_satellite}
	78	+ render json: {merge_status: :no_satellite}
79	79	end
80	80
81	81	def automerge
...	...
...	...	@@ -15,7 +15,7 @@
15	15	# st_commits :text(2147483647)
16	16	# st_diffs :text(2147483647)
17	17	# merged :boolean default(FALSE), not null
18		-# state :integer default(1), not null
	18	+# merge_status :integer default(1), not null
19	19	# milestone_id :integer
20	20	#
21	21
...	...	@@ -51,13 +51,13 @@ class MergeRequest < ActiveRecord::Base
51	51	where("milestone_id = :milestone_id", milestone_id: milestone)
52	52	end
53	53
54		- def human_state
55		- states = {
	54	+ def human_merge_status
	55	+ merge_statuses = {
56	56	CAN_BE_MERGED => "can_be_merged",
57	57	CANNOT_BE_MERGED => "cannot_be_merged",
58	58	UNCHECKED => "unchecked"
59	59	}
60		- states[self.state]
	60	+ merge_statuses[self.merge_status]
61	61	end
62	62
63	63	def validate_branches
...	...	@@ -72,20 +72,20 @@ class MergeRequest < ActiveRecord::Base
72	72	end
73	73
74	74	def unchecked?
75		- state == UNCHECKED
	75	+ merge_status == UNCHECKED
76	76	end
77	77
78	78	def mark_as_unchecked
79		- self.state = UNCHECKED
	79	+ self.merge_status = UNCHECKED
80	80	self.save
81	81	end
82	82
83	83	def can_be_merged?
84		- state == CAN_BE_MERGED
	84	+ merge_status == CAN_BE_MERGED
85	85	end
86	86
87	87	def check_if_can_be_merged
88		- self.state = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
	88	+ self.merge_status = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
89	89	CAN_BE_MERGED
90	90	else
91	91	CANNOT_BE_MERGED
...	...	@@ -160,7 +160,7 @@ class MergeRequest < ActiveRecord::Base
160	160	end
161	161
162	162	def mark_as_unmergable
163		- self.state = CANNOT_BE_MERGED
	163	+ self.merge_status = CANNOT_BE_MERGED
164	164	self.save
165	165	end
166	166
...	...
...	...	@@ -29,10 +29,10 @@
29	29	$(function(){
30	30	merge_request = new MergeRequest({
31	31	url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
32		- check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
	32	+ check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"},
33	33	url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
34	34	ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
35		- current_state: "#{@merge_request.human_state}",
	35	+ current_status: "#{@merge_request.human_merge_status}",
36	36	action: "#{controller.action_name}"
37	37	});
38	38	});
...	...
...	...	@@ -0,0 +1,5 @@
	1	+class RenameStateToMergeStatusInMilestone < ActiveRecord::Migration
	2	+ def change
	3	+ rename_column :merge_requests, :state, :merge_status
	4	+ end
	5	+end
...	...