diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/projects/services/_form.html.haml | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/projects/services/_form.html.haml')
-rw-r--r-- | app/views/projects/services/_form.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 7a47b504b7c..d1d9a220068 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -5,14 +5,13 @@ -# When using integration.activate_disabled_reason[:trackers], it's potentially insecure to use the raw records -# when passed directly to the frontend. Only use specific fields that are needed for render. -# For example, we can get the link to each tracker with scoped_edit_integration_path(tracker, tracker.project) - = render 'shared/global_alert', - title: s_('ExternalIssueIntegration|Another issue tracker is already in use'), + = render Pajamas::AlertComponent.new(title: s_('ExternalIssueIntegration|Another issue tracker is already in use'), variant: :warning, - dismissible: false do + dismissible: false) do .gl-alert-body = s_('ExternalIssueIntegration|Only one issue tracker integration can be active at a time. Please disable the active tracker first and try again.') -%h3.page-title +%h2.gl-mb-4 = integration.title - if integration.operating? = sprite_icon('check', css_class: 'gl-text-green-500') |