Merge branch 'unify-some-app-helpers' into 'master'

Move some EE only helper methods to EE modules

See merge request gitlab-org/gitlab-ee!6275

app/helpers/auth_helper.rb

@@ -4,16 +4,10 @@ module AuthHelper
   PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq).freeze
   LDAP_PROVIDER = /\Aldap/
 
-  delegate :slack_app_id, to: :'Gitlab::CurrentSettings.current_application_settings'
-
   def ldap_enabled?
     Gitlab::Auth::LDAP::Config.enabled?
   end
 
-  def kerberos_enabled?
-    auth_providers.include?(:kerberos)
-  end
-
   def omniauth_enabled?
     Gitlab.config.omniauth.enabled
   end
@@ -80,9 +74,5 @@ module AuthHelper
     %w(saml cas3).exclude?(provider.to_s)
   end
 
-  def slack_redirect_uri(project)
-    slack_auth_project_settings_slack_url(project)
-  end
-
   extend self
 end

app/helpers/groups_helper.rb

@@ -85,12 +85,6 @@ module GroupsHelper
     end
   end
 
-  def size_limit_message_for_group(group)
-    show_lfs = group.lfs_enabled? ? 'and their respective LFS files' : ''
-
-    "Repositories within this group #{show_lfs} will be restricted to this maximum size. Can be overridden inside each project. 0 for unlimited. Leave empty to inherit the global value."
-  end
-
   def group_lfs_status(group)
     status = group.lfs_enabled? ? 'enabled' : 'disabled'
 

app/helpers/milestones_helper.rb

@@ -234,12 +234,4 @@ module MilestonesHelper
       group_milestone_path(@group, milestone.iid, milestone: params)
     end
   end
-
-  def milestone_weight_tooltip_text(weight)
-    if weight.zero?
-      _("Weight")
-    else
-      _("Weight %{weight}") % { weight: weight }
-    end
-  end
 end

ee/app/helpers/ee/auth_helper.rb

@@ -4,6 +4,8 @@ module EE
 
     GROUP_LEVEL_PROVIDERS = %i(group_saml).freeze
 
+    delegate :slack_app_id, to: :'Gitlab::CurrentSettings.current_application_settings'
+
     override :button_based_providers
     def button_based_providers
       super - GROUP_LEVEL_PROVIDERS
@@ -18,5 +20,13 @@ module EE
     def form_based_provider?(name)
       super || name.to_s == 'kerberos'
     end
+
+    def kerberos_enabled?
+      auth_providers.include?(:kerberos)
+    end
+
+    def slack_redirect_uri(project)
+      slack_auth_project_settings_slack_url(project)
+    end
   end
 end

ee/app/helpers/ee/groups_helper.rb

@@ -11,6 +11,12 @@ module EE
       end
     end
 
+    def size_limit_message_for_group(group)
+      show_lfs = group.lfs_enabled? ? 'and their respective LFS files' : ''
+
+      "Repositories within this group #{show_lfs} will be restricted to this maximum size. Can be overridden inside each project. 0 for unlimited. Leave empty to inherit the global value."
+    end
+
     private
 
     def get_group_sidebar_links

ee/app/helpers/ee/milestones_helper.rb

@@ -38,6 +38,14 @@ module EE
       end
     end
 
+    def milestone_weight_tooltip_text(weight)
+      if weight.zero?
+        _("Weight")
+      else
+        _("Weight %{weight}") % { weight: weight }
+      end
+    end
+
     private
 
     def can_admin_milestone?(milestone)