diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/helpers/services_helper.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/helpers/services_helper.rb')
-rw-r--r-- | app/helpers/services_helper.rb | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 1f9cce80bed..e9d39cc8175 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -35,19 +35,6 @@ 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 service_save_button(disabled: false) button_tag(class: 'btn btn-success', type: 'submit', disabled: disabled, data: { qa_selector: 'save_changes_button' }) do icon('spinner spin', class: 'hidden js-btn-spinner') + @@ -95,10 +82,6 @@ module ServicesHelper end end - def integration_form_refactor? - Feature.enabled?(:integration_form_refactor, @project, default_enabled: true) - end - def integration_form_data(integration) { id: integration.id, @@ -116,23 +99,13 @@ module ServicesHelper end def trigger_events_for_service(integration) - return [] unless integration_form_refactor? - ServiceEventSerializer.new(service: integration).represent(integration.configurable_events).to_json end def fields_for_service(integration) - return [] unless integration_form_refactor? - ServiceFieldSerializer.new(service: integration).represent(integration.global_fields).to_json end - def show_service_trigger_events?(integration) - return false if integration.is_a?(JiraService) || integration_form_refactor? - - integration.configurable_events.present? - end - def project_jira_issues_integration? false end |