diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 18:08:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 18:08:27 +0000 |
| commit | 34e72e54129090eaae6e045890fcdf8b5ad3f629 (patch) | |
| tree | 4d84b3b0243aa43d180b016dd70c601fee09dc61 /app/views/layouts | |
| parent | 8d3d7b40ae69357ddf026d6ed3ab75ca5077d28f (diff) | |
| download | gitlab-ce-34e72e54129090eaae6e045890fcdf8b5ad3f629.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/terms.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index a67860e8e2e..c738493507f 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -216,7 +216,7 @@ = _('Operations') %li.divider.fly-out-top-item - - if project_nav_tab? :environments + - if project_nav_tab? :metrics_dashboards = nav_link(controller: :environments, action: [:metrics, :metrics_redirect]) do = link_to metrics_project_environments_path(@project), title: _('Metrics'), class: 'shortcuts-metrics', data: { qa_selector: 'operations_metrics_link' } do %span diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml index 1f7cf486b2c..f9ca77e994d 100644 --- a/app/views/layouts/terms.html.haml +++ b/app/views/layouts/terms.html.haml @@ -5,7 +5,7 @@ %body{ data: { page: body_data_page } } .layout-page.terms{ class: page_class } - .content-wrapper.prepend-top-0 + .content-wrapper.gl-mt-0 .mobile-overlay .alert-wrapper = render "layouts/broadcast" |