8 files changed, 217 insertions, 160 deletions

diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index a4c226a6aad..be11d453898 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -13,22 +13,29 @@ module AvatarsHelper
     user_name = options[:user].try(:name) || options[:user_name]
     avatar_url = options[:url] || avatar_icon(options[:user] || options[:user_email], avatar_size)
     has_tooltip = options[:has_tooltip].nil? ? true : options[:has_tooltip]
-    data_attributes = {}
+    data_attributes = options[:data] || {}
     css_class = %W[avatar s#{avatar_size}].push(*options[:css_class])
 
     if has_tooltip
       css_class.push('has-tooltip')
-      data_attributes = { container: 'body' }
+      data_attributes[:container] = 'body'
     end
 
-    image_tag(
-      avatar_url,
+    if options[:lazy]
+      css_class << 'lazy'
+      data_attributes[:src] = avatar_url
+      avatar_url = LazyImageTagHelper.placeholder_image
+    end
+
+    image_options = {
+      alt:   "#{user_name}'s avatar",
+      src:   avatar_url,
+      data:  data_attributes,
       class: css_class,
-      alt: "#{user_name}'s avatar",
-      title: user_name,
-      data: data_attributes,
-      lazy: true
-    )
+      title: user_name
+    }
+
+    tag(:img, image_options)
   end
 
   def user_avatar(options = {})
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 62ac208f16a..7112c6ee470 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -79,6 +79,6 @@ module BoardsHelper
   end
 
   def boards_link_text
-    _("Board")
+    s_("IssueBoards|Board")
   end
 end
diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb
index ee1b7ed083e..e88fe6bcd7e 100644
--- a/app/helpers/breadcrumbs_helper.rb
+++ b/app/helpers/breadcrumbs_helper.rb
@@ -10,11 +10,7 @@ module BreadcrumbsHelper
   def breadcrumb_title_link
     return @breadcrumb_link if @breadcrumb_link
 
-    if controller.available_action?(:index)
-      url_for(action: "index")
-    else
-      request.path
-    end
+    request.path
   end
 
   def breadcrumb_title(title)
@@ -25,7 +21,7 @@ module BreadcrumbsHelper
 
   def breadcrumb_list_item(link)
     content_tag "li" do
-      link + icon("angle-right", class: "breadcrumbs-list-angle")
+      link + sprite_icon("angle-right", size: 8, css_class: "breadcrumbs-list-angle")
     end
   end
 
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 08e6443bd0f..ec779c1c447 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -24,9 +24,9 @@ module IconsHelper
   end
 
   def sprite_icon(icon_name, size: nil, css_class: nil)
-    css_classes = size ? "s#{size}" : nil
+    css_classes = size ? "s#{size}" : ""
     css_classes << " #{css_class}" unless css_class.blank?
-    content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{image_path('icons.svg')}##{icon_name}" } ), class: css_classes)
+    content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{image_path('icons.svg')}##{icon_name}" } ), class: css_classes.empty? ? nil : css_classes)
   end
 
   def audit_icon(names, options = {})
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index df390dd5aab..7713fb0b9f8 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -248,16 +248,25 @@ module IssuablesHelper
     Gitlab::IssuablesCountForState.new(finder)[state]
   end
 
-  def close_issuable_url(issuable)
-    issuable_url(issuable, close_reopen_params(issuable, :close))
+  def close_issuable_path(issuable)
+    issuable_path(issuable, close_reopen_params(issuable, :close))
   end
 
-  def reopen_issuable_url(issuable)
-    issuable_url(issuable, close_reopen_params(issuable, :reopen))
+  def reopen_issuable_path(issuable)
+    issuable_path(issuable, close_reopen_params(issuable, :reopen))
   end
 
-  def close_reopen_issuable_url(issuable, should_inverse = false)
-    issuable.closed? ^ should_inverse ? reopen_issuable_url(issuable) : close_issuable_url(issuable)
+  def close_reopen_issuable_path(issuable, should_inverse = false)
+    issuable.closed? ^ should_inverse ? reopen_issuable_path(issuable) : close_issuable_path(issuable)
+  end
+
+  def issuable_path(issuable, *options)
+    case issuable
+    when Issue
+      issue_path(issuable, *options)
+    when MergeRequest
+      merge_request_path(issuable, *options)
+    end
   end
 
   def issuable_url(issuable, *options)
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 5946c475835..18b9bf214a3 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -9,7 +9,7 @@ module PageLayoutHelper
     end
 
     # Segments are seperated by middot
-    @page_title.join(" \u00b7 ")
+    @page_title.join(" · ")
   end
 
   # Define or get a description for the current page
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ddeff490d3a..4c0cce54527 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -21,11 +21,14 @@ module ProjectsHelper
     classes = %W[avatar avatar-inline s#{opts[:size]}]
     classes << opts[:avatar_class] if opts[:avatar_class]
 
-    image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: classes, alt: '')
+    avatar = avatar_icon(author, opts[:size])
+    src = opts[:lazy_load] ? nil : avatar
+
+    image_tag(src, width: opts[:size], class: classes, alt: '', "data-src" => avatar)
   end
 
   def link_to_member(project, author, opts = {}, &block)
-    default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false }
+    default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false, lazy_load: false }
     opts = default_opts.merge(opts)
 
     return "(deleted)" unless author
@@ -239,8 +242,8 @@ module ProjectsHelper
     end
   end
 
-  def has_projects_or_name?(projects, params)
-    !!(params[:name] || any_projects?(projects))
+  def show_projects?(projects, params)
+    !!(params[:personal] || params[:name] || any_projects?(projects))
   end
 
   private
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index c4a73bedbcd..1b542ed2a96 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -1,34 +1,38 @@
 module SortingHelper
   def sort_options_hash
     {
-      sort_value_name => sort_title_name,
-      sort_value_name_desc => sort_title_name_desc,
-      sort_value_recently_updated => sort_title_recently_updated,
-      sort_value_oldest_updated => sort_title_oldest_updated,
+      sort_value_created_date     => sort_title_created_date,
+      sort_value_downvotes        => sort_title_downvotes,
+      sort_value_due_date         => sort_title_due_date,
+      sort_value_due_date_later   => sort_title_due_date_later,
+      sort_value_due_date_soon    => sort_title_due_date_soon,
+      sort_value_label_priority   => sort_title_label_priority,
+      sort_value_largest_group    => sort_title_largest_group,
+      sort_value_largest_repo     => sort_title_largest_repo,
+      sort_value_milestone        => sort_title_milestone,
+      sort_value_milestone_later  => sort_title_milestone_later,
+      sort_value_milestone_soon   => sort_title_milestone_soon,
+      sort_value_name             => sort_title_name,
+      sort_value_name_desc        => sort_title_name_desc,
+      sort_value_oldest_created   => sort_title_oldest_created,
+      sort_value_oldest_signin    => sort_title_oldest_signin,
+      sort_value_oldest_updated   => sort_title_oldest_updated,
       sort_value_recently_created => sort_title_recently_created,
-      sort_value_oldest_created => sort_title_oldest_created,
-      sort_value_milestone_soon => sort_title_milestone_soon,
-      sort_value_milestone_later => sort_title_milestone_later,
-      sort_value_due_date_soon => sort_title_due_date_soon,
-      sort_value_due_date_later => sort_title_due_date_later,
-      sort_value_largest_repo => sort_title_largest_repo,
-      sort_value_largest_group => sort_title_largest_group,
-      sort_value_recently_signin => sort_title_recently_signin,
-      sort_value_oldest_signin => sort_title_oldest_signin,
-      sort_value_downvotes => sort_title_downvotes,
-      sort_value_upvotes => sort_title_upvotes,
-      sort_value_priority => sort_title_priority,
-      sort_value_label_priority => sort_title_label_priority
+      sort_value_recently_signin  => sort_title_recently_signin,
+      sort_value_recently_updated => sort_title_recently_updated,
+      sort_value_popularity       => sort_title_popularity,
+      sort_value_priority         => sort_title_priority,
+      sort_value_upvotes          => sort_title_upvotes
     }
   end
 
   def projects_sort_options_hash
     options = {
-      sort_value_name => sort_title_name,
-      sort_value_latest_activity => sort_title_latest_activity,
-      sort_value_oldest_activity => sort_title_oldest_activity,
-      sort_value_recently_created => sort_title_recently_created,
-      sort_value_oldest_created => sort_title_oldest_created
+      sort_value_latest_activity  => sort_title_latest_activity,
+      sort_value_name             => sort_title_name,
+      sort_value_oldest_activity  => sort_title_oldest_activity,
+      sort_value_oldest_created   => sort_title_oldest_created,
+      sort_value_recently_created => sort_title_recently_created
     }
 
     if current_controller?('admin/projects')
@@ -40,160 +44,174 @@ module SortingHelper
 
   def member_sort_options_hash
     {
-      sort_value_access_level_asc => sort_title_access_level_asc,
+      sort_value_access_level_asc  => sort_title_access_level_asc,
       sort_value_access_level_desc => sort_title_access_level_desc,
-      sort_value_last_joined => sort_title_last_joined,
-      sort_value_oldest_joined => sort_title_oldest_joined,
-      sort_value_name => sort_title_name_asc,
-      sort_value_name_desc => sort_title_name_desc,
-      sort_value_recently_signin => sort_title_recently_signin,
-      sort_value_oldest_signin => sort_title_oldest_signin
+      sort_value_last_joined       => sort_title_last_joined,
+      sort_value_name              => sort_title_name_asc,
+      sort_value_name_desc         => sort_title_name_desc,
+      sort_value_oldest_joined     => sort_title_oldest_joined,
+      sort_value_oldest_signin     => sort_title_oldest_signin,
+      sort_value_recently_signin   => sort_title_recently_signin
     }
   end
 
   def milestone_sort_options_hash
     {
-      sort_value_name => sort_title_name_asc,
-      sort_value_name_desc => sort_title_name_desc,
-      sort_value_due_date_soon => sort_title_due_date_soon,
-      sort_value_due_date_later => sort_title_due_date_later,
-      sort_value_start_date_soon => sort_title_start_date_soon,
-      sort_value_start_date_later => sort_title_start_date_later
+      sort_value_name             => sort_title_name_asc,
+      sort_value_name_desc        => sort_title_name_desc,
+      sort_value_due_date_later   => sort_title_due_date_later,
+      sort_value_due_date_soon    => sort_title_due_date_soon,
+      sort_value_start_date_later => sort_title_start_date_later,
+      sort_value_start_date_soon  => sort_title_start_date_soon
     }
   end
 
   def branches_sort_options_hash
     {
-      sort_value_name => sort_title_name,
-      sort_value_recently_updated => sort_title_recently_updated,
-      sort_value_oldest_updated => sort_title_oldest_updated
+      sort_value_name             => sort_title_name,
+      sort_value_oldest_updated   => sort_title_oldest_updated,
+      sort_value_recently_updated => sort_title_recently_updated
     }
   end
 
   def tags_sort_options_hash
     {
-      sort_value_name => sort_title_name,
-      sort_value_recently_updated => sort_title_recently_updated,
-      sort_value_oldest_updated => sort_title_oldest_updated
+      sort_value_name             => sort_title_name,
+      sort_value_oldest_updated   => sort_title_oldest_updated,
+      sort_value_recently_updated => sort_title_recently_updated
     }
   end
 
-  def sort_title_priority
-    s_('SortOptions|Priority')
+  def sortable_item(item, path, sorted_by)
+    link_to item, path, class: sorted_by == item ? 'is-active' : ''
   end
 
-  def sort_title_label_priority
-    s_('SortOptions|Label priority')
+  # Titles.
+  def sort_title_access_level_asc
+    s_('SortOptions|Access level, ascending')
   end
 
-  def sort_title_oldest_updated
-    s_('SortOptions|Oldest updated')
+  def sort_title_access_level_desc
+    s_('SortOptions|Access level, descending')
   end
 
-  def sort_title_recently_updated
-    s_('SortOptions|Last updated')
+  def sort_title_created_date
+    s_('SortOptions|Created date')
   end
 
-  def sort_title_oldest_activity
-    s_('SortOptions|Oldest updated')
+  def sort_title_downvotes
+    s_('SortOptions|Least popular')
   end
 
-  def sort_title_latest_activity
-    s_('SortOptions|Last updated')
+  def sort_title_due_date
+    s_('SortOptions|Due date')
   end
 
-  def sort_title_oldest_created
-    s_('SortOptions|Oldest created')
+  def sort_title_due_date_later
+    s_('SortOptions|Due later')
   end
 
-  def sort_title_recently_created
-    s_('SortOptions|Last created')
+  def sort_title_due_date_soon
+    s_('SortOptions|Due soon')
   end
 
-  def sort_title_milestone_soon
-    s_('SortOptions|Milestone due soon')
+  def sort_title_label_priority
+    s_('SortOptions|Label priority')
   end
 
-  def sort_title_milestone_later
-    s_('SortOptions|Milestone due later')
+  def sort_title_largest_group
+    s_('SortOptions|Largest group')
   end
 
-  def sort_title_due_date_soon
-    s_('SortOptions|Due soon')
+  def sort_title_largest_repo
+    s_('SortOptions|Largest repository')
   end
 
-  def sort_title_due_date_later
-    s_('SortOptions|Due later')
+  def sort_title_last_joined
+    s_('SortOptions|Last joined')
   end
 
-  def sort_title_start_date_soon
-    s_('SortOptions|Start soon')
+  def sort_title_latest_activity
+    s_('SortOptions|Last updated')
   end
 
-  def sort_title_start_date_later
-    s_('SortOptions|Start later')
+  def sort_title_milestone
+    s_('SortOptions|Milestone')
+  end
+
+  def sort_title_milestone_later
+    s_('SortOptions|Milestone due later')
+  end
+
+  def sort_title_milestone_soon
+    s_('SortOptions|Milestone due soon')
   end
 
   def sort_title_name
     s_('SortOptions|Name')
   end
 
-  def sort_title_largest_repo
-    s_('SortOptions|Largest repository')
+  def sort_title_name_asc
+    s_('SortOptions|Name, ascending')
   end
 
-  def sort_title_largest_group
-    s_('SortOptions|Largest group')
+  def sort_title_name_desc
+    s_('SortOptions|Name, descending')
   end
 
-  def sort_title_recently_signin
-    s_('SortOptions|Recent sign in')
+  def sort_title_oldest_activity
+    s_('SortOptions|Oldest updated')
   end
 
-  def sort_title_oldest_signin
-    s_('SortOptions|Oldest sign in')
+  def sort_title_oldest_created
+    s_('SortOptions|Oldest created')
   end
 
-  def sort_title_downvotes
-    s_('SortOptions|Least popular')
+  def sort_title_oldest_joined
+    s_('SortOptions|Oldest joined')
   end
 
-  def sort_title_upvotes
-    s_('SortOptions|Most popular')
+  def sort_title_oldest_signin
+    s_('SortOptions|Oldest sign in')
   end
 
-  def sort_title_last_joined
-    s_('SortOptions|Last joined')
+  def sort_title_oldest_updated
+    s_('SortOptions|Oldest updated')
   end
 
-  def sort_title_oldest_joined
-    s_('SortOptions|Oldest joined')
+  def sort_title_popularity
+    s_('SortOptions|Popularity')
   end
 
-  def sort_title_access_level_asc
-    s_('SortOptions|Access level, ascending')
+  def sort_title_priority
+    s_('SortOptions|Priority')
   end
 
-  def sort_title_access_level_desc
-    s_('SortOptions|Access level, descending')
+  def sort_title_recently_created
+    s_('SortOptions|Last created')
   end
 
-  def sort_title_name_asc
-    s_('SortOptions|Name, ascending')
+  def sort_title_recently_signin
+    s_('SortOptions|Recent sign in')
   end
 
-  def sort_title_name_desc
-    s_('SortOptions|Name, descending')
+  def sort_title_recently_updated
+    s_('SortOptions|Last updated')
   end
 
-  def sort_value_last_joined
-    'last_joined'
+  def sort_title_start_date_later
+    s_('SortOptions|Start later')
   end
 
-  def sort_value_oldest_joined
-    'oldest_joined'
+  def sort_title_start_date_soon
+    s_('SortOptions|Start soon')
   end
 
+  def sort_title_upvotes
+    s_('SortOptions|Most popular')
+  end
+
+  # Values.
   def sort_value_access_level_asc
     'access_level_asc'
   end
@@ -202,88 +220,112 @@ module SortingHelper
     'access_level_desc'
   end
 
-  def sort_value_name_desc
-    'name_desc'
+  def sort_value_created_date
+    'created_date'
   end
 
-  def sort_value_priority
-    'priority'
+  def sort_value_downvotes
+    'downvotes_desc'
+  end
+
+  def sort_value_due_date
+    'due_date'
+  end
+
+  def sort_value_due_date_later
+    'due_date_desc'
+  end
+
+  def sort_value_due_date_soon
+    'due_date_asc'
   end
 
   def sort_value_label_priority
     'label_priority'
   end
 
-  def sort_value_oldest_updated
-    'updated_asc'
+  def sort_value_largest_group
+    'storage_size_desc'
   end
 
-  def sort_value_recently_updated
-    'updated_desc'
+  def sort_value_largest_repo
+    'storage_size_desc'
   end
 
-  def sort_value_oldest_activity
-    'latest_activity_asc'
+  def sort_value_last_joined
+    'last_joined'
   end
 
   def sort_value_latest_activity
     'latest_activity_desc'
   end
 
-  def sort_value_oldest_created
-    'created_asc'
+  def sort_value_milestone
+    'milestone'
   end
 
-  def sort_value_recently_created
-    'created_desc'
+  def sort_value_milestone_later
+    'milestone_due_desc'
   end
 
   def sort_value_milestone_soon
     'milestone_due_asc'
   end
 
-  def sort_value_milestone_later
-    'milestone_due_desc'
+  def sort_value_name
+    'name_asc'
   end
 
-  def sort_value_due_date_soon
-    'due_date_asc'
+  def sort_value_name_desc
+    'name_desc'
   end
 
-  def sort_value_due_date_later
-    'due_date_desc'
+  def sort_value_oldest_activity
+    'latest_activity_asc'
   end
 
-  def sort_value_start_date_soon
-    'start_date_asc'
+  def sort_value_oldest_created
+    'created_asc'
   end
 
-  def sort_value_start_date_later
-    'start_date_desc'
+  def sort_value_oldest_signin
+    'oldest_sign_in'
   end
 
-  def sort_value_name
-    'name_asc'
+  def sort_value_oldest_joined
+    'oldest_joined'
   end
 
-  def sort_value_largest_repo
-    'storage_size_desc'
+  def sort_value_oldest_updated
+    'updated_asc'
   end
 
-  def sort_value_largest_group
-    'storage_size_desc'
+  def sort_value_popularity
+    'popularity'
+  end
+
+  def sort_value_priority
+    'priority'
+  end
+
+  def sort_value_recently_created
+    'created_desc'
   end
 
   def sort_value_recently_signin
     'recent_sign_in'
   end
 
-  def sort_value_oldest_signin
-    'oldest_sign_in'
+  def sort_value_recently_updated
+    'updated_desc'
   end
 
-  def sort_value_downvotes
-    'downvotes_desc'
+  def sort_value_start_date_later
+    'start_date_desc'
+  end
+
+  def sort_value_start_date_soon
+    'start_date_asc'
   end
 
   def sort_value_upvotes