diff options
Diffstat (limited to 'app/views/admin')
43 files changed, 252 insertions, 321 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 5ae45d5a9da..fb530e18b03 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -64,6 +64,6 @@ = f.text_field :default_ci_config_path, class: 'form-control gl-form-input', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted = _("The default CI/CD configuration file and path for new projects.").html_safe - = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'custom-cicd-configuration-file'), target: '_blank' + = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'specify-a-custom-cicd-configuration-file'), target: '_blank' = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index b28a53d8bf6..ade6dac606a 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -3,25 +3,19 @@ %fieldset .form-group - = f.label :gitaly_timeout_default, _('Default Timeout Period'), class: 'label-bold' + = f.label :gitaly_timeout_default, _('Default timeout'), class: 'label-bold' = f.number_field :gitaly_timeout_default, class: 'form-control gl-form-input' .form-text.text-muted - Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced - for git fetch/push operations or Sidekiq jobs. - This timeout should be less than the worker timeout. If a Gitaly call timeout would exceed the - worker timeout, the remaining time from the worker timeout would be used to avoid having to terminate - the worker. + = _('Timeout for most Gitaly operations (in seconds).') .form-group - = f.label :gitaly_timeout_fast, _('Fast Timeout Period'), class: 'label-bold' + = f.label :gitaly_timeout_fast, _('Fast timeout'), class: 'label-bold' = f.number_field :gitaly_timeout_fast, class: 'form-control gl-form-input' .form-text.text-muted - Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. - If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' - can help maintain the stability of the GitLab instance. + = _('Timeout for the fastest Gitaly operations (in seconds).') .form-group - = f.label :gitaly_timeout_medium, _('Medium Timeout Period'), class: 'label-bold' + = f.label :gitaly_timeout_medium, _('Medium timeout'), class: 'label-bold' = f.number_field :gitaly_timeout_medium, class: 'form-control gl-form-input' .form-text.text-muted - Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout. + = _('Timeout for moderately fast Gitaly operations (in seconds). Provide a value between Default timeout and Fast timeout.') = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index e7816f5a1c0..b71e8ca831e 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -5,18 +5,18 @@ = render_if_exists 'admin/application_settings/help_text_setting', form: f .form-group - = f.label :help_page_text, class: 'label-bold' + = f.label :help_page_text, _('Additional text to show on the Help page'), class: 'label-bold' = f.text_area :help_page_text, class: 'form-control gl-form-input', rows: 4 .form-text.text-muted= _('Markdown enabled') .form-group .form-check = f.check_box :help_page_hide_commercial_content, class: 'form-check-input' = f.label :help_page_hide_commercial_content, class: 'form-check-label' do - = _('Hide marketing-related entries from help') + = _('Hide marketing-related entries from the Help page.') .form-group = f.label :help_page_support_url, _('Support page URL'), class: 'label-bold' = f.text_field :help_page_support_url, class: 'form-control gl-form-input', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' - %span.form-text.text-muted#support_help_block= _('Alternate support URL for help page and help dropdown') + %span.form-text.text-muted#support_help_block= _('Alternate support URL for Help page and Help dropdown') - if show_documentation_base_url_field? .form-group diff --git a/app/views/admin/application_settings/_initial_branch_name.html.haml b/app/views/admin/application_settings/_initial_branch_name.html.haml index f881808e51f..34c40892467 100644 --- a/app/views/admin/application_settings/_initial_branch_name.html.haml +++ b/app/views/admin/application_settings/_initial_branch_name.html.haml @@ -8,6 +8,6 @@ = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light' = f.text_field :default_branch_name, placeholder: Gitlab::DefaultBranch.value, class: 'form-control gl-form-input' %span.form-text.text-muted - = (_("Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name } ).html_safe + = (s_("AdminSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories.") % { default_initial_branch_name: fallback_branch_name } ).html_safe = f.submit _('Save changes'), class: 'gl-button btn-confirm' diff --git a/app/views/admin/application_settings/_localization.html.haml b/app/views/admin/application_settings/_localization.html.haml index fdb91937ec3..5c8f3379fce 100644 --- a/app/views/admin/application_settings/_localization.html.haml +++ b/app/views/admin/application_settings/_localization.html.haml @@ -7,6 +7,7 @@ = f.select :first_day_of_week, first_day_of_week_choices, {}, class: 'form-control' .form-text.text-muted = _('Default first day of the week in calendars and date pickers.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/index.md', anchor: 'default-first-day-of-the-week'), target: '_blank' .form-group = f.label :time_tracking, _('Time tracking'), class: 'label-bold' @@ -14,5 +15,9 @@ = f.check_box :time_tracking_limit_to_hours, class: 'form-check-input' = f.label :time_tracking_limit_to_hours, class: 'form-check-label' do = _('Limit display of time tracking units to hours.') + .form-text.text-muted + = _('Display time tracking in issues in total hours only.') + = link_to _('What is time tracking?'), help_page_path('user/project/time_tracking.md'), target: '_blank' = f.submit _('Save changes'), class: "gl-button btn btn-confirm" + diff --git a/app/views/admin/application_settings/_mailgun.html.haml b/app/views/admin/application_settings/_mailgun.html.haml new file mode 100644 index 00000000000..6204f7df5dc --- /dev/null +++ b/app/views/admin/application_settings/_mailgun.html.haml @@ -0,0 +1,25 @@ +- return unless Feature.enabled?(:mailgun_events_receiver) + +- expanded = integration_expanded?('mailgun_') +%section.settings.as-mailgun.no-animate#js-mailgun-settings{ class: ('expanded' if expanded) } + .settings-header + %h4 + = _('Mailgun') + %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } + = expanded ? _('Collapse') : _('Expand') + %p + = _('Configure the %{link} integration.').html_safe % { link: link_to(_('Mailgun events'), 'https://documentation.mailgun.com/en/latest/user_manual.html#webhooks', target: '_blank') } + .settings-content + = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-mailgun-settings'), html: { class: 'fieldset-form', id: 'mailgun-settings' } do |f| + = form_errors(@application_setting) if expanded + + %fieldset + .form-group + .form-check + = f.check_box :mailgun_events_enabled, class: 'form-check-input' + = f.label :mailgun_events_enabled, _('Enable Mailgun event receiver'), class: 'form-check-label' + .form-group + = f.label :mailgun_signing_key, _('Mailgun HTTP webhook signing key'), class: 'label-light' + = f.text_field :mailgun_signing_key, class: 'form-control gl-form-input' + + = f.submit _('Save changes'), class: 'gl-button btn btn-confirm' diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index 31576d54a04..6df1be9f6cb 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -8,15 +8,14 @@ .form-check = f.check_box :repository_checks_enabled, class: 'form-check-input' = f.label :repository_checks_enabled, class: 'form-check-label' do - = _("Enable Repository Checks") + = _("Enable repository checks") .form-text.text-muted - - link_to_git_fsck = link_to('git fsck', 'https://git-scm.com/docs/git-fsck', target: '_blank') - = _("GitLab will periodically run %{link_to_git_fsck} in all project and wiki repositories to look for silent disk corruption issues.").html_safe % { link_to_git_fsck: link_to_git_fsck } + = html_escape(s_('Run %{code_start}git fsck%{code_end} periodically in all project and wiki repositories to look for silent disk corruption issues.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } .form-group .form-text.text-muted - = _("If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.") + = _("If you get a lot of false alarms from repository checks, you can clear all repository check information from the database.") - clear_repository_checks_link = _('Clear all repository checks') - - clear_repository_checks_message = _('This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?') + - clear_repository_checks_message = _('This clears repository check states for all projects in the database and cannot be undone. Are you sure?') = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "gl-button btn btn-sm btn-danger gl-mt-3" .sub-section @@ -25,29 +24,31 @@ .form-check = f.check_box :housekeeping_enabled, class: 'form-check-input' = f.label :housekeeping_enabled, class: 'form-check-label' do - = _("Enable automatic repository housekeeping (git repack, git gc)") + = _("Enable automatic repository housekeeping") .form-text.text-muted - = _("If you keep automatic housekeeping disabled for a long time Git repository access on your GitLab server will become slower and your repositories will use more disk space. We recommend to always leave this enabled.") + = _("Leaving this setting enabled is recommended.") + = link_to s_('Learn more.'), help_page_path('administration/housekeeping.md', anchor: 'housekeeping-options'), target: '_blank', rel: 'noopener noreferrer' .form-check = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input' = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do = _("Enable Git pack file bitmap creation") .form-text.text-muted - = _("Creating pack file bitmaps makes housekeeping take a little longer but bitmaps should accelerate 'git clone' performance.") + = _("Improves Git cloning performance.") + = link_to s_('Learn more.'), help_page_path('administration/housekeeping.md', anchor: 'housekeeping-options'), target: '_blank', rel: 'noopener noreferrer' .form-group = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-bold' = f.number_field :housekeeping_incremental_repack_period, class: 'form-control gl-form-input' .form-text.text-muted - = _("Number of Git pushes after which an incremental 'git repack' is run.") + = html_escape(s_('Number of Git pushes after which an incremental %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } .form-group = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-bold' = f.number_field :housekeeping_full_repack_period, class: 'form-control gl-form-input' .form-text.text-muted - = _("Number of Git pushes after which a full 'git repack' is run.") + = html_escape(s_('Number of Git pushes after which a full %{code_start}git repack%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } .form-group = f.label :housekeeping_gc_period, _('Git GC period'), class: 'label-bold' = f.number_field :housekeeping_gc_period, class: 'form-control gl-form-input' .form-text.text-muted - = _("Number of Git pushes after which 'git gc' is run.") + = html_escape(s_('Number of Git pushes after which %{code_start}git gc%{code_end} is run.')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe } = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/_repository_mirrors_form.html.haml b/app/views/admin/application_settings/_repository_mirrors_form.html.haml index a0076a2f75d..0c9b04c02d1 100644 --- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml +++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml @@ -3,14 +3,13 @@ %fieldset .form-group - = f.label :mirror_available, _('Enable mirror configuration'), class: 'label-bold' + = f.label :mirror_available, _('Repository mirroring configuration'), class: 'label-bold' .form-check = f.check_box :mirror_available, class: 'form-check-input' = f.label :mirror_available, class: 'form-check-label' do - = _('Allow repository mirroring to be configured by project maintainers') + = _('Allow project maintainers to configure repository mirroring') %span.form-text.text-muted - = _('If disabled, only admins will be able to configure repository mirroring.') - = link_to sprite_icon('question-o'), help_page_path('user/project/repository/repository_mirroring.md') + = _('If disabled, only administrators can configure repository mirroring.') = render_if_exists 'admin/application_settings/mirror_settings', form: f diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml index ab1b2bab573..62a90e173ec 100644 --- a/app/views/admin/application_settings/_repository_storage.html.haml +++ b/app/views/admin/application_settings/_repository_storage.html.haml @@ -3,20 +3,24 @@ %fieldset .sub-section - %h4= _("Hashed repository storage paths") + %h4= _('Hashed repository storage paths') .form-group .form-check = f.check_box :hashed_storage_enabled, class: 'form-check-input qa-hashed-storage-checkbox', disabled: @application_setting.hashed_storage_enabled? - = f.label :hashed_storage_enabled, _("Use hashed storage"), class: 'label-bold form-check-label' + = f.label :hashed_storage_enabled, _('Use hashed storage'), class: 'label-bold form-check-label' .form-text.text-muted - = _("Use hashed storage paths for newly created and renamed repositories. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Repository URL changes and may improve disk I/O performance. (Always enabled since 13.0)") + = _('Use hashed storage paths for newly created and renamed repositories. Always enabled since 13.0.') + = link_to s_('Learn more.'), help_page_path('administration/repository_storage_types.md', anchor: 'hashed-storage'), target: '_blank', rel: 'noopener noreferrer' + .sub-section %h4= _("Storage nodes for new repositories") .form-group .form-text %p.text-secondary - = _('Enter weights for storages for new repositories.') - = link_to sprite_icon('question-o'), help_page_path('administration/repository_storage_paths') + - weights_link_url = help_page_path('administration/repository_storage_paths.md', anchor: 'configure-where-new-repositories-are-stored') + - weights_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: weights_link_url } + = html_escape(s_('Enter %{weights_link_start}weights%{weights_link_end} for storages for new repositories. Configured storages appear below.')) % { weights_link_start: weights_link_start, weights_link_end: '</a>'.html_safe } + = link_to s_('Learn more.'), help_page_path('administration/repository_storage_paths.md'), target: '_blank', rel: 'noopener noreferrer' .form-check = f.fields_for :repository_storages_weighted, storage_weights do |storage_form| - Gitlab.config.repositories.storages.keys.each do |storage| diff --git a/app/views/admin/application_settings/_runner_registrars_form.html.haml b/app/views/admin/application_settings/_runner_registrars_form.html.haml new file mode 100644 index 00000000000..b7ab896533b --- /dev/null +++ b/app/views/admin/application_settings/_runner_registrars_form.html.haml @@ -0,0 +1,16 @@ += form_for @application_setting, url: ci_cd_admin_application_settings_path(anchor: 'js-runner-settings'), html: { class: 'fieldset-form' } do |f| + = form_errors(@application_setting) + + %fieldset + .form-group + = hidden_field_tag "application_setting[valid_runner_registrars][]", nil + - ApplicationSetting::VALID_RUNNER_REGISTRAR_TYPES.each do |type| + .form-check + = f.check_box(:valid_runner_registrars, { multiple: true, checked: valid_runner_registrars.include?(type), class: 'form-check-input' }, type, nil) + = f.label :valid_runner_registrars, class: 'form-check-label' do + = s_("Runners|Members of the %{type} can register runners") % { type: type } + %span.form-text.gl-text-gray-600 + = _('If no options are selected, only administrators can register runners.') + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'runner-registration'), target: '_blank', rel: 'noopener noreferrer' + + = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/_snowplow.html.haml b/app/views/admin/application_settings/_snowplow.html.haml index 5daf220d81c..8c98778147e 100644 --- a/app/views/admin/application_settings/_snowplow.html.haml +++ b/app/views/admin/application_settings/_snowplow.html.haml @@ -6,7 +6,8 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p - = _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') } + - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('development/snowplow/index') } + = html_escape(_('Configure %{link} to track events. %{link_start}Learn more.%{link_end}')) % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank').html_safe, link_start: link_start, link_end: '</a>'.html_safe } .settings-content = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-snowplow-settings'), html: { class: 'fieldset-form', id: 'snowplow-settings' } do |f| = form_errors(@application_setting) if expanded @@ -15,15 +16,21 @@ .form-group .form-check = f.check_box :snowplow_enabled, class: 'form-check-input' - = f.label :snowplow_enabled, _('Enable snowplow tracking'), class: 'form-check-label' + = f.label :snowplow_enabled, _('Enable Snowplow tracking'), class: 'form-check-label' .form-group = f.label :snowplow_collector_hostname, _('Collector hostname'), class: 'label-light' = f.text_field :snowplow_collector_hostname, class: 'form-control gl-form-input', placeholder: 'snowplow.example.com' + .form-text.text-muted + = _('The hostname of your Snowplow collector.') .form-group = f.label :snowplow_app_id, _('App ID'), class: 'label-light' - = f.text_field :snowplow_app_id, class: 'form-control gl-form-input' + = f.text_field :snowplow_app_id, class: 'form-control gl-form-input', placeholder: 'gitlab' + .form-text.text-muted + = _('The ID of the application.') .form-group = f.label :snowplow_cookie_domain, _('Cookie domain'), class: 'label-light' - = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input' + = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input', placeholder: '.your-gitlab-instance.com' + .form-text.text-muted + = _('The Snowplow cookie domain.') = f.submit _('Save changes'), class: 'gl-button btn btn-confirm' diff --git a/app/views/admin/application_settings/_third_party_offers.html.haml b/app/views/admin/application_settings/_third_party_offers.html.haml index 5df2454ed2e..9a34400092e 100644 --- a/app/views/admin/application_settings/_third_party_offers.html.haml +++ b/app/views/admin/application_settings/_third_party_offers.html.haml @@ -2,11 +2,11 @@ %section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) } .settings-header %h4 - = _('Third party offers') + = _('Third-party offers') %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p - = _('Control the display of third party offers.') + = _('Control whether to display third-party offers in GitLab.') .settings-content = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-third-party-offers-settings'), html: { class: 'fieldset-form', id: 'third-party-offers-settings' } do |f| = form_errors(@application_setting) if expanded @@ -15,6 +15,6 @@ .form-group .form-check = f.check_box :hide_third_party_offers, class: 'form-check-input' - = f.label :hide_third_party_offers, _('Do not display offers from third parties within GitLab'), class: 'form-check-label' + = f.label :hide_third_party_offers, _('Do not display offers from third parties'), class: 'form-check-label' = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml index 64e8751bf31..ddd0abb4c34 100644 --- a/app/views/admin/application_settings/_usage.html.haml +++ b/app/views/admin/application_settings/_usage.html.haml @@ -1,4 +1,4 @@ -- payload_class = 'js-usage-ping-payload' +- payload_class = 'js-service-ping-payload' = form_for @application_setting, url: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), html: { class: 'fieldset-form' } do |f| = form_errors(@application_setting) @@ -17,23 +17,44 @@ .form-check = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input' = f.label :usage_ping_enabled, class: 'form-check-label' do - = _('Enable usage ping') + = _('Enable service ping') .form-text.text-muted - if can_be_configured %p.mb-2= _('To help improve GitLab and its user experience, GitLab will periodically collect usage information.') - - usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping') - - usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: usage_ping_path } - %p.mb-2= s_('%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe } + - service_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'service-ping') + - service_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: service_ping_path } + %p.mb-2= s_('%{service_ping_link_start}Learn more%{service_ping_link_end} about what information is shared with GitLab Inc.').html_safe % { service_ping_link_start: service_ping_link_start, service_ping_link_end: '</a>'.html_safe } %button.gl-button.btn.btn-default.js-payload-preview-trigger{ type: 'button', data: { payload_selector: ".#{payload_class}" } } .gl-spinner.js-spinner.gl-display-none.gl-mr-2 .js-text.d-inline= _('Preview payload') - %pre.usage-data.js-syntax-highlight.code.highlight.mt-2.d-none{ class: payload_class, data: { endpoint: usage_data_admin_application_settings_path(format: :html) } } + %pre.service-data-payload-container.js-syntax-highlight.code.highlight.mt-2.d-none{ class: payload_class, data: { endpoint: usage_data_admin_application_settings_path(format: :html) } } - else - = _('The usage ping is disabled, and cannot be configured through this form.') - - deactivating_usage_ping_path = help_page_path('development/usage_ping/index.md', anchor: 'disable-usage-ping') - - deactivating_usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: deactivating_usage_ping_path } - = s_('For more information, see the documentation on %{deactivating_usage_ping_link_start}deactivating the usage ping%{deactivating_usage_ping_link_end}.').html_safe % { deactivating_usage_ping_link_start: deactivating_usage_ping_link_start, deactivating_usage_ping_link_end: '</a>'.html_safe } + = _('Service ping is disabled in your configuration file, and cannot be enabled through this form.') + - deactivating_service_ping_path = help_page_path('development/service_ping/index.md', anchor: 'disable-service-ping-using-the-configuration-file') + - deactivating_service_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: deactivating_service_ping_path } + = s_('For more information, see the documentation on %{deactivating_service_ping_link_start}deactivating service ping%{deactivating_service_ping_link_end}.').html_safe % { deactivating_service_ping_link_start: deactivating_service_ping_link_start, deactivating_service_ping_link_end: '</a>'.html_safe } + .form-group + - usage_ping_enabled = @application_setting.usage_ping_enabled? + .form-check + = f.check_box :usage_ping_features_enabled?, disabled: !usage_ping_enabled, class: 'form-check-input' + = f.label :usage_ping_features_enabled?, class: 'form-check-label gl-cursor-not-allowed', id: 'service_ping_features_label' do + = _('Enable Registration Features') + = link_to sprite_icon('question-o'), help_page_path('development/service_ping/index.md', anchor: 'registration-features-program') + .form-text.text-muted + - if usage_ping_enabled + %p.gl-mb-3.text-muted{ id: 'service_ping_features_helper_text' }= _('You can enable Registration Features because Service Ping is enabled. To continue using Registration Features in the future, you will also need to register with GitLab via a new cloud licensing service.') + - else + %p.gl-mb-3.text-muted{ id: 'service_ping_features_helper_text' }= _('To enable Registration Features, make sure "Enable service ping" is checked.') + + %p.gl-mb-3.text-muted= _('Registration Features include:') + .form-text + - email_from_gitlab_path = help_page_path('tools/email.md') + - link_end = '</a>'.html_safe + - email_from_gitlab_link = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: email_from_gitlab_path } + %ul + %li + = _('Email from GitLab - email users right from the Admin Area. %{link_start}Learn more%{link_end}.').html_safe % { link_start: email_from_gitlab_link, link_end: link_end } = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/ci/_header.html.haml b/app/views/admin/application_settings/ci/_header.html.haml index 40486e9a9e6..1298be9a6cb 100644 --- a/app/views/admin/application_settings/ci/_header.html.haml +++ b/app/views/admin/application_settings/ci/_header.html.haml @@ -8,7 +8,7 @@ %p = _('Variables store information, like passwords and secret keys, that you can use in job scripts. All projects on the instance can use these variables.') - = link_to s_('Learn more.'), help_page_path('ci/variables/README', anchor: 'add-a-cicd-variable-to-an-instance'), target: '_blank', rel: 'noopener noreferrer' + = link_to s_('Learn more.'), help_page_path('ci/variables/index', anchor: 'add-a-cicd-variable-to-an-instance'), target: '_blank', rel: 'noopener noreferrer' %p = _('Variables can be:') %ul @@ -16,4 +16,4 @@ = html_escape(_('%{code_open}Protected:%{code_close} Only exposed to protected branches or tags.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } %li = html_escape(_('%{code_open}Masked:%{code_close} Hidden in job logs. Must match masking requirements.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } - = link_to _('Learn more.'), help_page_path('ci/variables/README', anchor: 'mask-a-cicd-variable'), target: '_blank', rel: 'noopener noreferrer' + = link_to _('Learn more.'), help_page_path('ci/variables/index', anchor: 'mask-a-cicd-variable'), target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/admin/application_settings/ci_cd.html.haml b/app/views/admin/application_settings/ci_cd.html.haml index 127ab8ea1f4..18ec43407c3 100644 --- a/app/views/admin/application_settings/ci_cd.html.haml +++ b/app/views/admin/application_settings/ci_cd.html.haml @@ -8,7 +8,7 @@ .settings-content - if ci_variable_protected_by_default? %p.settings-message.text-center - - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-cicd-variable') } + - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/index', anchor: 'protect-a-cicd-variable') } = s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } #js-instance-variables{ data: { endpoint: admin_ci_variables_path, group: 'true', maskable_regex: ci_variable_maskable_regex, protected_by_default: ci_variable_protected_by_default?.to_s} } @@ -38,3 +38,13 @@ = _('Various container registry settings.') .settings-content = render 'registry' + +- if Feature.enabled?(:runner_registration_control) + %section.settings.as-runner.no-animate#js-runner-settings{ class: ('expanded' if expanded_by_default?) } + .settings-header + %h4 + = s_('Runners|Runner registration') + %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } + = expanded_by_default? ? 'Collapse' : 'Expand' + .settings-content + = render 'runner_registrars_form' diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml index 0fbbef02613..53bdbcd7137 100644 --- a/app/views/admin/application_settings/general.html.haml +++ b/app/views/admin/application_settings/general.html.haml @@ -107,6 +107,7 @@ = render_if_exists 'admin/application_settings/maintenance_mode_settings_form' = render 'admin/application_settings/gitpod' = render 'admin/application_settings/kroki' += render 'admin/application_settings/mailgun' = render 'admin/application_settings/plantuml' = render 'admin/application_settings/sourcegraph' = render_if_exists 'admin/application_settings/slack' diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 7a81d53c085..d818c587b79 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -1,9 +1,9 @@ -- breadcrumb_title _('Integrations') -- page_title _('Integrations') +- breadcrumb_title s_('Integrations|Instance-level integration management') +- page_title s_('Integrations|Instance-level integration management') - @content_class = 'limit-container-width' unless fluid_layout -%h3= s_('Integrations|Project integration management') +%h3= s_('Integrations|Instance-level integration management') - integrations_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: integrations_help_page_path } -%p= s_("Integrations|GitLab administrators can set up integrations that all projects inherit and use by default. These integrations apply to all projects that don't already use custom settings. You can override custom settings for a group or project if the settings are necessary at that level. Learn more about %{integrations_link_start}project integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "</a>".html_safe } +%p= s_("Integrations|GitLab administrators can set up integrations that all groups and projects inherit and use by default. These integrations apply to all groups and projects that don't already use custom settings. You can override custom settings for a group or project if the settings are necessary at that level. Learn more about %{integrations_link_start}instance-level integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "</a>".html_safe } = render 'shared/integrations/index', integrations: @integrations diff --git a/app/views/admin/application_settings/metrics_and_profiling.html.haml b/app/views/admin/application_settings/metrics_and_profiling.html.haml index 113ff20e910..14483e4e55e 100644 --- a/app/views/admin/application_settings/metrics_and_profiling.html.haml +++ b/app/views/admin/application_settings/metrics_and_profiling.html.haml @@ -47,10 +47,8 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Enable or disable version check and usage ping.') + = _('Enable or disable version check and service ping.') .settings-content = render 'usage' -= render_if_exists 'admin/application_settings/seat_link_setting', expanded: expanded_by_default? - = render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded_by_default? diff --git a/app/views/admin/application_settings/preferences.html.haml b/app/views/admin/application_settings/preferences.html.haml index 17bf9ba84a2..0dfc3d7a60d 100644 --- a/app/views/admin/application_settings/preferences.html.haml +++ b/app/views/admin/application_settings/preferences.html.haml @@ -20,18 +20,19 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _("Configure What's new drawer and content.") + = _("Configure %{italic_start}What's new%{italic_end} drawer and content.").html_safe % { italic_start: '<i>'.html_safe, italic_end: '</i>'.html_safe } .settings-content = render 'whats_new' %section.settings.as-help-page.no-animate#js-help-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4 - = _('Help page') + = _('Sign-in and Help page') %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Help page text and support page url.') + = _('Additional text for the sign-in and Help page.') + = link_to s_('Learn more.'), help_page_path('user/admin_area/settings/help_page.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'help_page' @@ -60,11 +61,13 @@ %section.settings.as-gitaly.no-animate#js-gitaly-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4 - = _('Gitaly') + = _('Gitaly timeouts') %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p = _('Configure Gitaly timeouts.') + %span + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/gitaly_timeouts.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'gitaly' @@ -75,6 +78,6 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Various localization settings.') + = _('Configure the default first day of the week and time tracking units.') .settings-content = render 'localization' diff --git a/app/views/admin/application_settings/repository.html.haml b/app/views/admin/application_settings/repository.html.haml index 111cc9c5d7c..2a9fba1aef6 100644 --- a/app/views/admin/application_settings/repository.html.haml +++ b/app/views/admin/application_settings/repository.html.haml @@ -9,7 +9,7 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Set the default name of the initial branch when creating new repositories through the user interface.') + = s_('AdminSettings|The default name for the initial branch of new repositories created in the instance.') .settings-content = render 'initial_branch_name' @@ -21,6 +21,7 @@ = expanded_by_default? ? 'Collapse' : 'Expand' %p = _('Configure repository mirroring.') + = link_to s_('Learn more.'), help_page_path('user/project/repository/repository_mirroring.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render partial: 'repository_mirrors_form' @@ -31,7 +32,8 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Configure storage path settings.') + = _('Configure repository storage.') + = link_to s_('Learn more.'), help_page_path('administration/repository_storage_paths.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'repository_storage' @@ -42,7 +44,11 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Configure automatic git checks and housekeeping on repositories.') + - repository_checks_link_url = help_page_path('administration/repository_checks.md') + - repository_checks_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: repository_checks_link_url } + - housekeeping_link_url = help_page_path('administration/housekeeping.md') + - housekeeping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: housekeeping_link_url } + = html_escape(s_('Configure %{repository_checks_link_start}repository checks%{link_end} and %{housekeeping_link_start}housekeeping%{link_end} on repositories.')) % { repository_checks_link_start: repository_checks_link_start, housekeeping_link_start: housekeeping_link_start, link_end: '</a>'.html_safe } .settings-content = render 'repository_check' diff --git a/app/views/admin/background_migrations/_migration.html.haml b/app/views/admin/background_migrations/_migration.html.haml index 40860ea9400..ddb2eb27705 100644 --- a/app/views/admin/background_migrations/_migration.html.haml +++ b/app/views/admin/background_migrations/_migration.html.haml @@ -8,3 +8,12 @@ = _('Unknown') %td{ role: 'cell', data: { label: _('Status') } } %span.badge.badge-pill.gl-badge.sm{ class: batched_migration_status_badge_class_name(migration) }= migration.status.humanize + %td{ role: 'cell', data: { label: _('Action') } } + - if migration.active? + = button_to pause_admin_background_migration_path(migration), + class: 'gl-button btn btn-icon has-tooltip', title: _('Pause'), 'aria-label' => _('Pause') do + = sprite_icon('pause', css_class: 'gl-button-icon gl-icon') + - elsif migration.paused? + = button_to resume_admin_background_migration_path(migration), + class: 'gl-button btn btn-icon has-tooltip', title: _('Resume'), 'aria-label' => _('Resume') do + = sprite_icon('play', css_class: 'gl-button-icon gl-icon') diff --git a/app/views/admin/background_migrations/index.html.haml b/app/views/admin/background_migrations/index.html.haml index 2a372c89912..9ccbdfb5f20 100644 --- a/app/views/admin/background_migrations/index.html.haml +++ b/app/views/admin/background_migrations/index.html.haml @@ -29,6 +29,7 @@ %th.table-th-transparent.border-bottom{ role: 'cell' }= _('Migration') %th.table-th-transparent.border-bottom{ role: 'cell' }= _('Progress') %th.table-th-transparent.border-bottom{ role: 'cell' }= _('Status') + %th.table-th-transparent.border-bottom{ role: 'cell' } %tbody{ role: 'rowgroup' } = render partial: 'migration', collection: @migrations diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 58c65bdc8c7..ec3daf6c494 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -3,15 +3,14 @@ - billable_users_url = help_page_path('subscriptions/self_managed/index', anchor: 'billable-users') - billable_users_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer nofollow">'.html_safe % { url: billable_users_url } += render_if_exists 'shared/qrtly_reconciliation_alert' + - if @notices - @notices.each do |notice| .js-vue-alert{ 'v-cloak': true, data: { variant: notice[:type], dismissible: true.to_s } } = notice[:message].html_safe -- if Gitlab.ee? && display_upcoming_reconciliation_alert? - #js-qrtly-reconciliation-alert{ data: upcoming_reconciliation_hash } - - if @license.present? .license-panel.gl-mt-5 = render_if_exists 'admin/licenses/summary' diff --git a/app/views/admin/dev_ops_report/_callout.html.haml b/app/views/admin/dev_ops_report/_callout.html.haml index f313865478d..2b4c258a00c 100644 --- a/app/views/admin/dev_ops_report/_callout.html.haml +++ b/app/views/admin/dev_ops_report/_callout.html.haml @@ -8,6 +8,6 @@ %h4 = _('Introducing Your DevOps Report') %p - = _('Your DevOps Report gives an overview of how you are using GitLab from a feature perspective. View how you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers.') + = _('Your DevOps Report gives an overview of how you are using GitLab from a feature perspective. Use it to view how you compare with other organizations.') .svg-container.devops = custom_icon('dev_ops_report_overview') diff --git a/app/views/admin/dev_ops_report/_report.html.haml b/app/views/admin/dev_ops_report/_report.html.haml index dbd0020e382..0b26548d6e6 100644 --- a/app/views/admin/dev_ops_report/_report.html.haml +++ b/app/views/admin/dev_ops_report/_report.html.haml @@ -1,10 +1,9 @@ -- usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled +- service_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled -- if usage_ping_enabled && show_callout?('dev_ops_report_intro_callout_dismissed') +- if service_ping_enabled && show_callout?('dev_ops_report_intro_callout_dismissed') = render 'callout' -- if !usage_ping_enabled - #js-devops-usage-ping-disabled{ data: { is_admin: current_user&.admin.to_s, empty_state_svg_path: image_path('illustrations/convdev/convdev_no_index.svg'), enable_usage_ping_link: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), docs_link: help_page_path('development/usage_ping/index.md') } } +- if !service_ping_enabled + #js-devops-service-ping-disabled{ data: { is_admin: current_user&.admin.to_s, empty_state_svg_path: image_path('illustrations/convdev/convdev_no_index.svg'), enable_service_ping_path: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), docs_link: help_page_path('development/service_ping/index.md') } } - else #js-devops-score{ data: { devops_score_metrics: devops_score_metrics(@metric).to_json, devops_report_docs_path: help_page_path('user/admin_area/analytics/dev_ops_report'), no_data_image_path: image_path('dev_ops_report_no_data.svg') } } - diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 5f8ec5086bd..9b42e1b4967 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -128,16 +128,12 @@ .card-header = html_escape(_("%{group_name} group members")) % { group_name: "<strong>#{html_escape(@group.name)}</strong>".html_safe } %span.badge.badge-pill= @group.users_count - .float-right - = link_to group_group_members_path(@group), class: 'btn btn-default gl-button btn-sm' do - = sprite_icon('pencil-square', css_class: 'gl-icon') - = _('Manage access') + = render 'shared/members/manage_access_button', path: group_group_members_path(@group) %ul.content-list.group-users-list.content-list.members-list = render partial: 'shared/members/member', collection: @members, as: :member, locals: { membership_source: @group, group: @group, - show_controls: false, current_user_is_group_owner: current_user_is_group_owner } - unless @members.size < Kaminari.config.default_per_page .card-footer diff --git a/app/views/admin/identities/index.html.haml b/app/views/admin/identities/index.html.haml index a6d562dad31..d85ab476693 100644 --- a/app/views/admin/identities/index.html.haml +++ b/app/views/admin/identities/index.html.haml @@ -15,3 +15,5 @@ = render @identities - else %h4= _('This user has no identities') + += render partial: 'admin/users/modals' diff --git a/app/views/admin/impersonation_tokens/index.html.haml b/app/views/admin/impersonation_tokens/index.html.haml index ec393fdd794..1609687fc8d 100644 --- a/app/views/admin/impersonation_tokens/index.html.haml +++ b/app/views/admin/impersonation_tokens/index.html.haml @@ -19,7 +19,8 @@ path: admin_user_impersonation_tokens_path, impersonation: true, token: @impersonation_token, - scopes: @scopes + scopes: @scopes, + help_path: help_page_path('api/index', anchor: 'impersonation-tokens') = render 'shared/access_tokens/table', type: type, @@ -27,3 +28,5 @@ impersonation: true, active_tokens: @active_impersonation_tokens, revoke_route_helper: ->(token) { revoke_admin_user_impersonation_token_path(token.user, token) } + += render partial: 'admin/users/modals' diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 40443fb3406..5c92cbf957e 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -15,8 +15,11 @@ - if @project.last_repository_check_failed? .row .col-md-12 - .gl-alert.gl-alert-danger.gl-mb-5{ data: { testid: 'last-repository-check-failed-alert' } } - = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + = render 'shared/global_alert', + variant: :danger, + alert_class: 'gl-mb-5', + alert_data: { testid: 'last-repository-check-failed-alert' }, + is_container: true do .gl-alert-body - last_check_message = _("Last repository check (%{last_check_timestamp}) failed. See the 'repocheck.log' file for error messages.") - last_check_message = last_check_message % { last_check_timestamp: time_ago_with_tooltip(@project.last_repository_check_at) } @@ -180,37 +183,29 @@ %strong= @group.name = _('group members') %span.badge.badge-pill= @group_members.size - .float-right - = link_to admin_group_path(@group), class: 'btn btn-default gl-button btn-sm' do - = sprite_icon('pencil-square', css_class: 'gl-icon') - = _('Manage access') + = render 'shared/members/manage_access_button', path: group_group_members_path(@group) %ul.content-list.members-list = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { membership_source: @project, group: @group, - show_controls: false, current_user_is_group_owner: current_user_is_group_owner } .card-footer = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab' - = render 'shared/members/requests', membership_source: @project, group: @group, requesters: @requesters, force_mobile_view: true + = render 'shared/members/requests', membership_source: @project, group: @group, requesters: @requesters .card .card-header %strong= @project.name = _('project members') %span.badge.badge-pill= @project.users.size - .float-right - = link_to project_project_members_path(@project), class: 'btn btn-default gl-button btn-sm' do - = sprite_icon('pencil-square', css_class: 'gl-icon') - = _('Manage access') + = render 'shared/members/manage_access_button', path: project_project_members_path(@project) %ul.content-list.project_members.members-list = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { membership_source: @project, group: @group, - show_controls: false, current_user_is_group_owner: current_user_is_group_owner } .card-footer = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab' diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index da2fcd5a4a6..ce143a6b155 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -6,15 +6,15 @@ .table-mobile-header{ role: 'rowheader' }= _('Type') .table-mobile-content - if runner.instance_type? - %span.badge.badge-pill.gl-badge.sm.badge-success= _("shared") + %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared') - elsif runner.group_type? - %span.badge.badge-pill.gl-badge.sm.badge-success= _("group") + %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group') - else - %span.badge.badge-pill.gl-badge.sm.badge-info= _("specific") + %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific') - if runner.locked? - %span.badge.badge-pill.gl-badge.sm.badge-warning= _("locked") + %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked') - unless runner.active? - %span.badge.badge-pill.gl-badge.sm.badge-danger= _("paused") + %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused') .table-section.section-30 .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner') diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 07fbc3e5398..f9c52d9316b 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -17,23 +17,23 @@ %span= _('Runners can be:') %ul %li - %span.badge.badge-pill.gl-badge.sm.badge-success shared + %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared') \- = _('Runs jobs from all unassigned projects.') %li - %span.badge.badge-pill.gl-badge.sm.badge-success group + %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group') \- = _('Runs jobs from all unassigned projects in its group.') %li - %span.badge.badge-pill.gl-badge.sm.badge-info specific + %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific') \- = _('Runs jobs from assigned projects.') %li - %span.badge.badge-pill.gl-badge.sm.badge-warning locked + %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked') \- = _('Cannot be assigned to other projects.') %li - %span.badge.badge-pill.gl-badge.sm.badge-danger paused + %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused') \- = _('Not available to run jobs.') @@ -41,7 +41,7 @@ .bs-callout = render partial: 'ci/runner/how_to_setup_runner', locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token, - type: 'shared', + type: s_('Runners|shared'), reset_token_url: reset_registration_token_admin_application_settings_path, project_path: '', group_path: '' } diff --git a/app/views/admin/users/_approve_user.html.haml b/app/views/admin/users/_approve_user.html.haml deleted file mode 100644 index f61c9fa4b80..00000000000 --- a/app/views/admin/users/_approve_user.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -.card.border-info - .card-header.gl-bg-blue-500.gl-text-white - = s_('AdminUsers|This user has requested access') - .card-body - = render partial: 'admin/users/user_approve_effects' - %br - = link_to s_('AdminUsers|Approve user'), approve_admin_user_path(user), method: :put, class: "btn gl-button btn-info", data: { confirm: s_('AdminUsers|Are you sure?'), qa_selector: 'approve_user_button' } diff --git a/app/views/admin/users/_ban_user.html.haml b/app/views/admin/users/_ban_user.html.haml deleted file mode 100644 index 229c88adb7f..00000000000 --- a/app/views/admin/users/_ban_user.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- if ban_feature_available? - .card.border-warning - .card-header.bg-warning.gl-text-white - = s_('AdminUsers|Ban user') - .card-body - = user_ban_effects - %br - %button.btn.gl-button.btn-warning.js-confirm-modal-button{ data: user_ban_data(user) } - = s_('AdminUsers|Ban user') diff --git a/app/views/admin/users/_block_user.html.haml b/app/views/admin/users/_block_user.html.haml deleted file mode 100644 index 29029986345..00000000000 --- a/app/views/admin/users/_block_user.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.card.border-warning - .card-header.bg-warning.text-white - = s_('AdminUsers|Block this user') - .card-body - = user_block_effects - %br - %button.btn.gl-button.btn-warning.js-confirm-modal-button{ data: user_block_data(user, s_('AdminUsers|You can always unblock their account, their data will remain intact.')) } - = s_('AdminUsers|Block user') diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml index be04e87f8b9..b7b712e078d 100644 --- a/app/views/admin/users/_head.html.haml +++ b/app/views/admin/users/_head.html.haml @@ -1,33 +1,38 @@ -%h3.page-title - = @user.name - - if @user.blocked_pending_approval? - %span.cred - = s_('AdminUsers|(Pending approval)') - - elsif @user.banned? - %span.cred - = s_('AdminUsers|(Banned)') - - elsif @user.blocked? - %span.cred - = s_('AdminUsers|(Blocked)') - - if @user.internal? - %span.cred - = s_('AdminUsers|(Internal)') - - if @user.admin - %span.cred - = s_('AdminUsers|(Admin)') - - if @user.deactivated? - %span.cred - = s_('AdminUsers|(Deactivated)') - = render_if_exists 'admin/users/auditor_user_badge' - = render_if_exists 'admin/users/gma_user_badge' +.gl-display-flex.gl-flex-wrap.gl-justify-content-space-between.gl-align-items-center.gl-py-3.gl-mb-5.gl-border-b-solid.gl-border-gray-100.gl-border-b-1 + .gl-my-3 + %h3.page-title.gl-m-0 + = @user.name + - if @user.blocked_pending_approval? + %span.cred + = s_('AdminUsers|(Pending approval)') + - elsif @user.banned? + %span.cred + = s_('AdminUsers|(Banned)') + - elsif @user.blocked? + %span.cred + = s_('AdminUsers|(Blocked)') + - if @user.internal? + %span.cred + = s_('AdminUsers|(Internal)') + - if @user.admin + %span.cred + = s_('AdminUsers|(Admin)') + - if @user.deactivated? + %span.cred + = s_('AdminUsers|(Deactivated)') + = render_if_exists 'admin/users/auditor_user_badge' + = render_if_exists 'admin/users/gma_user_badge' - .float-right - - if impersonation_enabled? && @user != current_user && @user.can?(:log_in) - = link_to _('Impersonate'), impersonate_admin_user_path(@user), method: :post, class: "btn btn-info gl-button btn-grouped", data: { qa_selector: 'impersonate_user_link' } - = link_to edit_admin_user_path(@user), class: "btn btn-default gl-button btn-grouped" do - = sprite_icon('pencil-square', css_class: 'gl-icon gl-button-icon') - = _('Edit') -%hr + .gl-my-3.gl-display-flex.gl-flex-wrap.gl-my-n2.gl-mx-n2 + .gl-p-2 + #js-admin-user-actions{ data: admin_user_actions_data_attributes(@user) } + - if @user != current_user + .gl-p-2 + - if impersonation_enabled? && @user.can?(:log_in) + = link_to _('Impersonate'), impersonate_admin_user_path(@user), method: :post, class: "btn btn-default gl-button", data: { qa_selector: 'impersonate_user_link' } + - if can_force_email_confirmation?(@user) + %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: confirm_user_data(@user) } + = _('Confirm user') %ul.nav-links.nav.nav-tabs = nav_link(path: 'users#show') do = link_to _("Account"), admin_user_path(@user) diff --git a/app/views/admin/users/_reject_pending_user.html.haml b/app/views/admin/users/_reject_pending_user.html.haml deleted file mode 100644 index 17108427330..00000000000 --- a/app/views/admin/users/_reject_pending_user.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -.card.border-danger - .card-header.bg-danger.gl-text-white - = s_('AdminUsers|This user has requested access') - .card-body - = render partial: 'admin/users/user_reject_effects' - %br - = link_to s_('AdminUsers|Reject request'), reject_admin_user_path(user), method: :delete, class: "btn gl-button btn-danger", data: { confirm: s_('AdminUsers|Are you sure?') } diff --git a/app/views/admin/users/_user_activation_effects.html.haml b/app/views/admin/users/_user_activation_effects.html.haml deleted file mode 100644 index 244836dac11..00000000000 --- a/app/views/admin/users/_user_activation_effects.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -%p - = s_('AdminUsers|Reactivating a user will:') -%ul - %li - = s_('AdminUsers|Restore user access to the account, including web, Git and API.') - = render_if_exists 'admin/users/user_activation_effects_on_seats' diff --git a/app/views/admin/users/_user_approve_effects.html.haml b/app/views/admin/users/_user_approve_effects.html.haml deleted file mode 100644 index 54e51bf3467..00000000000 --- a/app/views/admin/users/_user_approve_effects.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -%p - = s_('AdminUsers|Approved users can:') -%ul - %li - = s_('AdminUsers|Log in') - %li - = s_('AdminUsers|Access Git repositories') - %li - = s_('AdminUsers|Access the API') - %li - = s_('AdminUsers|Be added to groups and projects') diff --git a/app/views/admin/users/_user_detail_note.html.haml b/app/views/admin/users/_user_detail_note.html.haml index 4f2a682c5ca..cc4827327c9 100644 --- a/app/views/admin/users/_user_detail_note.html.haml +++ b/app/views/admin/users/_user_detail_note.html.haml @@ -1,7 +1,7 @@ - if @user.note.present? - text = @user.note - .card.border-info - .card-header.bg-info.text-white + .card + .card-header = _('Admin Note') .card-body %p= text diff --git a/app/views/admin/users/_user_reject_effects.html.haml b/app/views/admin/users/_user_reject_effects.html.haml deleted file mode 100644 index 17b6862b0cc..00000000000 --- a/app/views/admin/users/_user_reject_effects.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -%p - = s_('AdminUsers|Rejected users:') -%ul - %li - = s_('AdminUsers|Cannot sign in or access instance information') - %li - = s_('AdminUsers|Will be deleted') -%p - - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path("user/profile/account/delete_account", anchor: "associated-records") } - = s_('AdminUsers|For more information, please refer to the %{link_start}user account deletion documentation.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } diff --git a/app/views/admin/users/keys.html.haml b/app/views/admin/users/keys.html.haml index 5f9d11af7c1..28024ae084f 100644 --- a/app/views/admin/users/keys.html.haml +++ b/app/views/admin/users/keys.html.haml @@ -3,3 +3,4 @@ - page_title _("SSH Keys"), @user.name, _("Users") = render 'admin/users/head' = render 'profiles/keys/key_table', admin: true += render partial: 'admin/users/modals' diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml index 3ff726e1945..8c56e888dcc 100644 --- a/app/views/admin/users/projects.html.haml +++ b/app/views/admin/users/projects.html.haml @@ -48,3 +48,5 @@ - if member.respond_to? :project = link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn btn-sm btn-danger gl-button btn-icon gl-ml-3", title: _('Remove user from project') do = sprite_icon('close', size: 16, css_class: 'gl-icon') + += render partial: 'admin/users/modals' diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 08c1e089f21..ad8d9d1f04f 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -16,8 +16,10 @@ %strong = link_to user_path(@user) do = @user.username - = render 'admin/users/profile', user: @user - + -# Rendered on mobile only so order of cards can be different on desktop vs mobile + .gl-md-display-none + = render 'admin/users/profile', user: @user + = render 'admin/users/user_detail_note' .card .card-header = _('Account:') @@ -139,123 +141,8 @@ = render 'shared/custom_attributes', custom_attributes: @user.custom_attributes - .col-md-6 - - unless @user == current_user - - if can_force_email_confirmation?(@user) - .gl-card.border-info.gl-mb-5 - .gl-card-header.bg-info.text-white - = _('Confirm user') - .gl-card-body - - if @user.unconfirmed_email.present? - - email = " (#{@user.unconfirmed_email})" - %p= _('This user has an unconfirmed email address %{email}. You may force a confirmation.') % { email: email } - %br - = link_to _('Confirm user'), confirm_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: _('Are you sure?'), qa_selector: 'confirm_user_button' } - - = render 'admin/users/user_detail_note' - - - unless @user.internal? - - if @user.deactivated? - .gl-card.border-info.gl-mb-5 - .gl-card-header.bg-info.text-white - = _('Reactivate this user') - .gl-card-body - = render partial: 'admin/users/user_activation_effects' - %br - %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_activation_data(@user) } - = s_('AdminUsers|Activate user') - - elsif @user.can_be_deactivated? - .gl-card.border-warning.gl-mb-5 - .gl-card-header.bg-warning.text-white - = _('Deactivate this user') - .gl-card-body - = user_deactivation_effects - %br - %button.btn.gl-button.btn-warning.js-confirm-modal-button{ data: user_deactivation_data(@user, s_('AdminUsers|You can always re-activate their account, their data will remain intact.')) } - = s_('AdminUsers|Deactivate user') - - if @user.blocked? - - if @user.blocked_pending_approval? - = render 'admin/users/approve_user', user: @user - = render 'admin/users/reject_pending_user', user: @user - - elsif @user.banned? - .gl-card.border-info.gl-mb-5 - .gl-card-header.gl-bg-blue-500.gl-text-white - = _('This user is banned') - .gl-card-body - %p= _('A banned user cannot:') - %ul - %li= _('Log in') - %li= _('Access Git repositories') - - link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path("user/admin_area/moderate_users", anchor: "ban-a-user") } - = s_('AdminUsers|Learn more about %{link_start}banned users.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } - %p - %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_unban_data(@user) } - = s_('AdminUsers|Unban user') - - else - .gl-card.border-info.gl-mb-5 - .gl-card-header.gl-bg-blue-500.gl-text-white - = _('This user is blocked') - .gl-card-body - %p= _('A blocked user cannot:') - %ul - %li= _('Log in') - %li= _('Access Git repositories') - %br - %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_unblock_data(@user) } - = s_('AdminUsers|Unblock user') - - elsif !@user.internal? - = render 'admin/users/block_user', user: @user - = render 'admin/users/ban_user', user: @user - - - if @user.access_locked? - .card.border-info.gl-mb-5 - .card-header.bg-info.text-white - = _('This account has been locked') - .card-body - %p= _('This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.') - %br - = link_to _('Unlock user'), unlock_admin_user_path(@user), method: :put, class: "btn gl-button btn-info", data: { confirm: _('Are you sure?') } - - if !@user.blocked_pending_approval? - .gl-card.border-danger.gl-mb-5 - .gl-card-header.bg-danger.text-white - = s_('AdminUsers|Delete user') - .gl-card-body - - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) - %p= _('Deleting a user has the following effects:') - = render 'users/deletion_guidance', user: @user - %br - %button.js-delete-user-modal-button.btn.gl-button.btn-danger{ data: { 'gl-modal-action': 'delete', - delete_user_url: admin_user_path(@user), - block_user_url: block_admin_user_path(@user), - username: sanitize_name(@user.name) } } - = s_('AdminUsers|Delete user') - - else - - if @user.solo_owned_groups.present? - %p - = _('This user is currently an owner in these groups:') - %strong= @user.solo_owned_groups.map(&:name).join(', ') - %p - = _('You must transfer ownership or delete these groups before you can delete this user.') - - else - %p - = _("You don't have access to delete this user.") - - .gl-card.border-danger - .gl-card-header.bg-danger.text-white - = s_('AdminUsers|Delete user and contributions') - .gl-card-body - - if can?(current_user, :destroy_user, @user) - %p - - link_to_ghost_user = link_to(_("system ghost user"), help_page_path("user/profile/account/delete_account")) - = _("This option deletes the user and any contributions that would usually be moved to the %{link_to_ghost_user}. As well as the user's personal projects, groups owned solely by the user, and projects in them, will also be removed. Commits to other projects are unaffected.").html_safe % { link_to_ghost_user: link_to_ghost_user } - %br - %button.js-delete-user-modal-button.btn.gl-button.btn-danger{ data: { 'gl-modal-action': 'delete-with-contributions', - delete_user_url: admin_user_path(@user, hard_delete: true), - block_user_url: block_admin_user_path(@user), - username: @user.name } } - = s_('AdminUsers|Delete user and contributions') - - else - %p - = _("You don't have access to delete this user.") - + -# Rendered on desktop only so order of cards can be different on desktop vs mobile + .col-md-6.gl-display-none.gl-md-display-block + = render 'admin/users/profile', user: @user + = render 'admin/users/user_detail_note' = render partial: 'admin/users/modals' |