1 files changed, 16 insertions, 14 deletions

diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 464027e73f4..8eb72fa281e 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -6,7 +6,9 @@
 
 %h1.page-title.gl-font-size-h-display
   = _('Project: %{name}') % { name: @project.full_name }
-  = render Pajamas::ButtonComponent.new(href: edit_project_path(@project), icon: 'pencil', button_options: { class: 'gl-float-right' }) do
+  = render Pajamas::ButtonComponent.new(href: edit_admin_namespace_project_path({ id: @project.to_param, namespace_id: @project.namespace.to_param }),
+    icon: 'pencil',
+    button_options: { class: 'gl-float-right'}) do
     = _('Edit')
 %hr
 - if @project.last_repository_check_failed?
@@ -15,16 +17,16 @@
       = render Pajamas::AlertComponent.new(variant: :danger,
         alert_options: { class: 'gl-mb-5',
                          data: { testid: 'last-repository-check-failed-alert' }}) do |c|
-        = c.body do
+        - c.with_body do
           - 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) }
           = last_check_message.html_safe
 .row
   .col-md-6
     = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }) do |c|
-      - c.header do
+      - c.with_header do
         = _('Project info:')
-      - c.body do
+      - c.with_body do
         %ul.content-list
           %li{ class: 'gl-px-5!' }
             %span.light
@@ -132,9 +134,9 @@
     = render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project }
 
     = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }) do |c|
-      - c.header do
+      - c.with_header do
         = s_('ProjectSettings|Transfer project')
-      - c.body do
+      - c.with_body do
         = gitlab_ui_form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
           .form-group.row
             .col-sm-3.col-form-label
@@ -147,9 +149,9 @@
               = f.submit _('Transfer'), pajamas_button: true
 
     = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5 repository-check' }) do |c|
-      - c.header do
+      - c.with_header do
         = _("Repository check")
-      - c.body do
+      - c.with_body do
         = gitlab_ui_form_for @project, url: repository_check_admin_project_path(@project), method: :post do |f|
           .form-group
             - if @project.last_repository_check_at.nil?
@@ -169,35 +171,35 @@
   .col-md-6
     - if @group
       = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }, footer_options: { class: 'gl-p-4' }) do |c|
-        - c.header do
+        - c.with_header do
           %strong= @group.name
           = _('group members')
           = gl_badge_tag @group_members.size
           = render 'shared/members/manage_access_button', path: group_group_members_path(@group)
-        - c.body do
+        - c.with_body do
           %ul.content-list.members-list
             = render partial: 'shared/members/member',
                     collection: @group_members, as: :member,
                     locals: { membership_source: @project,
                               group: @group,
                               current_user_is_group_owner: current_user_is_group_owner }
-        - c.footer do
+        - c.with_footer do
           = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab'
 
     = render 'shared/members/requests', membership_source: @project, group: @group, requesters: @requesters
 
     = render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5' }, body_options: { class: 'gl-p-0' }, footer_options: { class: 'gl-p-4' }) do |c|
-      - c.header do
+      - c.with_header do
         %strong= @project.name
         = _('project members')
         = gl_badge_tag @project.users.size
         = render 'shared/members/manage_access_button', path: project_project_members_path(@project)
-      - c.body do
+      - c.with_body do
         %ul.content-list.project_members.members-list
           = render partial: 'shared/members/member',
                   collection: @project_members, as: :member,
                   locals: { membership_source: @project,
                             group: @group,
                             current_user_is_group_owner: current_user_is_group_owner }
-      - c.footer do
+      - c.with_footer do
         = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab'