Merge remote-tracking branch 'origin/master' into add-filter-sort-dropdown-to-dashboard-group-pages

app/views/layouts/nav/_project.html.haml

@@ -98,6 +98,13 @@
         %span
           Wiki
+  - if project_nav_tab? :forks
+    = nav_link(controller: :forks, action: :index) do
+      = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks' do
+        = icon('code-fork fw')
+        %span
+          Forks
+
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
       = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets' do

app/views/profiles/accounts/show.html.haml

 - page_title "Account"
 - header_title page_title, profile_account_path
-- @blank_container = true
 - if current_user.ldap_user?
   .alert.alert-info

app/views/projects/blame/show.html.haml

@@ -15,12 +15,11 @@
     .file-content.blame.code.js-syntax-highlight
       %table
         - current_line = 1
-        - blame_highlighter = highlighter(@blob.name, @blob.data, nowrap: true)
-        - @blame.each do |blame_group|
+        - @blame_groups.each do |blame_group|
           %tr
             %td.blame-commit
               .commit
-                - commit = Commit.new(blame_group[:commit], @project)
+                - commit = blame_group[:commit]
                 .commit-row-title
                   %strong
                     = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark"
@@ -38,8 +37,7 @@
                 \
               - current_line += line_count
             %td.lines
-              %pre{class: 'code highlight'}
+              %pre.code.highlight
                 %code
                   - blame_group[:lines].each do |line|
-                    :preserve
-                      #{blame_highlighter.highlight(line)}
+                    #{line}

app/views/projects/blob/_text.html.haml

@@ -2,8 +2,8 @@
   .file-content.wiki
     = render_markup(blob.name, blob.data)
 - else
-  .file-content.code
-    - unless blob.empty?
-      = render 'shared/file_highlight', blob: blob
-    - else
+  - unless blob.empty?
+    = render 'shared/file_highlight', blob: blob
+  - else
+    .file-content.code
       .nothing-here-block Empty file

app/views/projects/blob/preview.html.haml

@@ -8,7 +8,7 @@
       .file-content.wiki
         = raw render_markup(@blob.name, @content)
     - else
-      .file-content.code
+      .file-content.code.js-syntax-highlight
         - unless @diff_lines.empty?
           %table.text-file
             - @diff_lines.each do |line|

app/views/projects/branches/index.html.haml

@@ -10,7 +10,7 @@
        
     .dropdown.inline
       %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.light sort:
+        %span.light
         - if @sort.present?
           = @sort.humanize
         - else

app/views/projects/buttons/_dropdown.html.haml

@@ -46,7 +46,7 @@
           - continue_params = { to:         namespace_project_new_blob_path(@project.namespace, @project, @project.default_branch || 'master'),
                                 notice:     edit_in_new_fork_notice,
                                 notice_now: edit_in_new_fork_notice_now }
-          - fork_path = namespace_project_fork_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
+          - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
                                                                                   continue:       continue_params)
           = link_to fork_path, method: :post do
             = icon('file fw')

app/views/projects/commit_statuses/_commit_status.html.haml

@@ -66,7 +66,7 @@
   %td
     .pull-right
-      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts?
+      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url
         = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
       - if current_user && can?(current_user, :manage_builds, commit_status.project)

app/views/projects/forks/index.html.haml

+.gray-content-block.top-block.clearfix.white.forks-top-block
+  .pull-left
+    - public_count = @public_forks.size
+    - protected_count = @protected_forks.size
+    - full_count_title = "#{public_count} public and #{protected_count} private"
+    == #{pluralize(@all_forks.size, 'fork')}: #{full_count_title}
+
+  .pull-right
+    .projects-search-form.fork-search-form
+      = search_field_tag :filter_projects, nil, placeholder: 'Search forks', class: 'projects-list-filter form-control',
+        spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' }
+
+      .dropdown.inline.prepend-left-10
+        %button.dropdown-toggle.btn.sort-forks{type: 'button', 'data-toggle' => 'dropdown'}
+          %span.light sort:
+          - if @sort.present?
+            = sort_options_hash[@sort]
+          - else
+            = sort_title_recently_created
+          %b.caret
+        %ul.dropdown-menu.dropdown-menu-align-right
+          %li
+            - excluded_filters = [:state, :scope, :label_name, :milestone_id, :assignee_id, :author_id]
+            = link_to page_filter_path(sort: sort_value_recently_created, without: excluded_filters) do
+              = sort_title_recently_created
+            = link_to page_filter_path(sort: sort_value_oldest_created, without: excluded_filters) do
+              = sort_title_oldest_created
+            = link_to page_filter_path(sort: sort_value_recently_updated, without: excluded_filters) do
+              = sort_title_recently_updated
+            = link_to page_filter_path(sort: sort_value_oldest_updated, without: excluded_filters) do
+              = sort_title_oldest_updated
+
+      .fork-link.inline
+        - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
+          = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'pull-right btn btn-new' do
+            = icon('code-fork fw')
+            Fork
+        - else
+          = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'pull-right btn btn-new' do
+            = icon('code-fork fw')
+            Fork
+
+
+.projects-list-holder
+  - if @public_forks.blank?
+    %ul.content-list
+      %li
+        .nothing-here-block No forks to show
+  - else
+    = render 'shared/projects/list', projects: @public_forks, use_creator_avatar: true,
+      forks: true, show_last_commit_as_description: true
+
+    - if protected_count > 0
+      %ul.projects-list.private-forks-notice
+        %li.project-row
+          = icon('lock fw', base: 'circle', class: 'fa-lg private-fork-icon')
+          %strong= pluralize(protected_count, 'private fork')
+          %span you have no access to.

app/views/projects/forks/new.html.haml

@@ -22,7 +22,7 @@
             - else
               .fork-thumbnail
-                = link_to namespace_project_fork_path(@project.namespace, @project, namespace_key: namespace.id), title: "Fork here", method: "POST", class: 'has_tooltip' do
+                = link_to namespace_project_forks_path(@project.namespace, @project, namespace_key: namespace.id), title: "Fork here", method: "POST", class: 'has_tooltip' do
                   = image_tag namespace_icon(namespace, 100)
                   .caption
                     %strong

app/views/projects/issues/show.html.haml

@@ -35,7 +35,7 @@
           Edit
   .issue-details.issuable-details
-    .detail-page-description.gray-content-block.second-block
+    .detail-page-description.content-block
       %h2.title
         = markdown escape_once(@issue.title), pipeline: :single_line
       %div
@@ -50,7 +50,7 @@
         .merge-requests
           = render 'merge_requests'
-    .gray-content-block.second-block.oneline-block
+    .content-block
       = render 'votes/votes_block', votable: @issue
     .row

app/views/projects/merge_requests/_show.html.haml

@@ -66,7 +66,7 @@
       .tab-content
         #notes.notes.tab-pane.voting_notes
-          .gray-content-block.second-block.oneline-block
+          .content-block.oneline-block
             = render 'votes/votes_block', votable: @merge_request
           .row

app/views/projects/merge_requests/show/_commits.html.haml

-.gray-content-block.middle-block.oneline-block
+.content-block.oneline-block
   = icon("sort-amount-desc")
   Most recent commits displayed first

app/views/projects/merge_requests/show/_how_to_merge.html.haml

@@ -45,6 +45,10 @@
         - unless @merge_request.can_be_merged_by?(current_user)
           %p
             Note that pushing to GitLab requires write access to this repository.
+        %p
+          %strong Tip:
+          You can also checkout merge requests locally by
+          %a{href: 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally', target: '_blank'} following these guidelines
 :javascript
   $(function(){

app/views/projects/merge_requests/show/_mr_box.html.haml

-.detail-page-description.gray-content-block.second-block
+.detail-page-description.content-block
   %h2.title
     = markdown escape_once(@merge_request.title), pipeline: :single_line

app/views/projects/milestones/show.html.haml

@@ -32,7 +32,7 @@
         = icon('pencil-square-o')
         Edit
-.detail-page-description.gray-content-block.second-block
+.detail-page-description.content-block
   %h2.title
     = markdown escape_once(@milestone.title), pipeline: :single_line
   %div
@@ -73,8 +73,8 @@
 .tab-content
   .tab-pane.active#tab-issues
-    .gray-content-block.middle-block
-      .pull-right
+    .content-block.oneline-block
+      .controls
         - if can?(current_user, :create_issue, @project)
           = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
             %i.fa.fa-plus
@@ -94,8 +94,8 @@
         = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
   .tab-pane#tab-merge-requests
-    .gray-content-block.middle-block
-      .pull-right
+    .content-block.oneline-block
+      .controls
         - if can?(current_user, :read_merge_request, @project)
           = link_to 'Browse Merge Requests', namespace_project_merge_requests_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped"
@@ -117,9 +117,8 @@
               = render 'merge_request', merge_request: merge_request
   .tab-pane#tab-participants
-    .gray-content-block.middle-block
-      .oneline
-        All participants to this milestone
+    .content-block.oneline-block
+      All participants to this milestone
     %ul.bordered-list
       - @users.each do |user|

app/views/projects/notes/discussions/_diff.html.haml

@@ -9,7 +9,7 @@
           = diff.new_path
           - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
             %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
-    .diff-content
+    .diff-content.code.js-syntax-highlight
       %table
         - note.truncated_diff_lines.each do |line|
           - type = line.type

app/views/projects/project_members/_group_members.html.haml

@@ -5,7 +5,7 @@
     %small
       (#{members.count})
     - if can?(current_user, :admin_group_member, @group)
-      .pull-right
+      .controls
         = link_to group_group_members_path(@group), class: 'btn' do
           = icon('pencil-square-o')
           Manage group members

app/views/projects/project_members/_team.html.haml

@@ -4,7 +4,7 @@
     project members
     %small
       (#{members.count})
-    .pull-right
+    .controls
       = form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form'  do
         .form-group
           = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control', spellcheck: false }

app/views/projects/project_members/index.html.haml

 - page_title "Members"
 = render "header_title"
-- @blank_container = true
 .project-members-page.prepend-top-default
   - if can?(current_user, :admin_project_member, @project)
     .panel.panel-default
       .panel-heading
         Add new user to project
-        .pull-right
+        .controls
           = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
             Import members
       .panel-body