From 76ef00aac974a463243dcda6f692b17ff5d439bc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 May 2021 12:10:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/admin/application_settings/integrations.html.haml | 11 ----------- app/views/layouts/application.html.haml | 4 +++- app/views/projects/project_members/index.html.haml | 2 +- app/views/projects/settings/integrations/show.html.haml | 10 ---------- 4 files changed, 4 insertions(+), 23 deletions(-) (limited to 'app/views') diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 93bc054754e..92b545cad0a 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -2,17 +2,6 @@ - page_title _('Integrations') - @content_class = 'limit-container-width' unless fluid_layout -- if show_admin_integrations_moved? - .gl-alert.gl-alert-info.js-admin-integrations-moved.mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::ADMIN_INTEGRATIONS_MOVED, dismiss_endpoint: user_callouts_path } } - = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } - = sprite_icon('close', css_class: 'gl-icon') - .gl-alert-body - %h4.gl-alert-title= s_('AdminSettings|Some settings have moved') - = html_escape_once(s_('AdminSettings|PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings > General.')).html_safe - .gl-alert-actions - = link_to s_('AdminSettings|Go to General Settings'), general_admin_application_settings_path, class: 'btn gl-alert-action btn-info gl-button' - %h3= s_('Integrations|Project integration management') - integrations_link_start = ''.html_safe % { url: integrations_help_page_path } diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 58408ec822c..47c092e199a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,10 +1,12 @@ - page_classes = page_class << @html_class - page_classes = page_classes.flatten.compact +- body_classes = [user_application_theme, user_tab_width, @body_class, client_class_list] +- body_classes << 'sidebar-refactoring' if sidebar_refactor_enabled? !!! 5 %html{ lang: I18n.locale, class: page_classes } = render "layouts/head" - %body{ class: "#{user_application_theme} #{user_tab_width} #{@body_class} #{client_class_list}", data: body_data } + %body{ class: body_classes, data: body_data } = render "layouts/init_auto_complete" if @gfm_form = render "layouts/init_client_detection_flags" = render 'peek/bar' diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 5d9aab17b15..9f795344713 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -25,7 +25,7 @@ title: _("Import members from another project") - if @project.allowed_to_share_with_group? .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite a group') } } - - if !membership_locked? + - if can_manage_project_members?(@project) && !membership_locked? .js-invite-members-trigger{ data: { variant: 'success', classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite members') } } = render 'projects/invite_members_modal', project: @project diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml index af37795a7c5..d0b6ff1f159 100644 --- a/app/views/projects/settings/integrations/show.html.haml +++ b/app/views/projects/settings/integrations/show.html.haml @@ -2,16 +2,6 @@ - breadcrumb_title _('Integration Settings') - page_title _('Integrations') -- if show_webhooks_moved_alert? - .gl-alert.gl-alert-info.js-webhooks-moved-alert.gl-mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } } - = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } - = sprite_icon('close', css_class: 'gl-icon') - .gl-alert-body - = _('Webhooks have moved. They can now be found under the Settings menu.') - .gl-alert-actions - = link_to _('Go to Webhooks'), project_hooks_path(@project), class: 'gl-button btn gl-alert-action btn-info' - %h3= _('Integrations') - integrations_link_start = ''.html_safe % { url: help_page_url('user/project/integrations/overview') } - webhooks_link_start = ''.html_safe % { url: project_hooks_path(@project) } -- cgit v1.2.3