Commit ee4e6659 authored by Rémy Coutable's avatar Rémy Coutable Committed by Robert Speicher

Merge branch '18310-improve-request-access-button' into 'master'

Improve the request / withdraw access button

It implements the design proposed in #18310.

No.

To close #18310.

Closes #18310.

| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) | ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) | ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) | ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) | ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) |

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4860
(cherry picked from commit c578fb06)
parent 9f039661
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.9.5
- Improve the request / withdraw access button. !4860
v 8.9.4 v 8.9.4
- Fix privilege escalation issue with OAuth external users. - Fix privilege escalation issue with OAuth external users.
- Ensure references to private repos aren't shown to logged-out users. - Ensure references to private repos aren't shown to logged-out users.
......
...@@ -71,6 +71,10 @@ ...@@ -71,6 +71,10 @@
display: none; display: none;
} }
.group-right-buttons {
display: none;
}
.container .title { .container .title {
padding-left: 15px !important; padding-left: 15px !important;
} }
......
...@@ -41,18 +41,17 @@ ...@@ -41,18 +41,17 @@
} }
.groups-cover-block { .groups-cover-block {
.container-fluid { .container-fluid {
position: relative; position: relative;
} }
.access-request-button { .group-right-buttons {
@include btn-gray;
position: absolute; position: absolute;
right: 16px; right: 16px;
bottom: 32px; .btn {
@include btn-gray;
padding: 3px 10px; padding: 3px 10px;
text-transform: none;
background-color: $background-color; background-color: $background-color;
} }
}
} }
...@@ -223,18 +223,6 @@ ...@@ -223,18 +223,6 @@
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
top: 0; top: 0;
} }
.access-request-button {
position: absolute;
right: 0;
bottom: 61px;
@media (max-width: $screen-md-max) {
position: relative;
bottom: 0;
margin-right: 10px;
}
}
} }
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
......
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
%span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
= visibility_level_icon(@group.visibility_level, fw: false) = visibility_level_icon(@group.visibility_level, fw: false)
.group-right-buttons.btn-group
- if current_user
.pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @group
= render 'shared/notifications/button', notification_setting: @notification_setting
- if @group.description.present? - if @group.description.present?
.cover-desc.description .cover-desc.description
= markdown(@group.description, pipeline: :description) = markdown(@group.description, pipeline: :description)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.project-repo-buttons.btn-group.project-right-buttons .project-repo-buttons.btn-group.project-right-buttons
- if current_user - if current_user
= render 'shared/members/access_request_buttons', source: @project .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @project
= render "projects/buttons/download" = render "projects/buttons/download"
= render 'projects/buttons/dropdown' = render 'projects/buttons/dropdown'
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
= link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]), = link_to 'Withdraw Access Request', polymorphic_path([:leave, source, :members]),
method: :delete, method: :delete,
data: { confirm: remove_member_message(member) }, data: { confirm: remove_member_message(member) },
class: 'btn access-request-button hidden-xs' class: 'btn'
- else - else
= link_to 'Request Access', polymorphic_path([:request_access, source, :members]), = link_to 'Request Access', polymorphic_path([:request_access, source, :members]),
method: :post, method: :post,
class: 'btn access-request-button hidden-xs' class: 'btn'
...@@ -51,7 +51,7 @@ If necessary, you can increase the access level of an individual user for a spec ...@@ -51,7 +51,7 @@ If necessary, you can increase the access level of an individual user for a spec
![Barry effectively has 'Master' access to GitLab CI now](groups/override_access_level.png) ![Barry effectively has 'Master' access to GitLab CI now](groups/override_access_level.png)
## Request access to a group ## Requesting access to a group
As a user, you can request to be a member of a group. Go to the group you'd As a user, you can request to be a member of a group. Go to the group you'd
like to be a member of, and click the **Request Access** button on the right like to be a member of, and click the **Request Access** button on the right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment