deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

human_merge_status replaced by human_merge_status_name

Browse source
This commit is contained in:
Andrew8xx8 2013-02-20 17:45:29 +04:00
parent 52e0df5c23
commit 6d68923edc
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/merge_request.rb
View file

@ -85,11 +85,6 @@ class MergeRequest < ActiveRecord::Base
scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
scope :by_milestone, ->(milestone) { where("milestone_id = :milestone_id", milestone_id: milestone) }
# DEPRECATED: Please use human_merge_status_name instead
def human_merge_status
human_merge_status_name
end
def validate_branches
if target_branch == source_branch
errors.add :base, "You can not use same branch for source and target branches"