Merge branch 'master' into new-nav-fix-contextual-breadcrumbs

6 files changed, 12 insertions, 7 deletions

diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml
index b778e8af121..07c83c0a590 100644
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -1,6 +1,7 @@
 - @no_container = true
 - container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : ''
 - limited_container_width = fluid_layout ? '' : 'limit-container-width'
+- @content_class = limited_container_width
 - page_title        "#{@commit.title} (#{@commit.short_id})", "Commits"
 - page_description  @commit.description
 = render "projects/commits/head"
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index e2cda1a6c01..8faa49d8224 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -11,8 +11,9 @@
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0
         New project
-      %p
-        Create or Import your project from popular Git services
+      - if import_sources_enabled?
+        %p
+          Create or Import your project from popular Git services
     .col-lg-9
       = form_for @project, html: { class: 'new_project' } do |f|
         .row
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index 652d52d6814..89042ef4a03 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -7,7 +7,7 @@
 - @no_container = true
 - page_title _("Pipeline Schedules")
 
-- if show_new_nav?
+- if show_new_nav? && can?(current_user, :create_pipeline_schedule, @project)
   - content_for :breadcrumbs_extra do
     = link_to _('New schedule'), new_namespace_project_pipeline_schedule_path(@project.namespace, @project), class: 'btn btn-create'
 
@@ -21,9 +21,10 @@
     - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) }
     = render "tabs", schedule_path_proc: schedule_path_proc, all_schedules: @all_schedules, scope: @scope
 
-    .nav-controls{ class: ("visible-xs" if show_new_nav?) }
-      = link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-create' do
-        %span= _('New schedule')
+    - if can?(current_user, :create_pipeline_schedule, @project)
+      .nav-controls{ class: ("visible-xs" if show_new_nav?) }
+        = link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-create' do
+          %span= _('New schedule')
 
   - if @schedules.present?
     %ul.content-list
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index 1f18490594b..e71d58ec26d 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -11,5 +11,5 @@
         %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
           = icon("search")
         = render 'shared/members/sort_dropdown'
-  %ul.content-list
+  %ul.content-list.members-list
     = render partial: 'shared/members/member', collection: members, as: :member
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index cdf0d64cea7..c366fb334fe 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,5 +1,6 @@
 - @no_container = true
 - @breadcrumb_title = "Project"
+- @content_class = "limit-container-width" unless fluid_layout
 - flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
 
 = content_for :meta_tags do
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 27ccbb67bfc..2de6d50da3a 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,5 +1,6 @@
 - @no_container = true
 - @breadcrumb_title = _("Repository")
+- @content_class = "limit-container-width" unless fluid_layout
 
 - page_title @path.presence || _("Files"), @ref
 = content_for :meta_tags do