Added limited width container to project settings
This commit is contained in:
parent
529eede849
commit
c1cc700584
12 changed files with 52 additions and 50 deletions
|
@ -136,10 +136,6 @@
|
||||||
width: 250px;
|
width: 250px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: $screen-md-min) {
|
|
||||||
width: 350px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.input-short {
|
&.input-short {
|
||||||
@media (min-width: $screen-md-min) {
|
@media (min-width: $screen-md-min) {
|
||||||
width: 170px;
|
width: 170px;
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
|
|
||||||
= render "projects/settings/head"
|
= render "projects/settings/head"
|
||||||
.project-edit-container
|
.project-edit-container
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3.profile-settings-sidebar
|
.col-lg-4.profile-settings-sidebar
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Project settings
|
Project settings
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
.project-edit-errors
|
.project-edit-errors
|
||||||
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
|
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
|
||||||
%fieldset
|
%fieldset
|
||||||
|
@ -39,66 +41,66 @@
|
||||||
Sharing & Permissions
|
Sharing & Permissions
|
||||||
.form_group.prepend-top-20.sharing-and-permissions
|
.form_group.prepend-top-20.sharing-and-permissions
|
||||||
.row.js-visibility-select
|
.row.js-visibility-select
|
||||||
.col-md-9
|
.col-md-8
|
||||||
.label-light
|
.label-light
|
||||||
= label_tag :project_visibility, 'Project Visibility', class: 'label-light', for: :project_visibility_level
|
= label_tag :project_visibility, 'Project Visibility', class: 'label-light', for: :project_visibility_level
|
||||||
= link_to icon('question-circle'), help_page_path("public_access/public_access")
|
= link_to icon('question-circle'), help_page_path("public_access/public_access")
|
||||||
%span.help-block
|
%span.help-block
|
||||||
.col-md-3.visibility-select-container
|
.col-md-4.visibility-select-container
|
||||||
= render('projects/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
|
= render('projects/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
|
||||||
= f.fields_for :project_feature do |feature_fields|
|
= f.fields_for :project_feature do |feature_fields|
|
||||||
%fieldset.features
|
%fieldset.features
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature
|
.col-md-8.project-feature
|
||||||
= feature_fields.label :repository_access_level, "Repository", class: 'label-light'
|
= feature_fields.label :repository_access_level, "Repository", class: 'label-light'
|
||||||
%span.help-block View and edit files in this project
|
%span.help-block View and edit files in this project
|
||||||
.col-md-3.js-repo-access-level
|
.col-md-4.js-repo-access-level
|
||||||
= project_feature_access_select(:repository_access_level)
|
= project_feature_access_select(:repository_access_level)
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature.nested
|
.col-md-8.project-feature.nested
|
||||||
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
|
||||||
%span.help-block Submit changes to be merged upstream
|
%span.help-block Submit changes to be merged upstream
|
||||||
.col-md-3
|
.col-md-4
|
||||||
= project_feature_access_select(:merge_requests_access_level)
|
= project_feature_access_select(:merge_requests_access_level)
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature.nested
|
.col-md-8.project-feature.nested
|
||||||
= feature_fields.label :builds_access_level, "Pipelines", class: 'label-light'
|
= feature_fields.label :builds_access_level, "Pipelines", class: 'label-light'
|
||||||
%span.help-block Build, test, and deploy your changes
|
%span.help-block Build, test, and deploy your changes
|
||||||
.col-md-3
|
.col-md-4
|
||||||
= project_feature_access_select(:builds_access_level)
|
= project_feature_access_select(:builds_access_level)
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature
|
.col-md-8.project-feature
|
||||||
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
|
||||||
%span.help-block Share code pastes with others out of Git repository
|
%span.help-block Share code pastes with others out of Git repository
|
||||||
.col-md-3
|
.col-md-4
|
||||||
= project_feature_access_select(:snippets_access_level)
|
= project_feature_access_select(:snippets_access_level)
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature
|
.col-md-8.project-feature
|
||||||
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
= feature_fields.label :issues_access_level, "Issues", class: 'label-light'
|
||||||
%span.help-block Lightweight issue tracking system for this project
|
%span.help-block Lightweight issue tracking system for this project
|
||||||
.col-md-3
|
.col-md-4
|
||||||
= project_feature_access_select(:issues_access_level)
|
= project_feature_access_select(:issues_access_level)
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-9.project-feature
|
.col-md-8.project-feature
|
||||||
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
|
||||||
%span.help-block Pages for project documentation
|
%span.help-block Pages for project documentation
|
||||||
.col-md-3
|
.col-md-4
|
||||||
= project_feature_access_select(:wiki_access_level)
|
= project_feature_access_select(:wiki_access_level)
|
||||||
.form-group
|
.form-group
|
||||||
= render 'shared/allow_request_access', form: f
|
= render 'shared/allow_request_access', form: f
|
||||||
- if Gitlab.config.lfs.enabled && current_user.admin?
|
- if Gitlab.config.lfs.enabled && current_user.admin?
|
||||||
.row.js-lfs-enabled
|
.row.js-lfs-enabled
|
||||||
.col-md-9
|
.col-md-8
|
||||||
= f.label :lfs_enabled, 'LFS', class: 'label-light'
|
= f.label :lfs_enabled, 'LFS', class: 'label-light'
|
||||||
%span.help-block
|
%span.help-block
|
||||||
Git Large File Storage
|
Git Large File Storage
|
||||||
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
|
||||||
.col-md-3
|
.col-md-4
|
||||||
.select-wrapper
|
.select-wrapper
|
||||||
= f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control project-repo-select select-control', data: { field: 'lfs_enabled' }
|
= f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control project-repo-select select-control', data: { field: 'lfs_enabled' }
|
||||||
= icon('chevron-down')
|
= icon('chevron-down')
|
||||||
|
@ -138,19 +140,19 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Housekeeping
|
Housekeeping
|
||||||
%p.append-bottom-0
|
%p.append-bottom-0
|
||||||
%p
|
%p
|
||||||
Runs a number of housekeeping tasks within the current repository,
|
Runs a number of housekeeping tasks within the current repository,
|
||||||
such as compressing file revisions and removing unreachable objects.
|
such as compressing file revisions and removing unreachable objects.
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
|
= link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
|
||||||
method: :post, class: "btn btn-default"
|
method: :post, class: "btn btn-default"
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Export project
|
Export project
|
||||||
%p.append-bottom-0
|
%p.append-bottom-0
|
||||||
|
@ -159,7 +161,7 @@
|
||||||
%p
|
%p
|
||||||
Once the exported file is ready, you will receive a notification email with a download link.
|
Once the exported file is ready, you will receive a notification email with a download link.
|
||||||
|
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
|
|
||||||
- if @project.export_project_path
|
- if @project.export_project_path
|
||||||
= link_to 'Download export', download_export_namespace_project_path(@project.namespace, @project),
|
= link_to 'Download export', download_export_namespace_project_path(@project.namespace, @project),
|
||||||
|
@ -190,7 +192,7 @@
|
||||||
- if can? current_user, :archive_project, @project
|
- if can? current_user, :archive_project, @project
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.warning-title.prepend-top-0
|
%h4.warning-title.prepend-top-0
|
||||||
- if @project.archived?
|
- if @project.archived?
|
||||||
Unarchive project
|
Unarchive project
|
||||||
|
@ -201,7 +203,7 @@
|
||||||
Unarchiving the project will mark its repository as active. The project can be committed to.
|
Unarchiving the project will mark its repository as active. The project can be committed to.
|
||||||
- else
|
- else
|
||||||
Archiving the project will mark its repository as read-only. It is hidden from the dashboard and doesn't show up in searches.
|
Archiving the project will mark its repository as read-only. It is hidden from the dashboard and doesn't show up in searches.
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
- if @project.archived?
|
- if @project.archived?
|
||||||
%p
|
%p
|
||||||
%strong Once active this project shows up in the search and on the dashboard.
|
%strong Once active this project shows up in the search and on the dashboard.
|
||||||
|
@ -216,10 +218,10 @@
|
||||||
method: :post, class: "btn btn-warning"
|
method: :post, class: "btn btn-warning"
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0.warning-title
|
%h4.prepend-top-0.warning-title
|
||||||
Rename repository
|
Rename repository
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= render 'projects/errors'
|
= render 'projects/errors'
|
||||||
= form_for([@project.namespace.becomes(Namespace), @project]) do |f|
|
= form_for([@project.namespace.becomes(Namespace), @project]) do |f|
|
||||||
.form-group.project_name_holder
|
.form-group.project_name_holder
|
||||||
|
@ -244,12 +246,12 @@
|
||||||
- if can?(current_user, :change_namespace, @project)
|
- if can?(current_user, :change_namespace, @project)
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0.danger-title
|
%h4.prepend-top-0.danger-title
|
||||||
Transfer project to new group
|
Transfer project to new group
|
||||||
%p.append-bottom-0
|
%p.append-bottom-0
|
||||||
Please select the group you want to transfer this project to in the dropdown to the right.
|
Please select the group you want to transfer this project to in the dropdown to the right.
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f|
|
= form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f|
|
||||||
.form-group
|
.form-group
|
||||||
= label_tag :new_namespace_id, nil, class: 'label-light' do
|
= label_tag :new_namespace_id, nil, class: 'label-light' do
|
||||||
|
@ -265,7 +267,7 @@
|
||||||
- if @project.forked? && can?(current_user, :remove_fork_project, @project)
|
- if @project.forked? && can?(current_user, :remove_fork_project, @project)
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default.append-bottom-default
|
.row.prepend-top-default.append-bottom-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0.danger-title
|
%h4.prepend-top-0.danger-title
|
||||||
Remove fork relationship
|
Remove fork relationship
|
||||||
%p.append-bottom-0
|
%p.append-bottom-0
|
||||||
|
@ -273,7 +275,7 @@
|
||||||
This will remove the fork relationship to source project
|
This will remove the fork relationship to source project
|
||||||
= succeed "." do
|
= succeed "." do
|
||||||
= link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
|
= link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_namespace_project_path(@project.namespace, @project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f|
|
= form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_namespace_project_path(@project.namespace, @project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f|
|
||||||
%p
|
%p
|
||||||
%strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
|
%strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
|
||||||
|
@ -281,12 +283,12 @@
|
||||||
- if can?(current_user, :remove_project, @project)
|
- if can?(current_user, :remove_project, @project)
|
||||||
%hr
|
%hr
|
||||||
.row.prepend-top-default.append-bottom-default
|
.row.prepend-top-default.append-bottom-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0.danger-title
|
%h4.prepend-top-0.danger-title
|
||||||
Remove project
|
Remove project
|
||||||
%p.append-bottom-0
|
%p.append-bottom-0
|
||||||
Removing the project will delete its repository and all related resources including issues, merge requests etc.
|
Removing the project will delete its repository and all related resources including issues, merge requests etc.
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= form_tag(namespace_project_path(@project.namespace, @project), method: :delete) do
|
= form_tag(namespace_project_path(@project.namespace, @project), method: :delete) do
|
||||||
%p
|
%p
|
||||||
%strong Removed projects cannot be restored!
|
%strong Removed projects cannot be restored!
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
= page_title
|
= page_title
|
||||||
%p
|
%p
|
||||||
#{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be
|
#{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be
|
||||||
used for binding events when something is happening within the project.
|
used for binding events when something is happening within the project.
|
||||||
|
|
||||||
.col-lg-9.append-bottom-default
|
.col-lg-8.append-bottom-default
|
||||||
= form_for @hook, as: :hook, url: polymorphic_path([@project.namespace.becomes(Namespace), @project, :hooks]) do |f|
|
= form_for @hook, as: :hook, url: polymorphic_path([@project.namespace.becomes(Namespace), @project, :hooks]) do |f|
|
||||||
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
|
= render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
|
||||||
= f.submit 'Add webhook', class: 'btn btn-create'
|
= f.submit 'Add webhook', class: 'btn btn-create'
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
%div{ class: badge.title.gsub(' ', '-') }
|
%div{ class: badge.title.gsub(' ', '-') }
|
||||||
.col-lg-3.profile-settings-sidebar
|
.col-lg-4.profile-settings-sidebar
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
= badge.title.capitalize
|
= badge.title.capitalize
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
.prepend-top-10
|
.prepend-top-10
|
||||||
.panel.panel-default
|
.panel.panel-default
|
||||||
.panel-heading
|
.panel-heading
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3.profile-settings-sidebar
|
.col-lg-4.profile-settings-sidebar
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Pipelines
|
Pipelines
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f|
|
= form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f|
|
||||||
%fieldset.builds-feature
|
%fieldset.builds-feature
|
||||||
- unless @repository.gitlab_ci_yml
|
- unless @repository.gitlab_ci_yml
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
.row.prepend-top-default
|
.row.prepend-top-default
|
||||||
.col-lg-3.settings-sidebar
|
.col-lg-4.settings-sidebar
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Project members
|
Project members
|
||||||
- if can?(current_user, :admin_project_member, @project)
|
- if can?(current_user, :admin_project_member, @project)
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
%i Masters
|
%i Masters
|
||||||
or
|
or
|
||||||
%i Owners
|
%i Owners
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
.light
|
.light
|
||||||
- if can?(current_user, :admin_project_member, @project)
|
- if can?(current_user, :admin_project_member, @project)
|
||||||
%ul.nav-links.project-member-tabs{ role: 'tablist' }
|
%ul.nav-links.project-member-tabs{ role: 'tablist' }
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
.row.prepend-top-default.append-bottom-default
|
.row.prepend-top-default.append-bottom-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
%h4.prepend-top-0
|
%h4.prepend-top-0
|
||||||
Project services
|
Project services
|
||||||
%p Project services allow you to integrate GitLab with other applications
|
%p Project services allow you to integrate GitLab with other applications
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
%table.table
|
%table.table
|
||||||
%colgroup
|
%colgroup
|
||||||
%col
|
%col
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
- page_title "Pipelines"
|
- page_title "Pipelines"
|
||||||
= render "projects/settings/head"
|
= render "projects/settings/head"
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
- page_title 'Integrations'
|
- page_title 'Integrations'
|
||||||
= render "projects/settings/head"
|
= render "projects/settings/head"
|
||||||
= render 'projects/hooks/index'
|
= render 'projects/hooks/index'
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
|
|
||||||
- page_title "Members"
|
- page_title "Members"
|
||||||
= render "projects/settings/head"
|
= render "projects/settings/head"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.row.prepend-top-default.append-bottom-default.triggers-container
|
.row.prepend-top-default.append-bottom-default.triggers-container
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
= render "projects/triggers/content"
|
= render "projects/triggers/content"
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
.panel.panel-default
|
.panel.panel-default
|
||||||
.panel-heading
|
.panel-heading
|
||||||
%h4.panel-title
|
%h4.panel-title
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.row.prepend-top-default.append-bottom-default
|
.row.prepend-top-default.append-bottom-default
|
||||||
.col-lg-3
|
.col-lg-4
|
||||||
= render "projects/variables/content"
|
= render "projects/variables/content"
|
||||||
.col-lg-9
|
.col-lg-8
|
||||||
%h5.prepend-top-0
|
%h5.prepend-top-0
|
||||||
Add a variable
|
Add a variable
|
||||||
= render "projects/variables/form", btn_text: "Add new variable"
|
= render "projects/variables/form", btn_text: "Add new variable"
|
||||||
|
|
Loading…
Reference in a new issue