summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav/sidebar
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-04 12:11:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-04 12:11:11 +0000
commitd5d47b45ddddcef0f8fc80a35ca7a8a2a0765fd1 (patch)
tree3a595b7b17458fca99dcf3e808dc4c4c49ac0620 /app/views/layouts/nav/sidebar
parentb0a5a92e8349ef7b6284f7e5571620e21bed1cad (diff)
downloadgitlab-ce-d5d47b45ddddcef0f8fc80a35ca7a8a2a0765fd1.tar.gz
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.haml2
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml2
2 files changed, 0 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index e99b2f443be..9b5db5b6bb4 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -137,8 +137,6 @@
%strong.fly-out-top-item-name
= _('Members')
- = content_for :invite_members_sidebar
-
- if group_sidebar_link?(:settings)
= nav_link(path: group_settings_nav_link_paths) do
= link_to edit_group_path(@group) do
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index bbf2f242a63..b36f088959e 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -378,8 +378,6 @@
%strong.fly-out-top-item-name
= _('Members')
- = content_for :invite_members_sidebar
-
- if project_nav_tab? :settings
= nav_link(path: sidebar_settings_paths) do
= link_to edit_project_path(@project) do