diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 00:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 00:09:12 +0300 |
| commit | d183d2d76bcc25f983c0836805c712af096bcc2f (patch) | |
| tree | 982987f91e1cf268dbad55e51c4ea57292abbbd6 /app/views | |
| parent | 453634293e24164ffaa5cd708e47a1cebc07bcd3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/dashboard.html.haml | 8 | ||||
| -rw-r--r-- | app/views/layouts/explore.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/snippets.html.haml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index 028c22fe9e5..89f238eb6b3 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -1,9 +1,7 @@ - page_title _("Dashboard") - header_title _("Dashboard"), root_path unless header_title -- if Feature.enabled?(:your_work_sidebar, current_user) - - @left_sidebar = true - - nav "your_work" -- else - - @hide_breadcrumbs = true + +- @left_sidebar = true +- nav "your_work" = render template: "layouts/application" diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml index 389dee853ba..c495bab4547 100644 --- a/app/views/layouts/explore.html.haml +++ b/app/views/layouts/explore.html.haml @@ -1,6 +1,6 @@ - page_title _("Explore") -- if current_user && Feature.enabled?(:your_work_sidebar, current_user) +- if current_user - @left_sidebar = true - nav "your_work" diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml index fd331d4b6c8..95a204a3319 100644 --- a/app/views/layouts/snippets.html.haml +++ b/app/views/layouts/snippets.html.haml @@ -2,7 +2,7 @@ - header_title _("Snippets"), snippets_path - snippets_upload_path = snippets_upload_path(@snippet, current_user) -- if current_user && Feature.enabled?(:your_work_sidebar, current_user) +- if current_user - @left_sidebar = true - nav "your_work" |