Download as
Browse Code »

Commit 8db3920c01dfa4cf6c83afd67418bab8cb785bac

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

State renamed to merge_status

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