diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 18:10:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 18:10:24 +0300 |
commit | c70a70ea42e3f8742623e690dcd74d17c7c3b0ed (patch) | |
tree | e60d0a3728112b773e1330a9926e1a6c6d058d53 /app/views/layouts/nav/sidebar | |
parent | b70394d26f7349ecfa4a740d7d7b115d738eff8e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav/sidebar')
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_group_menus.html.haml | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 980730bc3be..c2b50bc0e52 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -1,3 +1 @@ --# We're migration the group sidebar to a logical model based structure. If you need to update --# any of the existing menus, you can find them in app/views/layouts/nav/sidebar/_group_menus.html.haml. = render partial: 'shared/nav/sidebar', object: Sidebars::Groups::Panel.new(group_sidebar_context(@group, current_user)) diff --git a/app/views/layouts/nav/sidebar/_group_menus.html.haml b/app/views/layouts/nav/sidebar/_group_menus.html.haml deleted file mode 100644 index 4c0ed6a888d..00000000000 --- a/app/views/layouts/nav/sidebar/_group_menus.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render 'shared/sidebar_toggle_button' |