Commit 6d68923edceb23ae6a5281e022a351a0d9c0d59b
1 parent
52e0df5c
Exists in
master
and in
4 other branches
human_merge_status replaced by human_merge_status_name
Showing
3 changed files
with
2 additions
and
7 deletions
Show diff stats
app/controllers/merge_requests_controller.rb
| @@ -73,7 +73,7 @@ class MergeRequestsController < ProjectResourceController | @@ -73,7 +73,7 @@ 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: {merge_status: @merge_request.human_merge_status} | 76 | + render json: {merge_status: @merge_request.human_merge_status_name} |
| 77 | rescue Gitlab::SatelliteNotExistError | 77 | rescue Gitlab::SatelliteNotExistError |
| 78 | render json: {merge_status: :no_satellite} | 78 | render json: {merge_status: :no_satellite} |
| 79 | end | 79 | end |
app/models/merge_request.rb
| @@ -85,11 +85,6 @@ class MergeRequest < ActiveRecord::Base | @@ -85,11 +85,6 @@ class MergeRequest < ActiveRecord::Base | ||
| 85 | scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) } | 85 | scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) } |
| 86 | scope :by_milestone, ->(milestone) { where("milestone_id = :milestone_id", milestone_id: milestone) } | 86 | scope :by_milestone, ->(milestone) { where("milestone_id = :milestone_id", milestone_id: milestone) } |
| 87 | 87 | ||
| 88 | - # DEPRECATED: Please use human_merge_status_name instead | ||
| 89 | - def human_merge_status | ||
| 90 | - human_merge_status_name | ||
| 91 | - end | ||
| 92 | - | ||
| 93 | def validate_branches | 88 | def validate_branches |
| 94 | if target_branch == source_branch | 89 | if target_branch == source_branch |
| 95 | errors.add :base, "You can not use same branch for source and target branches" | 90 | errors.add :base, "You can not use same branch for source and target branches" |
app/views/merge_requests/_show.html.haml
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | check_enable: #{@merge_request.unchecked? ? "true" : "false"}, | 32 | check_enable: #{@merge_request.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_status: "#{@merge_request.human_merge_status}", | 35 | + current_status: "#{@merge_request.human_merge_status_name}", |
| 36 | action: "#{controller.action_name}" | 36 | action: "#{controller.action_name}" |
| 37 | }); | 37 | }); |
| 38 | }); | 38 | }); |