Skip to content

G
gitlab-ce
Commit 6339afc7 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/models/milestone.rb

parent ad60cd07
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/milestone.rb
View file @ 6339afc7
...@@ -27,10 +27,7 @@ class Milestone < ActiveRecord::Base ...@@ -27,10 +27,7 @@ class Milestone < ActiveRecord::Base
has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.milestones&.maximum(:iid) } has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.milestones&.maximum(:iid) }
has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.milestones&.maximum(:iid) } has_internal_id :iid, scope: :group, init: ->(s) { s&.group&.milestones&.maximum(:iid) }
<<<<<<< HEAD
has_many :boards has_many :boards
=======
>>>>>>> upstream/master
has_many :issues has_many :issues
has_many :labels, -> { distinct.reorder('labels.title') }, through: :issues has_many :labels, -> { distinct.reorder('labels.title') }, through: :issues
has_many :merge_requests has_many :merge_requests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7