From 5f72aaa303aabdb2258959e84b446074bf8a6915 Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Thu, 24 Aug 2017 19:31:20 +0300
Subject: [PATCH] replace `is_legacy_group_milestone?` with
 `legacy_group_milestone?`

---
 app/controllers/groups/milestones_controller.rb  | 6 +++---
 app/helpers/milestones_helper.rb                 | 2 +-
 app/models/concerns/milestoneish.rb              | 2 +-
 app/models/group_milestone.rb                    | 2 +-
 app/views/groups/milestones/show.html.haml       | 2 +-
 app/views/shared/milestones/_milestone.html.haml | 2 +-
 app/views/shared/milestones/_top.html.haml       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 5c10d7bc261..7a7bcb1a3d2 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -35,13 +35,13 @@ class Groups::MilestonesController < Groups::ApplicationController
   end
 
   def edit
-    render_404 if @milestone.is_legacy_group_milestone?
+    render_404 if @milestone.legacy_group_milestone?
   end
 
   def update
     # Keep this compatible with legacy group milestones where we have to update
     # all projects milestones states at once.
-    if @milestone.is_legacy_group_milestone?
+    if @milestone.legacy_group_milestone?
       update_params = milestone_params.select { |key| key == "state_event" }
       milestones = @milestone.milestones
     else
@@ -67,7 +67,7 @@ class Groups::MilestonesController < Groups::ApplicationController
   end
 
   def milestone_path
-    if @milestone.is_legacy_group_milestone?
+    if @milestone.legacy_group_milestone?
       group_milestone_path(group, @milestone.safe_title, title: @milestone.title)
     else
       group_milestone_path(group, @milestone.iid)
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 86666022a2a..446a59030a6 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -164,7 +164,7 @@ module MilestonesHelper
   def group_milestone_route(milestone, params = {})
     params = nil if params.empty?
 
-    if milestone.is_legacy_group_milestone?
+    if milestone.legacy_group_milestone?
       group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: params)
     else
       group_milestone_path(@group, milestone.iid, milestone: params)
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb
index f0998465822..dad92413950 100644
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
@@ -78,7 +78,7 @@ module Milestoneish
     false
   end
 
-  def is_legacy_group_milestone?
+  def legacy_group_milestone?
     false
   end
 
diff --git a/app/models/group_milestone.rb b/app/models/group_milestone.rb
index 65249bd7bfc..98135ee3c8b 100644
--- a/app/models/group_milestone.rb
+++ b/app/models/group_milestone.rb
@@ -17,7 +17,7 @@ class GroupMilestone < GlobalMilestone
     { group_id: group.id }
   end
 
-  def is_legacy_group_milestone?
+  def legacy_group_milestone?
     true
   end
 end
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 54b1b7a734a..23b1a22240f 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -1,4 +1,4 @@
 = render "header_title"
 = render 'shared/milestones/top', milestone: @milestone, group: @group
-= render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true if @milestone.is_legacy_group_milestone?
+= render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true if @milestone.legacy_group_milestone?
 = render 'shared/milestones/sidebar', milestone: @milestone, affix_offset: 102
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 6a85f7d0564..168c7f911d4 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -21,7 +21,7 @@
   - if milestone.is_a?(GlobalMilestone) || milestone.is_group_milestone?
     .row
       .col-sm-6
-        - if milestone.is_legacy_group_milestone?
+        - if milestone.legacy_group_milestone?
           .expiration= render('shared/milestone_expired', milestone: milestone)
           .projects
             - milestone.milestones.each do |milestone|
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 3014300fbe7..2a7b8dbb12a 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -44,7 +44,7 @@
     - close_msg = group ? 'You may close the milestone now.' : 'Navigate to the project to close the milestone.'
     %span All issues for this milestone are closed. #{close_msg}
 
-- if @milestone.is_legacy_group_milestone? || @milestone.is_dashboard_milestone?
+- if @milestone.legacy_group_milestone? || @milestone.is_dashboard_milestone?
   .table-holder
     %table.table
       %thead
-- 
GitLab