summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorMaxim Rydkin <maks.rydkin@gmail.com>2017-08-24 19:41:44 +0300
committerMaxim Rydkin <maks.rydkin@gmail.com>2017-08-29 11:14:41 +0300
commitfab7fdcf2f8b040c345d1cb0b05acd053c9af963 (patch)
treefee121a044e9032b918686b71246ba55875e8050 /app/models
parentac3e5a58549c3f88659cedb47df68e5e719d68f1 (diff)
downloadgitlab-ce-fab7fdcf2f8b040c345d1cb0b05acd053c9af963.tar.gz
replace `is_group_milestone?` with `group_milestone?`
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/milestoneish.rb2
-rw-r--r--app/models/milestone.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index 6c6ceaa35c7..c4b79d51fe7 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -70,7 +70,7 @@ module Milestoneish
due_date && due_date.past?
end
- def is_group_milestone?
+ def group_milestone?
false
end
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index dd1f3824a98..a3070a12b7c 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -163,7 +163,7 @@ class Milestone < ActiveRecord::Base
# Milestone.first.to_reference(same_namespace_project) # => "gitlab-ce%1"
#
def to_reference(from_project = nil, format: :iid, full: false)
- return if is_group_milestone? && format != :name
+ return if group_milestone? && format != :name
format_reference = milestone_format_reference(format)
reference = "#{self.class.reference_prefix}#{format_reference}"
@@ -207,7 +207,7 @@ class Milestone < ActiveRecord::Base
group || project
end
- def is_group_milestone?
+ def group_milestone?
group_id.present?
end