summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-28 11:27:50 +0000
committerPhil Hughes <me@iamphill.com>2018-06-28 11:27:50 +0000
commiteaa9d4fd75252861bb733951b7571d7aea66fd66 (patch)
treead4920b4d26d36bada87c2d1a41f0a76cb737c40 /app/views/projects
parentdf3ac9c40660e736467eed840d94f0eb25fd677c (diff)
parent26dd4b3b49118735f148a48df26f336749858362 (diff)
downloadgitlab-ce-eaa9d4fd75252861bb733951b7571d7aea66fd66.tar.gz
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
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/_export.html.haml2
-rw-r--r--app/views/projects/deploy_tokens/_index.html.haml2
-rw-r--r--app/views/projects/edit.html.haml8
-rw-r--r--app/views/projects/mirrors/_push.html.haml2
-rw-r--r--app/views/projects/protected_tags/shared/_index.html.haml2
-rw-r--r--app/views/projects/settings/ci_cd/show.html.haml2
6 files changed, 9 insertions, 9 deletions
diff --git a/app/views/projects/_export.html.haml b/app/views/projects/_export.html.haml
index 1e7d9444986..f4d4888bd15 100644
--- a/app/views/projects/_export.html.haml
+++ b/app/views/projects/_export.html.haml
@@ -3,7 +3,7 @@
- project = local_assigns.fetch(:project)
- 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
%h4
Export project
diff --git a/app/views/projects/deploy_tokens/_index.html.haml b/app/views/projects/deploy_tokens/_index.html.haml
index 725720d2222..33faab0c510 100644
--- a/app/views/projects/deploy_tokens/_index.html.haml
+++ b/app/views/projects/deploy_tokens/_index.html.haml
@@ -1,6 +1,6 @@
- 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
%h4= s_('DeployTokens|Deploy Tokens')
%button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 9f175d2376f..c2d900cbcf7 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -4,7 +4,7 @@
- expanded = Rails.env.test?
.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
%h4
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"
= 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
%h4
Permissions
@@ -82,7 +82,7 @@
= 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
%h4
Merge request
@@ -101,7 +101,7 @@
= 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
%h4
Advanced
diff --git a/app/views/projects/mirrors/_push.html.haml b/app/views/projects/mirrors/_push.html.haml
index c3dcd9617a6..2b2871a81e5 100644
--- a/app/views/projects/mirrors/_push.html.haml
+++ b/app/views/projects/mirrors/_push.html.haml
@@ -1,5 +1,5 @@
- 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
%h4
Push to a remote repository
diff --git a/app/views/projects/protected_tags/shared/_index.html.haml b/app/views/projects/protected_tags/shared/_index.html.haml
index fe2903b456f..9a50a51e4be 100644
--- a/app/views/projects/protected_tags/shared/_index.html.haml
+++ b/app/views/projects/protected_tags/shared/_index.html.haml
@@ -1,6 +1,6 @@
- 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
%h4
Protected Tags
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index 56c175f5649..4d096699a70 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -51,7 +51,7 @@
.settings-content
= 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
%h4
Pipeline triggers