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
8a5a26c9
Commit
8a5a26c9
authored
Sep 16, 2021
by
Mehul Sharma
Committed by
Enrique Alcántara
Sep 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aligned Request Access Text with Project ID Link
parent
e8fed737
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
app/views/groups/_home_panel.html.haml
app/views/groups/_home_panel.html.haml
+2
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+2
-2
app/views/shared/members/_access_request_links.html.haml
app/views/shared/members/_access_request_links.html.haml
+3
-5
No files found.
app/views/groups/_home_panel.html.haml
View file @
8a5a26c9
...
...
@@ -13,11 +13,11 @@
=
@group
.
name
%span
.visibility-icon.text-secondary.gl-ml-2.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@group
)
}
=
visibility_level_icon
(
@group
.
visibility_level
,
options:
{
class:
'icon'
})
.home-panel-metadata.
d-flex.align-items-center.
text-secondary
.home-panel-metadata.text-secondary
%span
=
_
(
"Group ID: %{group_id}"
)
%
{
group_id:
@group
.
id
}
-
if
current_user
%span
.
access-request-links.
gl-ml-3
%span
.gl-ml-3
=
render
'shared/members/access_request_links'
,
source:
@group
.home-panel-buttons.col-md-12.col-lg-6
...
...
app/views/projects/_home_panel.html.haml
View file @
8a5a26c9
...
...
@@ -15,13 +15,13 @@
%span
.visibility-icon.text-secondary.gl-ml-2.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)
}
=
visibility_level_icon
(
@project
.
visibility_level
,
options:
{
class:
'icon'
})
=
render_if_exists
'compliance_management/compliance_framework/compliance_framework_badge'
,
project:
@project
.home-panel-metadata.
d-flex.flex-wrap.
text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal
.home-panel-metadata.text-secondary.gl-font-base.gl-font-weight-normal.gl-line-height-normal
-
if
can?
(
current_user
,
:read_project
,
@project
)
-
button_class
=
"btn gl-button btn-sm btn-tertiary btn-default-tertiary home-panel-metadata"
-
button_text
=
s_
(
'ProjectPage|Project ID: %{project_id}'
)
%
{
project_id:
@project
.
id
}
=
clipboard_button
(
title:
s_
(
'ProjectPage|Copy project ID'
),
text:
@project
.
id
,
hide_button_icon:
true
,
button_text:
button_text
,
class:
button_class
,
qa_selector:
'project_id_content'
,
itemprop:
'identifier'
)
-
if
current_user
%span
.
access-request-links
.gl-ml-3
%span
.
gl-display-inline-block.gl-vertical-align-middle
.gl-ml-3
=
render
'shared/members/access_request_links'
,
source:
@project
.gl-mt-3.gl-pl-3.gl-w-full
...
...
app/views/shared/members/_access_request_links.html.haml
View file @
8a5a26c9
...
...
@@ -5,13 +5,11 @@
=
link_to
link_text
,
polymorphic_path
([
:leave
,
source
,
:members
]),
method: :delete
,
data:
{
confirm:
leave_confirmation_message
(
source
),
qa_selector:
'leave_group_link'
},
class:
'
.gl-pl-3.gl-border-l-1.gl-border-l-solid.gl-border-l-gray-500
js-leave-link'
class:
'js-leave-link'
-
elsif
requester
=
source
.
requesters
.
find_by
(
user_id:
current_user
.
id
)
# rubocop: disable CodeReuse/ActiveRecord
=
link_to
_
(
'Withdraw Access Request'
),
polymorphic_path
([
:leave
,
source
,
:members
]),
method: :delete
,
data:
{
confirm:
remove_member_message
(
requester
)
},
class:
'.gl-pl-3.gl-border-l-1.gl-border-l-solid.gl-border-l-gray-500'
data:
{
confirm:
remove_member_message
(
requester
)
}
-
elsif
source
.
request_access_enabled
&&
can?
(
current_user
,
:request_access
,
source
)
=
link_to
_
(
'Request Access'
),
polymorphic_path
([
:request_access
,
source
,
:members
]),
method: :post
,
class:
'.gl-pl-3.gl-border-l-1.gl-border-l-solid.gl-border-l-gray-500'
method: :post
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