Merge remote-tracking branch 'origin/master' into ci-predefined-variables

1 files changed, 54 insertions, 43 deletions

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index e9ca46a74bf..dd1cf680cfa 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -12,56 +12,67 @@
 = render 'projects/last_push'
 = render "home_panel"
 
-.project-stats.row-content-block.second-block
-  %div{ class: (container_class) }
-    %ul.nav
-      %li
-        = link_to project_files_path(@project) do
-          Files (#{repository_size})
-      %li
-        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-          #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
-      %li
-        = link_to namespace_project_branches_path(@project.namespace, @project) do
-          #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
+%nav.project-stats{ class: (container_class) }
+  %ul.nav
+    %li
+      = link_to project_files_path(@project) do
+        Files (#{repository_size})
+    %li
+      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+        #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
+    %li
+      = link_to namespace_project_branches_path(@project.namespace, @project) do
+        #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
+    %li
+      = link_to namespace_project_tags_path(@project.namespace, @project) do
+        #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
+
+    - if default_project_view != 'readme' && @repository.readme
       %li
-        = link_to namespace_project_tags_path(@project.namespace, @project) do
-          #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
+        = link_to 'Readme', readme_path(@project)
 
-      - if default_project_view != 'readme' && @repository.readme
-        %li
-          = link_to 'Readme', readme_path(@project)
+    - if @repository.changelog
+      %li
+        = link_to 'Changelog', changelog_path(@project)
 
-      - if @repository.changelog
-        %li
-          = link_to 'Changelog', changelog_path(@project)
+    - if @repository.license_blob
+      %li
+        = link_to license_short_name(@project), license_path(@project)
 
-      - if @repository.license_blob
-        %li
-          = link_to license_short_name(@project), license_path(@project)
+    - if @repository.contribution_guide
+      %li
+        = link_to 'Contribution guide', contribution_guide_path(@project)
 
-      - if @repository.contribution_guide
-        %li
-          = link_to 'Contribution guide', contribution_guide_path(@project)
+    - if current_user && can_push_branch?(@project, @project.default_branch)
+      - unless @repository.changelog
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
+            Add Changelog
+      - unless @repository.license_blob
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'LICENSE') do
+            Add License
+      - unless @repository.contribution_guide
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
+            Add Contribution guide
+      - unless @repository.gitlab_ci_yml
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
+            Set Up CI
+    %li.project-repo-buttons-right
+      .project-repo-buttons.project-right-buttons
+        - if current_user
+          = render 'shared/members/access_request_buttons', source: @project
 
-      - if current_user && can_push_branch?(@project, @project.default_branch)
-        - unless @repository.changelog
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
-              Add Changelog
-        - unless @repository.license_blob
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'LICENSE') do
-              Add License
-        - unless @repository.contribution_guide
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
-              Add Contribution guide
+        .btn-group.project-repo-btn-group
+          = render "projects/buttons/download"
+          = render 'projects/buttons/dropdown'
 
+        = render 'shared/notifications/button', notification_setting: @notification_setting
 - if @repository.commit
-  .content-block.second-block.white
-    %div{ class: container_class }
-      = render 'projects/last_commit', commit: @repository.commit, project: @project
+  .project-last-commit{ class: container_class }
+    = render 'projects/last_commit', commit: @repository.commit, project: @project
 
 %div{ class: container_class }
   - if @project.archived?
@@ -71,4 +82,4 @@
         Archived project! Repository is read-only
 
   %div{class: "project-show-#{default_project_view}"}
-    = render default_project_view
+    = render default_project_view
\ No newline at end of file