Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index 19a27ba3499..caef6dba212 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -31,6 +31,26 @@ module ServicesHelper
     "#{event}_events"
   end
 
+  def service_event_action_field_name(action)
+    "#{action}_on_event_enabled"
+  end
+
+  def event_action_title(action)
+    case action
+    when "comment"
+      s_("ProjectService|Comment")
+    else
+      action.humanize
+    end
+  end
+
+  def event_action_description(action)
+    case action
+    when "comment"
+      s_("ProjectService|Comment will be posted on each event")
+    end
+  end
+
   def service_save_button(service)
     button_tag(class: 'btn btn-success', type: 'submit', disabled: service.deprecated?, data: { qa_selector: 'save_changes_button' }) do
       icon('spinner spin', class: 'hidden js-btn-spinner') +