diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 00:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 00:09:13 +0300 |
| commit | 659ad26b4e0e1f792ab6d15ac8d6e47ec943e214 (patch) | |
| tree | 5e395d172b681cfe396c671ebf7eef8789ef7334 /app/views | |
| parent | e93121b42cb4ca672c893c6be0a8af0c8d9f7987 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/settings/operations/_alert_management.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/empty_states/_issues.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/settings/operations/_alert_management.html.haml b/app/views/projects/settings/operations/_alert_management.html.haml index abfac0a92ce..d07ac101139 100644 --- a/app/views/projects/settings/operations/_alert_management.html.haml +++ b/app/views/projects/settings/operations/_alert_management.html.haml @@ -6,11 +6,11 @@ %section.settings.no-animate#js-alert-management-settings{ class: ('expanded' if expanded) } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only - = _('Alerts') + = _('Alert integrations') %button.btn.js-settings-toggle{ type: 'button' } = _('Expand') %p = _('Display alerts from all your monitoring tools directly within GitLab.') - = link_to _('More information'), help_page_path('operations/incident_management/index.md'), target: '_blank', rel: 'noopener noreferrer' + = link_to _('More information'), help_page_path('operations/incident_management/integrations.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content .js-alerts-settings{ data: alerts_settings_data } diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml index 8ccf14463c7..1bfb5247d04 100644 --- a/app/views/shared/empty_states/_issues.html.haml +++ b/app/views/shared/empty_states/_issues.html.haml @@ -43,7 +43,7 @@ .text-center - if project_select_button = render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues' - - else + - elsif show_new_issue_link?(@project) = link_to _('New issue'), button_path, class: 'gl-button btn btn-confirm', id: 'new_issue_link' - if show_import_button |