Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d993f12
Commit
7d993f12
authored
Mar 02, 2021
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove invite members link from sidebar
- no longer needed.
parent
3196d6cc
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
0 additions
and
175 deletions
+0
-175
app/assets/javascripts/pages/groups/shared/group_details.js
app/assets/javascripts/pages/groups/shared/group_details.js
+0
-4
app/assets/javascripts/pages/projects/show/index.js
app/assets/javascripts/pages/projects/show/index.js
+0
-5
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+0
-5
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+0
-2
app/views/layouts/nav/sidebar/_project.html.haml
app/views/layouts/nav/sidebar/_project.html.haml
+0
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+0
-2
app/views/projects/_invite_members_link.html.haml
app/views/projects/_invite_members_link.html.haml
+0
-4
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+0
-3
app/views/projects/no_repo.html.haml
app/views/projects/no_repo.html.haml
+0
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+0
-3
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/views/groups/show.html.haml_spec.rb
spec/views/groups/show.html.haml_spec.rb
+0
-52
spec/views/projects/empty.html.haml_spec.rb
spec/views/projects/empty.html.haml_spec.rb
+0
-37
spec/views/projects/show.html.haml_spec.rb
spec/views/projects/show.html.haml_spec.rb
+0
-51
No files found.
app/assets/javascripts/pages/groups/shared/group_details.js
View file @
7d993f12
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
{
ACTIVE_TAB_SHARED
,
ACTIVE_TAB_ARCHIVED
}
from
'
~/groups/constants
'
;
import
{
ACTIVE_TAB_SHARED
,
ACTIVE_TAB_ARCHIVED
}
from
'
~/groups/constants
'
;
import
initInviteMembersBanner
from
'
~/groups/init_invite_members_banner
'
;
import
initInviteMembersBanner
from
'
~/groups/init_invite_members_banner
'
;
import
initInviteMembersModal
from
'
~/invite_members/init_invite_members_modal
'
;
import
initInviteMembersTrigger
from
'
~/invite_members/init_invite_members_trigger
'
;
import
{
getPagePath
,
getDashPath
}
from
'
~/lib/utils/common_utils
'
;
import
{
getPagePath
,
getDashPath
}
from
'
~/lib/utils/common_utils
'
;
import
initNotificationsDropdown
from
'
~/notifications
'
;
import
initNotificationsDropdown
from
'
~/notifications
'
;
import
ProjectsList
from
'
~/projects_list
'
;
import
ProjectsList
from
'
~/projects_list
'
;
...
@@ -26,6 +24,4 @@ export default function initGroupDetails(actionName = 'show') {
...
@@ -26,6 +24,4 @@ export default function initGroupDetails(actionName = 'show') {
new
ProjectsList
();
new
ProjectsList
();
initInviteMembersBanner
();
initInviteMembersBanner
();
initInviteMembersModal
();
initInviteMembersTrigger
();
}
}
app/assets/javascripts/pages/projects/show/index.js
View file @
7d993f12
...
@@ -3,8 +3,6 @@ import Activities from '~/activities';
...
@@ -3,8 +3,6 @@ import Activities from '~/activities';
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/behaviors/shortcuts/shortcuts_navigation
'
;
import
BlobViewer
from
'
~/blob/viewer/index
'
;
import
BlobViewer
from
'
~/blob/viewer/index
'
;
import
{
initUploadForm
}
from
'
~/blob_edit/blob_bundle
'
;
import
{
initUploadForm
}
from
'
~/blob_edit/blob_bundle
'
;
import
initInviteMembersModal
from
'
~/invite_members/init_invite_members_modal
'
;
import
initInviteMembersTrigger
from
'
~/invite_members/init_invite_members_trigger
'
;
import
leaveByUrl
from
'
~/namespaces/leave_by_url
'
;
import
leaveByUrl
from
'
~/namespaces/leave_by_url
'
;
import
initVueNotificationsDropdown
from
'
~/notifications
'
;
import
initVueNotificationsDropdown
from
'
~/notifications
'
;
import
initReadMore
from
'
~/read_more
'
;
import
initReadMore
from
'
~/read_more
'
;
...
@@ -43,6 +41,3 @@ leaveByUrl('project');
...
@@ -43,6 +41,3 @@ leaveByUrl('project');
initVueNotificationsDropdown
();
initVueNotificationsDropdown
();
new
ShortcutsNavigation
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
initInviteMembersTrigger
();
initInviteMembersModal
();
app/views/groups/show.html.haml
View file @
7d993f12
...
@@ -16,11 +16,6 @@
...
@@ -16,11 +16,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
rss_url_options
),
title:
"
#{
@group
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
rss_url_options
),
title:
"
#{
@group
.
name
}
activity"
)
=
content_for
:invite_members_sidebar
do
-
if
can_invite_members_for_group?
(
@group
)
%li
.js-invite-members-trigger
{
data:
{
icon:
'plus'
,
classes:
'gl-text-decoration-none! gl-shadow-none!'
,
display_text:
_
(
'Invite team members'
)
}
}
=
render
partial:
'flash_messages'
=
render
partial:
'flash_messages'
=
render_if_exists
'trials/banner'
,
namespace:
@group
=
render_if_exists
'trials/banner'
,
namespace:
@group
...
...
app/views/layouts/nav/sidebar/_group.html.haml
View file @
7d993f12
...
@@ -137,8 +137,6 @@
...
@@ -137,8 +137,6 @@
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
=
_
(
'Members'
)
=
_
(
'Members'
)
=
content_for
:invite_members_sidebar
-
if
group_sidebar_link?
(
:settings
)
-
if
group_sidebar_link?
(
:settings
)
=
nav_link
(
path:
group_settings_nav_link_paths
)
do
=
nav_link
(
path:
group_settings_nav_link_paths
)
do
=
link_to
edit_group_path
(
@group
)
do
=
link_to
edit_group_path
(
@group
)
do
...
...
app/views/layouts/nav/sidebar/_project.html.haml
View file @
7d993f12
...
@@ -378,8 +378,6 @@
...
@@ -378,8 +378,6 @@
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
=
_
(
'Members'
)
=
_
(
'Members'
)
=
content_for
:invite_members_sidebar
-
if
project_nav_tab?
:settings
-
if
project_nav_tab?
:settings
=
nav_link
(
path:
sidebar_settings_paths
)
do
=
nav_link
(
path:
sidebar_settings_paths
)
do
=
link_to
edit_project_path
(
@project
)
do
=
link_to
edit_project_path
(
@project
)
do
...
...
app/views/projects/_home_panel.html.haml
View file @
7d993f12
...
@@ -3,8 +3,6 @@
...
@@ -3,8 +3,6 @@
-
max_project_topic_length
=
15
-
max_project_topic_length
=
15
-
emails_disabled
=
@project
.
emails_disabled?
-
emails_disabled
=
@project
.
emails_disabled?
=
render
'projects/invite_members_modal'
,
project:
@project
.project-home-panel.js-show-on-project-root.gl-my-5
{
class:
[(
"empty-project"
if
empty_repo
)]
}
.project-home-panel.js-show-on-project-root.gl-my-5
{
class:
[(
"empty-project"
if
empty_repo
)]
}
.row.gl-mb-3
.row.gl-mb-3
.home-panel-title-row.col-md-12.col-lg-6.d-flex
.home-panel-title-row.col-md-12.col-lg-6.d-flex
...
...
app/views/projects/_invite_members_link.html.haml
deleted
100644 → 0
View file @
3196d6cc
-
return
unless
can_invite_members_for_project?
(
@project
)
%li
.js-invite-members-trigger
{
data:
{
icon:
'plus'
,
classes:
'gl-text-decoration-none! gl-shadow-none!'
,
display_text:
_
(
'Invite team members'
)
}
}
app/views/projects/empty.html.haml
View file @
7d993f12
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
-
default_branch_name
=
@project
.
default_branch_or_master
-
default_branch_name
=
@project
.
default_branch_or_master
-
@skip_current_level_breadcrumb
=
true
-
@skip_current_level_breadcrumb
=
true
=
content_for
:invite_members_sidebar
do
=
render
partial:
'projects/invite_members_link'
=
render
partial:
'flash_messages'
,
locals:
{
project:
@project
}
=
render
partial:
'flash_messages'
,
locals:
{
project:
@project
}
=
render
"home_panel"
=
render
"home_panel"
...
...
app/views/projects/no_repo.html.haml
View file @
7d993f12
...
@@ -12,8 +12,6 @@
...
@@ -12,8 +12,6 @@
#{
_
(
'This means you can not push code until you create an empty repository or import existing one.'
)
}
#{
_
(
'This means you can not push code until you create an empty repository or import existing one.'
)
}
%hr
%hr
=
render
'projects/invite_members_modal'
,
project:
@project
.no-repo-actions
.no-repo-actions
=
link_to
project_repository_path
(
@project
),
method: :post
,
class:
'btn gl-button btn-confirm'
do
=
link_to
project_repository_path
(
@project
),
method: :post
,
class:
'btn gl-button btn-confirm'
do
#{
_
(
'Create empty repository'
)
}
#{
_
(
'Create empty repository'
)
}
...
...
app/views/projects/show.html.haml
View file @
7d993f12
...
@@ -6,9 +6,6 @@
...
@@ -6,9 +6,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
project_path
(
@project
,
rss_url_options
),
title:
"
#{
@project
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
project_path
(
@project
,
rss_url_options
),
title:
"
#{
@project
.
name
}
activity"
)
=
content_for
:invite_members_sidebar
do
=
render
partial:
'projects/invite_members_link'
=
render
partial:
'flash_messages'
,
locals:
{
project:
@project
}
=
render
partial:
'flash_messages'
,
locals:
{
project:
@project
}
=
render
"projects/last_push"
=
render
"projects/last_push"
...
...
locale/gitlab.pot
View file @
7d993f12
...
@@ -16458,9 +16458,6 @@ msgstr ""
...
@@ -16458,9 +16458,6 @@ msgstr ""
msgid "Invite members"
msgid "Invite members"
msgstr ""
msgstr ""
msgid "Invite team members"
msgstr ""
msgid "Invite your team"
msgid "Invite your team"
msgstr ""
msgstr ""
...
...
spec/views/groups/show.html.haml_spec.rb
deleted
100644 → 0
View file @
3196d6cc
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'groups/show.html.haml'
do
let_it_be
(
:user
)
{
build
(
:user
)
}
let_it_be
(
:group
)
{
create
(
:group
)
}
before
do
assign
(
:group
,
group
)
end
context
'when rendering with the layout'
do
subject
(
:render_page
)
{
render
template:
'groups/show.html.haml'
,
layout:
'layouts/group'
}
describe
'invite team members'
do
before
do
allow
(
view
).
to
receive
(
:session
).
and_return
({})
allow
(
view
).
to
receive
(
:current_user_mode
).
and_return
(
Gitlab
::
Auth
::
CurrentUserMode
.
new
(
user
))
allow
(
view
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
view
).
to
receive
(
:experiment_enabled?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:group_path
).
and_return
(
''
)
allow
(
view
).
to
receive
(
:group_shared_path
).
and_return
(
''
)
allow
(
view
).
to
receive
(
:group_archived_path
).
and_return
(
''
)
end
context
'when invite team members is not available in sidebar'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_group?
).
and_return
(
false
)
end
it
'does not display the js-invite-members-trigger'
do
render_page
expect
(
rendered
).
not_to
have_selector
(
'.js-invite-members-trigger'
)
end
end
context
'when invite team members is available'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_group?
).
and_return
(
true
)
end
it
'includes the div for js-invite-members-trigger'
do
render_page
expect
(
rendered
).
to
have_selector
(
'.js-invite-members-trigger'
)
end
end
end
end
end
spec/views/projects/empty.html.haml_spec.rb
View file @
7d993f12
...
@@ -79,41 +79,4 @@ RSpec.describe 'projects/empty' do
...
@@ -79,41 +79,4 @@ RSpec.describe 'projects/empty' do
it_behaves_like
'no invite member info'
it_behaves_like
'no invite member info'
end
end
end
end
context
'when rendering with the layout'
do
subject
(
:render_page
)
{
render
template:
'projects/empty.html.haml'
,
layout:
'layouts/project'
}
describe
'invite team members'
do
before
do
allow
(
view
).
to
receive
(
:session
).
and_return
({})
allow
(
view
).
to
receive
(
:current_user_mode
).
and_return
(
Gitlab
::
Auth
::
CurrentUserMode
.
new
(
user
))
allow
(
view
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
view
).
to
receive
(
:experiment_enabled?
).
and_return
(
false
)
end
context
'when invite team members is not available in sidebar'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_project?
).
and_return
(
false
)
end
it
'does not display the js-invite-members-trigger'
do
render_page
expect
(
rendered
).
not_to
have_selector
(
'.js-invite-members-trigger'
)
end
end
context
'when invite team members is available'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_project?
).
and_return
(
true
)
end
it
'includes the div for js-invite-members-trigger'
do
render_page
expect
(
rendered
).
to
have_selector
(
'.js-invite-members-trigger'
)
end
end
end
end
end
end
spec/views/projects/show.html.haml_spec.rb
deleted
100644 → 0
View file @
3196d6cc
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'projects/show.html.haml'
do
let_it_be
(
:user
)
{
build
(
:user
)
}
let_it_be
(
:project
)
{
ProjectPresenter
.
new
(
create
(
:project
,
:repository
),
current_user:
user
)
}
before
do
assign
(
:project
,
project
)
end
context
'when rendering with the layout'
do
subject
(
:render_page
)
{
render
template:
'projects/show.html.haml'
,
layout:
'layouts/project'
}
describe
'invite team members'
do
before
do
allow
(
view
).
to
receive
(
:event_filter_link
)
allow
(
view
).
to
receive
(
:session
).
and_return
({})
allow
(
view
).
to
receive
(
:current_user_mode
).
and_return
(
Gitlab
::
Auth
::
CurrentUserMode
.
new
(
user
))
allow
(
view
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
view
).
to
receive
(
:experiment_enabled?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:add_page_startup_graphql_call
)
end
context
'when invite team members is not available in sidebar'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_project?
).
and_return
(
false
)
end
it
'does not display the js-invite-members-trigger'
do
render_page
expect
(
rendered
).
not_to
have_selector
(
'.js-invite-members-trigger'
)
end
end
context
'when invite team members is available'
do
before
do
allow
(
view
).
to
receive
(
:can_invite_members_for_project?
).
and_return
(
true
)
end
it
'includes the div for js-invite-members-trigger'
do
render_page
expect
(
rendered
).
to
have_selector
(
'.js-invite-members-trigger'
)
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment