Merge branch '37561-add-id-settings' into 'master'
Resolve "Add `id` attributes to settings section to allow to open if an hash is provided in the URL" Closes #37561 See merge request gitlab-org/gitlab-ce!20211
This commit is contained in:
commit
eaa9d4fd75
7 changed files with 14 additions and 9 deletions
|
@ -3,7 +3,7 @@
|
||||||
- project = local_assigns.fetch(:project)
|
- project = local_assigns.fetch(:project)
|
||||||
- expanded = Rails.env.test?
|
- expanded = Rails.env.test?
|
||||||
|
|
||||||
%section.settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.no-animate#js-export-project{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Export project
|
Export project
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- expanded = expand_deploy_tokens_section?(@new_deploy_token)
|
- expanded = expand_deploy_tokens_section?(@new_deploy_token)
|
||||||
|
|
||||||
%section.settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.no-animate#js-deploy-tokens{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4= s_('DeployTokens|Deploy Tokens')
|
%h4= s_('DeployTokens|Deploy Tokens')
|
||||||
%button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
|
%button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
- expanded = Rails.env.test?
|
- expanded = Rails.env.test?
|
||||||
|
|
||||||
.project-edit-container
|
.project-edit-container
|
||||||
%section.settings.general-settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.general-settings.no-animate#js-general-project-settings{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
General project
|
General project
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
= link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _("Avatar will be removed. Are you sure?") }, method: :delete, class: "btn btn-danger btn-inverted"
|
= link_to _('Remove avatar'), project_avatar_path(@project), data: { confirm: _("Avatar will be removed. Are you sure?") }, method: :delete, class: "btn btn-danger btn-inverted"
|
||||||
= f.submit 'Save changes', class: "btn btn-success js-btn-save-general-project-settings"
|
= f.submit 'Save changes', class: "btn btn-success js-btn-save-general-project-settings"
|
||||||
|
|
||||||
%section.settings.sharing-permissions.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.sharing-permissions.no-animate#js-shared-permissions{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Permissions
|
Permissions
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
|
|
||||||
= render_if_exists 'projects/issues_settings'
|
= render_if_exists 'projects/issues_settings'
|
||||||
|
|
||||||
%section.qa-merge-request-settings.settings.merge-requests-feature.no-animate{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
|
%section.qa-merge-request-settings.settings.merge-requests-feature.no-animate#js-merge-request-settings{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Merge request
|
Merge request
|
||||||
|
@ -101,7 +101,7 @@
|
||||||
|
|
||||||
= render 'export', project: @project
|
= render 'export', project: @project
|
||||||
|
|
||||||
%section.qa-advanced-settings.settings.advanced-settings.no-animate{ class: ('expanded' if expanded) }
|
%section.qa-advanced-settings.settings.advanced-settings.no-animate#js-project-advanced-settings{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Advanced
|
Advanced
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
- expanded = Rails.env.test?
|
- expanded = Rails.env.test?
|
||||||
%section.settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.no-animate#js-push-remote-settings{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Push to a remote repository
|
Push to a remote repository
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- expanded = Rails.env.test?
|
- expanded = Rails.env.test?
|
||||||
|
|
||||||
%section.settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.no-animate#js-protected-tags-settings{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Protected Tags
|
Protected Tags
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
.settings-content
|
.settings-content
|
||||||
= render 'ci/variables/index', save_endpoint: project_variables_path(@project)
|
= render 'ci/variables/index', save_endpoint: project_variables_path(@project)
|
||||||
|
|
||||||
%section.settings.no-animate{ class: ('expanded' if expanded) }
|
%section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) }
|
||||||
.settings-header
|
.settings-header
|
||||||
%h4
|
%h4
|
||||||
Pipeline triggers
|
Pipeline triggers
|
||||||
|
|
5
changelogs/unreleased/37561-add-id-settings.yml
Normal file
5
changelogs/unreleased/37561-add-id-settings.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Allows settings sections to expand by default when linking to them
|
||||||
|
merge_request: 20211
|
||||||
|
author:
|
||||||
|
type: other
|
Loading…
Reference in a new issue