Align permissions options
This commit is contained in:
Annabel Dunstone Gray
Luke "Jared" Bennett
parent
63c3ba7ae0
commit
26b0fe8d2e
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
const VISIBILITY_DESCRIPTIONS = {
|
||||
0: 'Project access must be granted explicitly to each user.',
|
||||
10: 'Project access must be granted explicitly to each user.',
|
||||
10: 'This project can be cloned by any logged in user.',
|
||||
20: 'The project can be cloned without any authentication.',
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,29 +15,17 @@
|
|||
.new_project,
|
||||
.edit-project {
|
||||
|
||||
.visibility-select-container {
|
||||
padding-left: 26px;
|
||||
|
||||
@media(max-width: $screen-md-min) {
|
||||
padding-left: 15px;
|
||||
.sharing-and-permissions {
|
||||
.header {
|
||||
padding-top: $gl-vert-padding;
|
||||
}
|
||||
}
|
||||
|
||||
fieldset {
|
||||
.label-light {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
&.features {
|
||||
|
||||
.header {
|
||||
padding-top: $gl-vert-padding;
|
||||
}
|
||||
|
||||
.label-light {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.help-block {
|
||||
margin-top: 0;
|
||||
}
|
||||
.help-block {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
|
|
@ -876,10 +864,16 @@ pre.light-well {
|
|||
}
|
||||
}
|
||||
|
||||
.project-feature-nested {
|
||||
.project-feature {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
padding-left: 45px;
|
||||
}
|
||||
|
||||
&.nested {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
padding-left: 90px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.project-repo-select {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
%fieldset.append-bottom-0
|
||||
%h5.prepend-top-0
|
||||
Sharing & Permissions
|
||||
.form_group.prepend-top-20
|
||||
.form_group.prepend-top-20.sharing-and-permissions
|
||||
.row.js-visibility-select
|
||||
.col-md-9
|
||||
%label.label-light
|
||||
|
|
@ -40,48 +40,47 @@
|
|||
= render('shared/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
|
||||
= f.fields_for :project_feature do |feature_fields|
|
||||
%fieldset.features
|
||||
.row.project-feature-nested
|
||||
.col-md-9.header
|
||||
.row
|
||||
.col-md-9.project-feature
|
||||
= feature_fields.label :repository_access_level, "Repository", class: 'label-light'
|
||||
%span.help-block Push files to be stored in this project
|
||||
.col-md-3.js-repo-access-level
|
||||
= project_feature_access_select(:repository_access_level)
|
||||
|
||||
.col-sm-12
|
||||
.row.project-feature-nested
|
||||
.col-md-9.header
|
||||
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
||||
%span.help-block Submit changes to be merged upstream
|
||||
.col-md-3
|
||||
= project_feature_access_select(:merge_requests_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature.nested
|
||||
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
||||
%span.help-block Submit changes to be merged upstream
|
||||
.col-md-3
|
||||
= project_feature_access_select(:merge_requests_access_level)
|
||||
|
||||
.row.project-feature-nested
|
||||
.col-md-9.header
|
||||
= feature_fields.label :builds_access_level, "Builds", class: 'label-light'
|
||||
%span.help-block Submit, test and deploy your changes before merge
|
||||
.col-md-3.double-nested
|
||||
= project_feature_access_select(:builds_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature.nested
|
||||
= feature_fields.label :builds_access_level, "Builds", class: 'label-light'
|
||||
%span.help-block Submit, test and deploy your changes before merge
|
||||
.col-md-3
|
||||
= project_feature_access_select(:builds_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9.header
|
||||
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
||||
%span.help-block Share code pastes with others out of Git repository
|
||||
.col-md-3
|
||||
= project_feature_access_select(:snippets_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature
|
||||
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
||||
%span.help-block Share code pastes with others out of Git repository
|
||||
.col-md-3
|
||||
= project_feature_access_select(:snippets_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9.header
|
||||
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
||||
%span.help-block Lightweight issue tracking system for this project
|
||||
.col-md-3
|
||||
= project_feature_access_select(:issues_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature
|
||||
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
||||
%span.help-block Lightweight issue tracking system for this project
|
||||
.col-md-3
|
||||
= project_feature_access_select(:issues_access_level)
|
||||
|
||||
.row
|
||||
.col-md-9.header
|
||||
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
||||
%span.help-block Pages for project documentation
|
||||
.col-md-3
|
||||
= project_feature_access_select(:wiki_access_level)
|
||||
.row
|
||||
.col-md-9.project-feature
|
||||
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
||||
%span.help-block Pages for project documentation
|
||||
.col-md-3
|
||||
= project_feature_access_select(:wiki_access_level)
|
||||
.form-group
|
||||
= render 'shared/allow_request_access', form: f
|
||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||
|
|
|
|||
Loading…
Reference in New Issue