From 44fdf983bd35328dd577d3d3650d14163ef3e2b6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Apr 2020 15:42:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- app/views/projects/registry/settings/_index.haml | 5 ++++- app/views/projects/services/_form.html.haml | 2 +- app/views/projects/services/alerts/_help.html.haml | 4 ++-- .../mattermost_slash_commands/_detailed_help.html.haml | 10 ++++++---- .../projects/services/slack_slash_commands/_help.html.haml | 10 ++++++---- 5 files changed, 19 insertions(+), 12 deletions(-) (limited to 'app/views/projects') diff --git a/app/views/projects/registry/settings/_index.haml b/app/views/projects/registry/settings/_index.haml index 0e0341a9923..c0cef8503e0 100644 --- a/app/views/projects/registry/settings/_index.haml +++ b/app/views/projects/registry/settings/_index.haml @@ -1,4 +1,7 @@ #js-registry-settings{ data: { project_id: @project.id, cadence_options: cadence_options.to_json, keep_n_options: keep_n_options.to_json, - older_than_options: older_than_options.to_json} } + older_than_options: older_than_options.to_json, + is_admin: current_user&.admin.to_s, + admin_settings_path: ci_cd_admin_application_settings_path(anchor: 'js-registry-settings'), + enable_historic_entries: Gitlab::CurrentSettings.try(:container_expiration_policies_enable_historic_entries).to_s} } diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index a0d9d29a7ae..bd9defe5f74 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -10,7 +10,7 @@ - if @service.respond_to?(:detailed_description) %p= @service.detailed_description .col-lg-9 - = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form| + = form_for(@service, as: :service, url: scoped_integration_path(@service), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form| = render 'shared/service_settings', form: form, service: @service - if @service.editable? .footer-block.row-content-block diff --git a/app/views/projects/services/alerts/_help.html.haml b/app/views/projects/services/alerts/_help.html.haml index be910203125..ef3ab8d8d04 100644 --- a/app/views/projects/services/alerts/_help.html.haml +++ b/app/views/projects/services/alerts/_help.html.haml @@ -1,3 +1,3 @@ .js-alerts-service-settings{ data: { activated: @service.activated?.to_s, - form_path: project_service_path(@project, @service.to_param), - authorization_key: @service.token, url: @service.url, learn_more_url: 'https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.html' } } + form_path: scoped_integration_path(@service), + authorization_key: @service.token, url: @service.url || _(''), learn_more_url: 'https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.html' } } diff --git a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml index 395df502ddb..cf73a7055c6 100644 --- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml @@ -1,4 +1,5 @@ -- run_actions_text = s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: @project.full_name } +- pretty_name = @project&.full_name || _('') +- run_actions_text = s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: pretty_name } %p= s_("ProjectService|To set up this service:") %ul.list-unstyled.indent-list @@ -20,7 +21,7 @@ .form-group = label_tag :display_name, _('Display name'), class: 'col-12 col-form-label label-bold' .col-12.input-group - = text_field_tag :display_name, "GitLab / #{@project.full_name}", class: 'form-control form-control-sm', readonly: 'readonly' + = text_field_tag :display_name, "GitLab / #{pretty_name}", class: 'form-control form-control-sm', readonly: 'readonly' .input-group-append = clipboard_button(target: '#display_name', class: 'input-group-text') @@ -38,8 +39,9 @@ %p = s_('MattermostService|Suggestions:') %code= 'gitlab' - %code= @project.path # Path contains no spaces, but dashes - %code= @project.full_path + - if @project + %code= @project.path # Path contains no spaces, but dashes + %code= @project.full_path .form-group = label_tag :request_url, s_('MattermostService|Request URL'), class: 'col-12 col-form-label label-bold' diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml index 7f6717e298c..93ea17a3a3d 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -1,5 +1,5 @@ -- pretty_name = defined?(@project) ? @project.full_name : 'namespace / path' -- run_actions_text = "Perform common operations on GitLab project: #{pretty_name}" +- pretty_name = @project&.full_name || _('') +- run_actions_text = s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: pretty_name } .info-well .well-segment @@ -31,8 +31,10 @@ %p = _("Suggestions:") %code= 'gitlab' - %code= @project.path # Path contains no spaces, but dashes - %code= @project.full_path + %code= 'project' + - if @project + %code= @project.path # Path contains no spaces, but dashes + %code= @project.full_path .form-group = label_tag :url, 'URL', class: 'col-12 col-form-label label-bold' -- cgit v1.2.3