From 074fa8f2b94bbd3039da96819b5f0e615274a101 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <a.dunstone89@gmail.com>
Date: Thu, 18 Feb 2016 22:02:22 -0600
Subject: Load award emoji picker with ajax request

---
 app/assets/javascripts/awards_handler.coffee | 13 +++++++++++--
 app/controllers/autocomplete_controller.rb   |  4 ++++
 app/views/shared/emoji_menu.html.haml        |  9 +++++++++
 app/views/votes/_votes_block.html.haml       |  9 ---------
 config/routes.rb                             |  1 +
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 app/views/shared/emoji_menu.html.haml

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 360acb864f6..a0009141c27 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -1,9 +1,10 @@
 class @AwardsHandler
   constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
-    $(".add-award").click (event)->
+    $(".add-award").click (event) =>
       event.stopPropagation()
       event.preventDefault()
-      $(".emoji-menu").show()
+
+      @showEmojiMenu()
       $("#emoji_search").focus()
 
     $("html").on 'click', (event) ->
@@ -14,6 +15,14 @@ class @AwardsHandler
     @renderFrequentlyUsedBlock()
     @setupSearch()
 
+  showEmojiMenu: ->
+    if $(".emoji-menu").length
+      $(".emoji-menu").show()
+    else
+      $.get "/emoji_menu", (response) ->
+        $(".add-award").after response
+        $(".emoji-menu").show()
+
   addAward: (emoji) ->
     emoji = @normilizeEmojiName(emoji)
     @postEmoji emoji, =>
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 77c8dafc012..f1f61f0dad9 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -24,6 +24,10 @@ class AutocompleteController < ApplicationController
     render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
   end
 
+  def emoji_menu
+    render 'shared/emoji_menu', layout: false
+  end
+
   private
 
   def find_users
diff --git a/app/views/shared/emoji_menu.html.haml b/app/views/shared/emoji_menu.html.haml
new file mode 100644
index 00000000000..b66e513e4d2
--- /dev/null
+++ b/app/views/shared/emoji_menu.html.haml
@@ -0,0 +1,9 @@
+.emoji-menu
+  .emoji-menu-content
+    = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
+    - AwardEmoji.emoji_by_category.each do |category, emojis|
+      %h5= AwardEmoji::CATEGORIES[category]
+      %ul
+        - emojis.each do |emoji|
+          %li
+            = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
\ No newline at end of file
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index 91c5b7eac5e..176fd29cb57 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -9,15 +9,6 @@
     .awards-controls
       %a.add-award{"href" => "#"}
         = icon('smile-o')
-      .emoji-menu
-        .emoji-menu-content
-          = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
-          - AwardEmoji.emoji_by_category.each do |category, emojis|
-            %h5= AwardEmoji::CATEGORIES[category]
-            %ul
-              - emojis.each do |emoji|
-                %li
-                  = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
 
 - if current_user
   :javascript
diff --git a/config/routes.rb b/config/routes.rb
index 507bcbc53d7..78d39338bf2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,6 +42,7 @@ Rails.application.routes.draw do
   # Autocomplete
   get '/autocomplete/users' => 'autocomplete#users'
   get '/autocomplete/users/:id' => 'autocomplete#user'
+  get '/emoji_menu' => 'autocomplete#emoji_menu'
 
 
   # Search
-- 
cgit v1.2.1


From b80df0873524825a3dedc9d35427941db94c8ab7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <a.dunstone89@gmail.com>
Date: Fri, 19 Feb 2016 07:32:20 -0600
Subject: Add timeout for ajax call in award emoji steps; update focus in award
 picker

---
 app/assets/javascripts/awards_handler.coffee | 3 ++-
 features/steps/project/issues/award_emoji.rb | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index a0009141c27..8e0e64b8949 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -5,7 +5,6 @@ class @AwardsHandler
       event.preventDefault()
 
       @showEmojiMenu()
-      $("#emoji_search").focus()
 
     $("html").on 'click', (event) ->
       if !$(event.target).closest(".emoji-menu").length
@@ -18,10 +17,12 @@ class @AwardsHandler
   showEmojiMenu: ->
     if $(".emoji-menu").length
       $(".emoji-menu").show()
+      $("#emoji_search").focus()
     else
       $.get "/emoji_menu", (response) ->
         $(".add-award").after response
         $(".emoji-menu").show()
+        $("#emoji_search").focus()
 
   addAward: (emoji) ->
     emoji = @normilizeEmojiName(emoji)
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 93cf608cc62..ff9677ba972 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'The search field is focused' do
+    sleep 0.8
     page.evaluate_script("document.activeElement.id").should eq "emoji_search"
   end
 end
-- 
cgit v1.2.1


From 358e5ed1c34f094e266c937180ddd2b7d9959a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Fri, 19 Feb 2016 20:48:29 -0500
Subject: Fix look of tooltip for Revert button.

---
 app/helpers/commits_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 7ff539118d3..a09e91578b6 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -130,7 +130,7 @@ module CommitsHelper
 
     if can_collaborate_with_project?
       content_tag :span, 'data-toggle' => 'modal', 'data-target' => '#modal-revert-commit' do
-        link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class}"
+        link_to 'Revert', '#modal-revert-commit', 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip, class: "btn btn-default btn-grouped btn-#{btn_class}"
       end
     elsif can?(current_user, :fork_project, @project)
       continue_params = {
@@ -142,7 +142,7 @@ module CommitsHelper
         namespace_key: current_user.namespace.id,
         continue: continue_params)
 
-      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', title: tooltip
+      link_to 'Revert', fork_path, class: 'btn btn-grouped btn-close', method: :post, 'data-toggle' => 'tooltip', 'data-container' => 'body', title: tooltip
     end
   end
 
-- 
cgit v1.2.1


From 7bb378b33d1f02cbb9b09f0987d1d01cd6316671 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <a.dunstone89@gmail.com>
Date: Mon, 22 Feb 2016 20:16:00 -0600
Subject: Create EmojisController

---
 app/assets/javascripts/awards_handler.coffee | 2 +-
 app/controllers/autocomplete_controller.rb   | 4 ----
 app/controllers/emojis_controller.rb         | 5 +++++
 app/views/emojis/index.html.haml             | 9 +++++++++
 app/views/shared/emoji_menu.html.haml        | 9 ---------
 config/routes.rb                             | 3 ++-
 6 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 app/controllers/emojis_controller.rb
 create mode 100644 app/views/emojis/index.html.haml
 delete mode 100644 app/views/shared/emoji_menu.html.haml

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 8e0e64b8949..8f89d3e61a2 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -19,7 +19,7 @@ class @AwardsHandler
       $(".emoji-menu").show()
       $("#emoji_search").focus()
     else
-      $.get "/emoji_menu", (response) ->
+      $.get "/emojis", (response) ->
         $(".add-award").after response
         $(".emoji-menu").show()
         $("#emoji_search").focus()
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index f1f61f0dad9..77c8dafc012 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -24,10 +24,6 @@ class AutocompleteController < ApplicationController
     render json: @user, only: [:name, :username, :id], methods: [:avatar_url]
   end
 
-  def emoji_menu
-    render 'shared/emoji_menu', layout: false
-  end
-
   private
 
   def find_users
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb
new file mode 100644
index 00000000000..693e2cc4822
--- /dev/null
+++ b/app/controllers/emojis_controller.rb
@@ -0,0 +1,5 @@
+class EmojisController < ApplicationController
+  def index
+    render :index, layout: false
+  end
+end
diff --git a/app/views/emojis/index.html.haml b/app/views/emojis/index.html.haml
new file mode 100644
index 00000000000..b66e513e4d2
--- /dev/null
+++ b/app/views/emojis/index.html.haml
@@ -0,0 +1,9 @@
+.emoji-menu
+  .emoji-menu-content
+    = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
+    - AwardEmoji.emoji_by_category.each do |category, emojis|
+      %h5= AwardEmoji::CATEGORIES[category]
+      %ul
+        - emojis.each do |emoji|
+          %li
+            = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
\ No newline at end of file
diff --git a/app/views/shared/emoji_menu.html.haml b/app/views/shared/emoji_menu.html.haml
deleted file mode 100644
index b66e513e4d2..00000000000
--- a/app/views/shared/emoji_menu.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-.emoji-menu
-  .emoji-menu-content
-    = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
-    - AwardEmoji.emoji_by_category.each do |category, emojis|
-      %h5= AwardEmoji::CATEGORIES[category]
-      %ul
-        - emojis.each do |emoji|
-          %li
-            = emoji_icon(emoji["name"], emoji["unicode"], emoji["aliases"])
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 78d39338bf2..e50f2bc5dee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,8 +42,9 @@ Rails.application.routes.draw do
   # Autocomplete
   get '/autocomplete/users' => 'autocomplete#users'
   get '/autocomplete/users/:id' => 'autocomplete#user'
-  get '/emoji_menu' => 'autocomplete#emoji_menu'
 
+  # Emojis
+  resources :emojis, only: :index
 
   # Search
   get 'search' => 'search#show'
-- 
cgit v1.2.1


From 9fd220b30cee13d5f6e61daf3293f7e6d4e6aea3 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 11:18:31 +0000
Subject: Changed padding & background color for highlighted notes

Closes #12453
---
 app/assets/stylesheets/framework/timeline.scss  | 2 +-
 app/assets/stylesheets/framework/variables.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 47b843e5e3d..b96b3e06465 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,7 +5,7 @@
   padding: 0;
 
   .timeline-entry {
-    padding: $gl-padding 0;
+    padding: $gl-padding $gl-btn-padding;
     border-color: $table-border-color;
     color: $gl-gray;
     border-bottom: 1px solid $border-white-light;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index b8386362637..364d06d6b61 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -1,4 +1,4 @@
-$hover: #faf9f9;
+$hover: #f4f8fe;
 $gl-text-color: #54565B;
 $gl-text-green: #4A2;
 $gl-text-red: #D12F19;
-- 
cgit v1.2.1


From 7b2f3a6727e6ed190928a6bc42df0e3cf3bfdf57 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 15:11:37 +0000
Subject: Correctly aligned buttons vertical in gray-content-block

Closes #12790
---
 app/assets/stylesheets/framework/blocks.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index bd89cc7dc1d..d7e4153ddc0 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -66,7 +66,7 @@
   }
 
   .oneline {
-    line-height: 42px;
+    line-height: 35px;
   }
 
   > p:last-child {
-- 
cgit v1.2.1


From 623cd239036694cda87de4851b57b118e9c76e22 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 23 Feb 2016 07:25:37 -0800
Subject: Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.

Conflicts:
	Gemfile.lock
---
 Gemfile             |  2 ++
 Gemfile.lock        |  2 ++
 config/newrelic.yml | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 config/newrelic.yml

diff --git a/Gemfile b/Gemfile
index 1602ef871c7..44a6010d166 100644
--- a/Gemfile
+++ b/Gemfile
@@ -303,6 +303,8 @@ group :production do
   gem "gitlab_meta", '7.0'
 end
 
+gem "newrelic_rpm", '~> 3.14'
+
 gem 'octokit', '~> 3.8.0'
 
 gem "mail_room", "~> 0.6.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4681adf2bd0..46e178c5ffd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -479,6 +479,7 @@ GEM
     net-ldap (0.12.1)
     net-ssh (3.0.1)
     netrc (0.11.0)
+    newrelic_rpm (3.14.1.311)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nprogress-rails (0.1.6.7)
@@ -960,6 +961,7 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
   nokogiri (~> 1.6.7, >= 1.6.7.2)
+  newrelic_rpm (~> 3.14)
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)
diff --git a/config/newrelic.yml b/config/newrelic.yml
new file mode 100644
index 00000000000..9ef922a38d9
--- /dev/null
+++ b/config/newrelic.yml
@@ -0,0 +1,16 @@
+# New Relic configuration file
+#
+# This file is here to make sure the New Relic gem stays
+# quiet by default.
+#
+# To enable and configure New Relic, please use
+# environment variables, e.g. NEW_RELIC_ENABLED=true
+
+production:
+  enabled: false
+
+development:
+  enabled: false
+
+test:
+  enabled: false
-- 
cgit v1.2.1


From 647eccd1fa132a5c5d196178e6a73dcf178ac354 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 16:13:43 +0000
Subject: changed variable name  to -hover

---
 app/assets/stylesheets/framework/files.scss                  | 2 +-
 app/assets/stylesheets/framework/jquery.scss                 | 4 ++--
 app/assets/stylesheets/framework/lists.scss                  | 2 +-
 app/assets/stylesheets/framework/timeline.scss               | 2 +-
 app/assets/stylesheets/framework/tw_bootstrap_variables.scss | 2 +-
 app/assets/stylesheets/framework/variables.scss              | 2 +-
 app/assets/stylesheets/pages/tree.scss                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index c7f3604850d..07907e6e5a6 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -158,7 +158,7 @@
           }
 
           &:hover {
-            background: $hover;
+            background: $row-hover;
           }
         }
       }
diff --git a/app/assets/stylesheets/framework/jquery.scss b/app/assets/stylesheets/framework/jquery.scss
index d6cd78813c0..0cdcd923b3c 100644
--- a/app/assets/stylesheets/framework/jquery.scss
+++ b/app/assets/stylesheets/framework/jquery.scss
@@ -48,8 +48,8 @@
 
   .ui-state-hover,
   .ui-state-focus {
-    border: 1px solid $hover;
-    background: $hover;
+    border: 1px solid $row-hover;
+    background: $row-hover;
     color: #333;
   }
 }
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 5c65383ec1a..354392d5ec3 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -38,7 +38,7 @@
     &.smoke { background-color: $background-color; }
 
     &:hover {
-      background: $hover;
+      background: $row-hover;
     }
 
     &:last-child {
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index b96b3e06465..aa244fe548d 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -11,7 +11,7 @@
     border-bottom: 1px solid $border-white-light;
 
     &:target {
-      background: $hover;
+      background: $row-hover;
     }
 
     &:last-child {
diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
index 33270388e64..b1b8295411b 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -70,7 +70,7 @@ $pagination-bg:                        #fff;
 $pagination-border:                    $border-color;
 
 $pagination-hover-color:               $gl-gray;
-$pagination-hover-bg:                  $hover;
+$pagination-hover-bg:                  $row-hover;
 $pagination-hover-border:              $border-color;
 
 $pagination-active-color:              $blue-dark;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 364d06d6b61..4888854625a 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -1,4 +1,4 @@
-$hover: #f4f8fe;
+$row-hover: #f4f8fe;
 $gl-text-color: #54565B;
 $gl-text-green: #4A2;
 $gl-text-red: #D12F19;
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index c7411617cb3..ef63b010600 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -21,7 +21,7 @@
 
       &:hover {
         td {
-          background: $hover;
+          background: $row-hover;
         }
         cursor: pointer;
       }
-- 
cgit v1.2.1


From 0267954403a60dd03b438f855320aeb1a7926e09 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 4 Feb 2016 13:05:40 -0500
Subject: Fix group projects styles

Makes new project button visible when no projects are available.
Fixes #13193
---
 app/assets/stylesheets/framework/common.scss | 16 ++++++++++++++++
 app/views/groups/_projects.html.haml         | 11 ++++++-----
 app/views/groups/show.html.haml              |  7 +++----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 9ecb547b64f..de58b35be9e 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -398,3 +398,19 @@ table {
   margin-right: -$gl-padding;
   border-top: 1px solid $border-color;
 }
+
+.search-area {
+  display: block;
+  border-bottom: 1px solid $table-border-color;
+  height: 50px;
+  
+  .search-controls {
+    float: right;
+
+    input[type='search'] {
+      float: left;
+      width: auto;
+      margin-right: 10px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 9c16ab7e30f..209729dc7ee 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,11 +1,12 @@
 .top-area
   .nav-controls
     = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control projects-list-filter', spellcheck: false, id: 'project-filter-form-field'
-    - if current_user && current_user.can_create_project?
-      = link_to new_project_path, class: 'btn btn-new' do
-        = icon('plus')
-        New Project
+      - if @projects.present?
+        = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
+      - if can? current_user, :create_projects, @group
+        = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
+          = icon('plus')
+          New Project
 
 .projects-list-holder
   = render 'shared/projects/list', projects: @projects, projects_limit: 20, stars: false, skip_namespace: true
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index a0ba11b11a1..6148d8cb3d2 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -32,10 +32,9 @@
     %li.active
       = link_to "#activity", 'data-toggle' => 'tab' do
         Activity
-    - if @projects.present?
-      %li
-        = link_to "#projects", 'data-toggle' => 'tab' do
-          Projects
+    %li
+      = link_to "#projects", 'data-toggle' => 'tab' do
+        Projects
 
 - if can?(current_user, :read_group, @group)
   %div{ class: container_class }
-- 
cgit v1.2.1


From b2604f566d785fd5468c9e9fdb1d1a8a8ed68e99 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 23 Feb 2016 16:30:02 -0500
Subject: Re-use existing top area elements

---
 app/assets/stylesheets/framework/common.scss | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index de58b35be9e..9ecb547b64f 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -398,19 +398,3 @@ table {
   margin-right: -$gl-padding;
   border-top: 1px solid $border-color;
 }
-
-.search-area {
-  display: block;
-  border-bottom: 1px solid $table-border-color;
-  height: 50px;
-  
-  .search-controls {
-    float: right;
-
-    input[type='search'] {
-      float: left;
-      width: auto;
-      margin-right: 10px;
-    }
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.1


From bb0f5be077edb4c49732f451592755f3c5369e5b Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Tue, 23 Feb 2016 12:39:53 -0700
Subject: Improve the formatting for the user page bio

- Separates the User page bio from the username and account creation
date.
- Separates the pseudo-selector adding a Middle Dot out from the
`profile-link-holder` class and into a `middle-dot-divider` class.

Resolves #13406.

See merge request !2827.
---
 CHANGELOG                                 |  1 +
 app/assets/stylesheets/pages/profile.scss | 21 +++++++++++++++------
 app/views/users/show.html.haml            | 26 ++++++++++++++------------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d3280c5d0a1..a0b8bf2bee6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.6.0 (unreleased)
+  - Improve the formatting for the user page bio (Connor Shea)
   - Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
 
 v 8.5.0
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 95fc26a608a..4767c65d9a7 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -51,9 +51,17 @@
 .profile-link-holder {
   display: inline;
 
+  a {
+    color: $blue-dark;
+    text-decoration: none;
+  }
+}
+
+// Middle dot divider between each element in a list of items.
+.middle-dot-divider {
   &:after {
-    content: "\00B7";
-    padding: 0px 6px;
+    content: "\00B7"; // Middle Dot
+    padding: 0 6px;
     font-weight: bold;
   }
 
@@ -63,9 +71,10 @@
       padding: 0;
     }
   }
+}
 
-  a {
-    color: $blue-dark;
-    text-decoration: none;
-  }
+.profile-user-bio {
+  // Limits the width of the user bio for readability.
+  max-width: 750px;
+  margin: auto;
 }
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 3bfd781e51d..d109635fa1e 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -35,35 +35,37 @@
     = @user.name
 
   .cover-desc
-    %span
-      @#{@user.username}.
-    - if @user.bio.present?
-      %span
-        #{@user.bio}.
-    %span
+    %span.middle-dot-divider
+      @#{@user.username}
+    %span.middle-dot-divider
       Member since #{@user.created_at.to_s(:medium)}
+  
+  - if @user.bio.present?
+    .cover-desc
+      %p.profile-user-bio
+        = @user.bio
 
   .cover-desc
     - unless @user.public_email.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = link_to @user.public_email, "mailto:#{@user.public_email}"
     - unless @user.skype.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = link_to "skype:#{@user.skype}", title: "Skype" do
           = icon('skype')
     - unless @user.linkedin.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = link_to "https://www.linkedin.com/in/#{@user.linkedin}", title: "LinkedIn" do
           = icon('linkedin-square')
     - unless @user.twitter.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = link_to "https://twitter.com/#{@user.twitter}", title: "Twitter" do
           = icon('twitter-square')
     - unless @user.website_url.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = link_to @user.short_website_url, @user.full_website_url
     - unless @user.location.blank?
-      .profile-link-holder
+      .profile-link-holder.middle-dot-divider
         = icon('map-marker')
         = @user.location
 
-- 
cgit v1.2.1


From 798c220037f9bff54bae1afd853b367224f2cdaf Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 23 Feb 2016 20:04:20 -0500
Subject: Initialize navigation shortcuts on project's files page

---
 app/assets/javascripts/dispatcher.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 4c6cf3417e8..89f1993797f 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -90,6 +90,7 @@ class Dispatcher
       when 'groups:new', 'groups:edit', 'admin:groups:edit', 'admin:groups:new'
         new GroupAvatar()
       when 'projects:tree:show'
+        shortcut_handler = new ShortcutsNavigation()
         new TreeView()
       when 'projects:find_file:show'
         shortcut_handler = true
-- 
cgit v1.2.1


From 476a8049691951c4e1259cdbb164bbf1fca2bd1e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <a.dunstone89@gmail.com>
Date: Tue, 23 Feb 2016 19:37:15 -0600
Subject: Update award_emoji test

---
 app/controllers/emojis_controller.rb         | 3 ++-
 features/steps/project/issues/award_emoji.rb | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb
index 693e2cc4822..1bec5a7d27f 100644
--- a/app/controllers/emojis_controller.rb
+++ b/app/controllers/emojis_controller.rb
@@ -1,5 +1,6 @@
 class EmojisController < ApplicationController
+  layout false
+
   def index
-    render :index, layout: false
   end
 end
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index ff9677ba972..277c63914d1 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -96,7 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'The search field is focused' do
-    sleep 0.8
-    page.evaluate_script("document.activeElement.id").should eq "emoji_search"
+    expect(page).to have_selector('#emoji_search')
+    expect(page.evaluate_script('document.activeElement.id')).to eq('emoji_search')
   end
 end
-- 
cgit v1.2.1


From 30b56fb017f29b2f49335ba4791debc063bb7607 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 13:29:36 +0000
Subject: Treats activity tabs as single select

Fixes #8092
---
 app/assets/javascripts/activities.js.coffee | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
index 3b6b453ac51..0f51926cbdc 100644
--- a/app/assets/javascripts/activities.js.coffee
+++ b/app/assets/javascripts/activities.js.coffee
@@ -1,7 +1,7 @@
 class @Activities
   constructor: ->
     Pager.init 20, true
-    $(".event-filter a").bind "click", (event) =>
+    $(".event-filter-link").bind "click", (event) =>
       event.preventDefault()
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
@@ -12,18 +12,10 @@ class @Activities
 
 
   toggleFilter: (sender) ->
-    sender.closest('li').toggleClass "active"
+    $('.event-filter .active').removeClass "active"
     event_filters = $.cookie("event_filter")
     filter = sender.attr("id").split("_")[0]
-    if event_filters
-      event_filters = event_filters.split(",")
-    else
-      event_filters = new Array()
+    $.cookie "event_filter", (if event_filters isnt filter then filter else ""), { path: '/' }
 
-    index = event_filters.indexOf(filter)
-    if index is -1
-      event_filters.push filter
-    else
-      event_filters.splice index, 1
-
-    $.cookie "event_filter", event_filters.join(","), { path: '/' }
+    if event_filters isnt filter
+      sender.closest('li').toggleClass "active"
-- 
cgit v1.2.1


From b82569e5eaa5c46215c092fb23dd946a9d59d734 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 15:59:51 +0000
Subject: fixed tests

---
 features/dashboard/event_filters.feature | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature
index 96399ea21a6..8c3ff64164f 100644
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
@@ -43,10 +43,16 @@ Feature: Event Filters
     And I should not see new member event
     When I click "team" event filter
     And I visit dashboard activity page
-    Then I should see push event
+    Then I should not see push event
     And I should see new member event
     And I should not see merge request event
     When I click "push" event filter
-    Then I should not see push event
-    And I should see new member event
+    And I visit dashboard activity page
+    Then I should see push event
+    And I should not see new member event
     And I should not see merge request event
+    When I click "merge" event filter
+    And I visit dashboard activity page
+    Then I should see merge request event
+    And I should not see push event
+    And I should not see new member event
-- 
cgit v1.2.1


From 74d87db977384f73e496a5851e7b8c2fd2333f23 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 23 Feb 2016 17:28:12 +0000
Subject: changed bind to on for activity link click event

---
 app/assets/javascripts/activities.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee
index 0f51926cbdc..5092e824e65 100644
--- a/app/assets/javascripts/activities.js.coffee
+++ b/app/assets/javascripts/activities.js.coffee
@@ -1,7 +1,7 @@
 class @Activities
   constructor: ->
     Pager.init 20, true
-    $(".event-filter-link").bind "click", (event) =>
+    $(".event-filter-link").on "click", (event) =>
       event.preventDefault()
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
-- 
cgit v1.2.1


From fe6f17ceda53c83151cb1694568063db883589ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 24 Feb 2016 13:40:40 +0100
Subject: Add 8.5.1 in CHANGELOG

---
 CHANGELOG | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a0b8bf2bee6..4abe86f8ced 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,24 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.6.0 (unreleased)
   - Improve the formatting for the user page bio (Connor Shea)
+
+v 8.5.1
+  - Fix group projects styles
   - Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
+  - Fix a set of small UI glitches in project, profile, and wiki pages
+  - Restrict permissions on public/uploads
+  - Fix the merge request side-by-side view after loading diff results
+  - Fix the look of tooltip for the "Revert" button
+  - Add when the Builds & Runners API changes got introduced
+  - Fix error 500 on some merged merge requests
+  - Fix an issue causing the content of the issuable sidebar to disappear
+  - Fix error 500 when trying to mark an already done todo as "done"
+  - Fix an issue where MRs weren't sortable
+  - Issues can now be dragged & dropped into empty milestone lists. This is also
+  possible with MRs
+  - Changed padding & background color for highlighted notes
+  - Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
+  - Update sentry-raven gem to 0.15.6
 
 v 8.5.0
   - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
-- 
cgit v1.2.1