Commit 3a2cd1e2 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'fix63' into 'master'

Remove a "to" from string with "to access to"

See merge request gitlab-org/gitlab!72440
parents aa1f905e 4d26191d
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.form-check .form-check
= f.check_box :performance_bar_enabled, class: 'form-check-input', data: { qa_selector: 'enable_performance_bar_checkbox'} = f.check_box :performance_bar_enabled, class: 'form-check-input', data: { qa_selector: 'enable_performance_bar_checkbox'}
= f.label :performance_bar_enabled, class: 'form-check-label' do = f.label :performance_bar_enabled, class: 'form-check-label' do
= _("Allow non-administrators to access to the performance bar") = _("Allow non-administrators access to the performance bar")
.form-group .form-group
= f.label :performance_bar_allowed_group_path, _('Allow access to members of the following group'), class: 'label-bold' = f.label :performance_bar_allowed_group_path, _('Allow access to members of the following group'), class: 'label-bold'
= f.text_field :performance_bar_allowed_group_path, class: 'form-control gl-form-input', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path = f.text_field :performance_bar_allowed_group_path, class: 'form-control gl-form-input', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path
......
...@@ -114,7 +114,7 @@ for a given group: ...@@ -114,7 +114,7 @@ for a given group:
1. On the left sidebar, select **Settings > Metrics and profiling** 1. On the left sidebar, select **Settings > Metrics and profiling**
(`admin/application_settings/metrics_and_profiling`), and expand (`admin/application_settings/metrics_and_profiling`), and expand
**Profiling - Performance bar**. **Profiling - Performance bar**.
1. Click **Allow non-administrators to access to the performance bar**. 1. Click **Allow non-administrators access to the performance bar**.
1. In the **Allow access to members of the following group** field, provide the full path of the 1. In the **Allow access to members of the following group** field, provide the full path of the
group allowed to access the performance. group allowed to access the performance.
1. Click **Save changes**. 1. Click **Save changes**.
...@@ -3370,7 +3370,7 @@ msgstr "" ...@@ -3370,7 +3370,7 @@ msgstr ""
msgid "Allow group owners to manage LDAP-related settings" msgid "Allow group owners to manage LDAP-related settings"
msgstr "" msgstr ""
msgid "Allow non-administrators to access to the performance bar" msgid "Allow non-administrators access to the performance bar"
msgstr "" msgstr ""
msgid "Allow only the selected protocols to be used for Git access." msgid "Allow only the selected protocols to be used for Git access."
......
...@@ -491,22 +491,22 @@ RSpec.describe 'Admin updates settings' do ...@@ -491,22 +491,22 @@ RSpec.describe 'Admin updates settings' do
group = create(:group) group = create(:group)
page.within('.as-performance-bar') do page.within('.as-performance-bar') do
check 'Allow non-administrators to access to the performance bar' check 'Allow non-administrators access to the performance bar'
fill_in 'Allow access to members of the following group', with: group.path fill_in 'Allow access to members of the following group', with: group.path
click_on 'Save changes' click_on 'Save changes'
end end
expect(page).to have_content "Application settings saved successfully" expect(page).to have_content "Application settings saved successfully"
expect(find_field('Allow non-administrators to access to the performance bar')).to be_checked expect(find_field('Allow non-administrators access to the performance bar')).to be_checked
expect(find_field('Allow access to members of the following group').value).to eq group.path expect(find_field('Allow access to members of the following group').value).to eq group.path
page.within('.as-performance-bar') do page.within('.as-performance-bar') do
uncheck 'Allow non-administrators to access to the performance bar' uncheck 'Allow non-administrators access to the performance bar'
click_on 'Save changes' click_on 'Save changes'
end end
expect(page).to have_content 'Application settings saved successfully' expect(page).to have_content 'Application settings saved successfully'
expect(find_field('Allow non-administrators to access to the performance bar')).not_to be_checked expect(find_field('Allow non-administrators access to the performance bar')).not_to be_checked
expect(find_field('Allow access to members of the following group').value).to be_nil expect(find_field('Allow access to members of the following group').value).to be_nil
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment