@@ -131,7 +131,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -131,7 +131,6 @@ class MergeRequest < ActiveRecord::Base
validate:validate_branches
validate:validate_branches
validate:validate_fork
validate:validate_fork
scope:of_group,->(group){where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)",group_project_ids: group.projects.select(:id).reorder(nil))}
scope:by_branch,->(branch_name){where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)",branch: branch_name)}
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)}
scope:cared,->(user){where('assignee_id = :user OR author_id = :user',user: user.id)}