Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
50a297a0
Commit
50a297a0
authored
Apr 20, 2021
by
Yogi
Committed by
Andrew Fontaine
Apr 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to btn-confirm from btn-success in application_settings directory
parent
55580cc9
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
12 deletions
+17
-12
ee/app/views/admin/application_settings/_custom_templates_form.html.haml
...min/application_settings/_custom_templates_form.html.haml
+1
-1
ee/app/views/admin/application_settings/_ee_package_registry.haml
...iews/admin/application_settings/_ee_package_registry.haml
+1
-1
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
.../admin/application_settings/_elasticsearch_form.html.haml
+2
-2
ee/app/views/admin/application_settings/_network_incident_management.html.haml
...plication_settings/_network_incident_management.html.haml
+1
-1
ee/app/views/admin/application_settings/_pseudonymizer.html.haml
...views/admin/application_settings/_pseudonymizer.html.haml
+1
-1
ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml
...lication_settings/_required_instance_ci_setting.html.haml
+1
-1
ee/app/views/admin/application_settings/_seat_link_form.html.haml
...iews/admin/application_settings/_seat_link_form.html.haml
+1
-1
ee/app/views/admin/application_settings/_slack.html.haml
ee/app/views/admin/application_settings/_slack.html.haml
+1
-1
ee/app/views/admin/application_settings/_templates.html.haml
ee/app/views/admin/application_settings/_templates.html.haml
+1
-1
ee/changelogs/unreleased/btn-confirm-app-settings.yml
ee/changelogs/unreleased/btn-confirm-app-settings.yml
+5
-0
ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb
...pplication_settings/_elasticsearch_form.html.haml_spec.rb
+2
-2
No files found.
ee/app/views/admin/application_settings/_custom_templates_form.html.haml
View file @
50a297a0
...
...
@@ -16,4 +16,4 @@
.form-group
=
groups_select_tag
(
'application_setting[custom_project_templates_group_id]'
,
selected:
@application_setting
.
custom_project_templates_group_id
,
class:
'input-clamp allowClear qa-custom-project-template-select'
,
multiple:
false
)
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
success
qa-save-changes-button"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
confirm
qa-save-changes-button"
ee/app/views/admin/application_settings/_ee_package_registry.haml
View file @
50a297a0
...
...
@@ -11,4 +11,4 @@
.form-text.text-muted
=
_
(
"When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry."
)
=
f
.
submit
_
(
'Save changes'
),
class:
'btn gl-button btn-
success
'
=
f
.
submit
_
(
'Save changes'
),
class:
'btn gl-button btn-
confirm
'
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @
50a297a0
...
...
@@ -44,7 +44,7 @@
-
if
Gitlab
::
CurrentSettings
.
elasticsearch_indexing?
.form-text
=
link_to
_
(
'Index all projects'
),
admin_elasticsearch_enqueue_index_path
,
class:
[
'
btn'
,
'btn-success
'
],
method: :post
class:
[
'
gl-button'
,
'btn'
,
'btn-confirm
'
],
method: :post
.gl-card-body
.form-group
...
...
@@ -234,4 +234,4 @@
.form-text.gl-text-gray-600.gl-mt-0
=
_
(
'AWS Secret Access Key. Only required if not using role instance credentials'
)
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
success
"
,
data:
{
qa_selector:
'submit_button'
}
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
confirm
"
,
data:
{
qa_selector:
'submit_button'
}
ee/app/views/admin/application_settings/_network_incident_management.html.haml
View file @
50a297a0
...
...
@@ -16,4 +16,4 @@
=
f
.
label
:throttle_incident_management_notification_per_period
,
'Rate limit period in seconds'
,
class:
'label-bold'
=
f
.
number_field
:throttle_incident_management_notification_per_period
,
class:
'form-control gl-form-input'
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
success
"
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
confirm
"
ee/app/views/admin/application_settings/_pseudonymizer.html.haml
View file @
50a297a0
...
...
@@ -15,4 +15,4 @@
-
else
=
pseudonymizer_disabled_description_text
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
success
"
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
confirm
"
ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml
View file @
50a297a0
...
...
@@ -22,4 +22,4 @@
=
dropdown_tag
(
s_
(
'AdminSettings|No required pipeline'
),
options:
{
toggle_class:
'js-ci-template-dropdown dropdown-select'
,
title:
s_
(
'AdminSettings|Select a template'
),
filter:
true
,
placeholder:
_
(
"Filter"
),
data:
{
data:
gitlab_ci_ymls
(
nil
)
}
}
)
=
f
.
text_field
:required_instance_ci_template
,
value:
@application_setting
.
required_instance_ci_template
,
id:
'required_instance_ci_template_name'
,
class:
'hidden'
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
success
"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
confirm
"
ee/app/views/admin/application_settings/_seat_link_form.html.haml
View file @
50a297a0
...
...
@@ -28,4 +28,4 @@
-
link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
link_path
}
=
s_
(
'For more information, see the documentation on %{link_start}disabling Seat Link%{link_end}.'
).
html_safe
%
{
link_start:
link_start
,
link_end:
'</a>'
.
html_safe
}
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
success
"
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
confirm
"
ee/app/views/admin/application_settings/_slack.html.haml
View file @
50a297a0
...
...
@@ -31,4 +31,4 @@
=
f
.
label
:slack_app_verification_token
,
'Verification token'
,
class:
'label-bold'
=
f
.
text_field
:slack_app_verification_token
,
class:
'form-control gl-form-input'
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
success
"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
confirm
"
ee/app/views/admin/application_settings/_templates.html.haml
View file @
50a297a0
...
...
@@ -19,4 +19,4 @@
=
link_to
'template repository'
,
help_page_path
(
"user/admin_area/settings/instance_template_repository"
)
=
project_select_tag
(
'application_setting[file_template_project_id]'
,
class:
'project-item-select hidden-filter-value'
,
toggle_class:
'js-project-search js-project-filter js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-project js-filter-submit'
,
placeholder:
_
(
'Search projects'
),
idAttribute:
'id'
,
data:
{
order_by:
'last_activity_at'
,
idattribute:
'id'
,
all_projects:
'true'
,
simple_filter:
true
,
allow_clear:
true
},
value:
@application_setting
.
file_template_project_id
)
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
success
"
=
f
.
submit
'Save changes'
,
class:
"gl-button btn btn-
confirm
"
ee/changelogs/unreleased/btn-confirm-app-settings.yml
0 → 100644
View file @
50a297a0
---
title
:
Move to btn-confirm from btn-success in application_settings directory
merge_request
:
58025
author
:
Yogi (@yo)
type
:
changed
ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb
View file @
50a297a0
...
...
@@ -31,7 +31,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'hides index button when indexing is disabled'
do
render
expect
(
rendered
).
to
have_css
(
'a.btn-
success
'
,
text:
button_text
)
expect
(
rendered
).
to
have_css
(
'a.btn-
confirm
'
,
text:
button_text
)
end
it
'renders an enabled pause checkbox'
do
...
...
@@ -59,7 +59,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it
'shows index button when indexing is enabled'
do
render
expect
(
rendered
).
not_to
have_css
(
'a.btn-
success
'
,
text:
button_text
)
expect
(
rendered
).
not_to
have_css
(
'a.btn-
confirm
'
,
text:
button_text
)
end
it
'renders a disabled pause checkbox'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment