Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-05-05 01:17:16 +0300
committertauriedavis <taurie@gitlab.com>2017-05-05 01:17:16 +0300
commit024427bff6536457e1365709bd15098ddab0e0e8 (patch)
tree585b1e3671e0b9bfe617d245dacdf3f9d846d5a3 /app
parentdf1c933e99dbbc08f7d9fcd4aabcbd790930d3c8 (diff)
31689 Add default margin-top to user request table on project members page
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/group_links/_index.html.haml4
-rw-r--r--app/views/projects/project_members/_index.html.haml2
-rw-r--r--app/views/shared/members/_requests.html.haml2
3 files changed, 3 insertions, 5 deletions
diff --git a/app/views/projects/group_links/_index.html.haml b/app/views/projects/group_links/_index.html.haml
index b6116dbec41..debb0214d06 100644
--- a/app/views/projects/group_links/_index.html.haml
+++ b/app/views/projects/group_links/_index.html.haml
@@ -6,11 +6,9 @@
%p
Projects can be stored in only one group at once. However you can share a project with other groups here.
.col-lg-9
- %h5.prepend-top-0
- Set a group to share
= form_tag namespace_project_group_links_path(@project.namespace, @project), class: 'js-requires-input', method: :post do
.form-group
- = label_tag :link_group_id, "Group", class: "label-light"
+ = label_tag :link_group_id, "Select a group to share with", class: "label-light"
= groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, required: true)
.form-group
= label_tag :link_group_access, "Max access level", class: "label-light"
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml
index f83521052ed..d080b6c83d4 100644
--- a/app/views/projects/project_members/_index.html.haml
+++ b/app/views/projects/project_members/_index.html.haml
@@ -18,7 +18,7 @@
= render "projects/project_members/new_project_member"
= render 'shared/members/requests', membership_source: @project, requesters: @requesters
- .append-bottom-default.clearfix
+ .clearfix
%h5.member.existing-title
Existing members and groups
- if @group_links.any?
diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml
index 10050adfda5..92f6e7428ae 100644
--- a/app/views/shared/members/_requests.html.haml
+++ b/app/views/shared/members/_requests.html.haml
@@ -1,5 +1,5 @@
- if requesters.any?
- .panel.panel-default
+ .panel.panel-default.prepend-top-default
.panel-heading
Users requesting access to
%strong= membership_source.name