diff options
5 files changed, 13 insertions, 4 deletions
diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index d39e192d604..ad26f52aea7 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -6,11 +6,11 @@ .form-check = f.check_box :allow_local_requests_from_web_hooks_and_services, class: 'form-check-input' = f.label :allow_local_requests_from_web_hooks_and_services, class: 'form-check-label' do - Allow requests to the local network from web hooks and services + = _('Allow requests to the local network from web hooks and services') .form-check = f.check_box :allow_local_requests_from_system_hooks, class: 'form-check-input' = f.label :allow_local_requests_from_system_hooks, class: 'form-check-label' do - Allow requests to the local network from system hooks + = _('Allow requests to the local network from system hooks') .form-group = f.label :outbound_local_requests_whitelist_raw, class: 'label-bold' do diff --git a/db/migrate/20190726101050_rename_allow_local_requests_from_hooks_and_services_application_setting.rb b/db/migrate/20190726101050_rename_allow_local_requests_from_hooks_and_services_application_setting.rb index f1ba7da9fc7..e3e8514427c 100644 --- a/db/migrate/20190726101050_rename_allow_local_requests_from_hooks_and_services_application_setting.rb +++ b/db/migrate/20190726101050_rename_allow_local_requests_from_hooks_and_services_application_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class RenameAllowLocalRequestsFromHooksAndServicesApplicationSetting < ActiveRecord::Migration[5.2] include Gitlab::Database::MigrationHelpers diff --git a/db/migrate/20190726101133_add_allow_local_requests_from_system_hooks_to_application_settings.rb b/db/migrate/20190726101133_add_allow_local_requests_from_system_hooks_to_application_settings.rb index ed58d4e57fc..c0ecdbf4e37 100644 --- a/db/migrate/20190726101133_add_allow_local_requests_from_system_hooks_to_application_settings.rb +++ b/db/migrate/20190726101133_add_allow_local_requests_from_system_hooks_to_application_settings.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddAllowLocalRequestsFromSystemHooksToApplicationSettings < ActiveRecord::Migration[5.2] include Gitlab::Database::MigrationHelpers diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cca55aeb8bd..c4ee722c4a2 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -945,10 +945,13 @@ msgstr "" msgid "Allow rendering of PlantUML diagrams in Asciidoc documents." msgstr "" -msgid "Allow requests to the local network from web hooks and services." +msgid "Allow requests to the local network from hooks and services." msgstr "" -msgid "Allow requests to the local network from system hooks." +msgid "Allow requests to the local network from system hooks" +msgstr "" + +msgid "Allow requests to the local network from web hooks and services" msgstr "" msgid "Allow this key to push to repository as well? (Default only allows pull access.)" diff --git a/spec/validators/system_hook_url_validator_spec.rb b/spec/validators/system_hook_url_validator_spec.rb index 0862a67df9f..fc4261666e7 100644 --- a/spec/validators/system_hook_url_validator_spec.rb +++ b/spec/validators/system_hook_url_validator_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe SystemHookUrlValidator do |