diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/group_members/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/no_repo.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/security/configuration/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 1 |
8 files changed, 11 insertions, 0 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index 5c579cf6488..3e619096d4e 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -1,6 +1,8 @@ - add_page_specific_style 'page_bundles/members' - page_title _('Group members') += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @group + .row.gl-mt-3 .col-lg-12 .gl-display-flex.gl-flex-wrap diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 0f91ecae3c9..65613efbf63 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -7,6 +7,7 @@ = render_if_exists 'shared/thanks_for_purchase_banner', plan_title: plan_title, quantity: params[:purchased_quantity].to_i = render_if_exists 'shared/qrtly_reconciliation_alert', group: @group += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @group - if show_invite_banner?(@group) = content_for :group_invite_members_banner do diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index a656b61dc8f..3c4b612f33f 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -20,6 +20,7 @@ = dispensable_render_if_exists "shared/namespace_user_cap_reached_alert" = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert" = yield :page_level_alert + = yield :user_over_limit_free_plan_alert = yield :group_invite_members_banner - unless @hide_breadcrumbs = render "layouts/nav/breadcrumbs" diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 6a54eedf6c8..b2338fa6c55 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -3,6 +3,7 @@ - escaped_default_branch_name = default_branch_name.shellescape - @skip_current_level_breadcrumb = true += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @project = render partial: 'flash_messages', locals: { project: @project } = render "home_panel" diff --git a/app/views/projects/no_repo.html.haml b/app/views/projects/no_repo.html.haml index e3f46d601a3..1331ed24307 100644 --- a/app/views/projects/no_repo.html.haml +++ b/app/views/projects/no_repo.html.haml @@ -1,6 +1,8 @@ - page_title _('No repository') - @skip_current_level_breadcrumb = true += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @project + %h2.gl-display-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center = sprite_icon('warning-solid', size: 24, css_class: 'gl-mr-2') diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index f97b9a2b02f..298c2074062 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -1,6 +1,8 @@ - add_page_specific_style 'page_bundles/members' - page_title _("Members") += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @project + .row.gl-mt-3 .col-lg-12 - if can_invite_members_for_project?(@project) diff --git a/app/views/projects/security/configuration/show.html.haml b/app/views/projects/security/configuration/show.html.haml index df14bd09a4d..4b82f74d035 100644 --- a/app/views/projects/security/configuration/show.html.haml +++ b/app/views/projects/security/configuration/show.html.haml @@ -3,5 +3,6 @@ - @content_class = "limit-container-width" unless fluid_layout #js-security-configuration{ data: { **@configuration.to_html_data_attribute, + vulnerability_training_docs_path: vulnerability_training_docs_path, upgrade_path: security_upgrade_path, project_full_path: @project.full_path } } diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d840ea01b89..dad2822feb4 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -6,6 +6,7 @@ = content_for :meta_tags do = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity") += render_if_exists 'shared/user_over_limit_free_plan_alert', source: @project = render partial: 'flash_messages', locals: { project: @project } = render "projects/last_push" |