Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index f90ad0c300c..02226cc1651 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -3,11 +3,11 @@
 module ApplicationSettingsHelper
   extend self
 
-  delegate  :allow_signup?,
-            :gravatar_enabled?,
-            :password_authentication_enabled_for_web?,
-            :akismet_enabled?,
-            to: :'Gitlab::CurrentSettings.current_application_settings'
+  delegate :allow_signup?,
+           :gravatar_enabled?,
+           :password_authentication_enabled_for_web?,
+           :akismet_enabled?,
+           to: :'Gitlab::CurrentSettings.current_application_settings'
 
   def user_oauth_applications?
     Gitlab::CurrentSettings.user_oauth_applications
@@ -315,6 +315,10 @@ module ApplicationSettingsHelper
     Rails.env.test?
   end
 
+  def integration_expanded?(substring)
+    @application_setting.errors.any? { |k| k.to_s.start_with?(substring) }
+  end
+
   def instance_clusters_enabled?
     can?(current_user, :read_cluster, Clusters::Instance.new)
   end