diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 06:06:12 +0000 |
| commit | 2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 (patch) | |
| tree | 4d6b995e3292562627ddeeacbc5b5eba0ce64032 /app/views | |
| parent | eb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (diff) | |
| download | gitlab-ce-2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/settings/operations/_grafana_integration.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/settings/operations/_grafana_integration.html.haml b/app/views/projects/settings/operations/_grafana_integration.html.haml index ae90b6dd5aa..cd5b5abd9ce 100644 --- a/app/views/projects/settings/operations/_grafana_integration.html.haml +++ b/app/views/projects/settings/operations/_grafana_integration.html.haml @@ -1,2 +1,2 @@ .js-grafana-integration{ data: { operations_settings_endpoint: project_settings_operations_path(@project), - grafana_integration: { url: grafana_integration_url, token: grafana_integration_token } } } + grafana_integration: { url: grafana_integration_url, token: grafana_integration_token, enabled: grafana_integration_enabled?.to_s } } } diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index d70a1631010..59b4facdbe5 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -32,7 +32,7 @@ - explore_groups_button_label = _('Explore groups') - explore_groups_button_link = explore_groups_path -.js-projects-list-holder +.js-projects-list-holder{ data: { qa_selector: 'projects_list' } } - if any_projects?(projects) - load_pipeline_status(projects) if pipeline_status %ul.projects-list{ class: css_classes } |