From ccc929d75d1f34accc4c7a6604c26cac6113a18c Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 31 Mar 2016 11:50:00 -0500
Subject: CSS tweaks

- Use colors according to design
- Fix search input' width
---
 app/assets/stylesheets/framework/variables.scss | 8 ++++----
 app/assets/stylesheets/pages/search.scss        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index bb49ae396c7..b86dbcb04b6 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -199,11 +199,11 @@ $award-emoji-new-btn-icon-color: #dcdcdc;
 /*
  * Search Box
  */
-$search-input-border-color: $dropdown-input-focus-border;
+$search-input-border-color: rgba(#4688f1, .8);
 $search-input-focus-shadow-color: $dropdown-input-focus-shadow;
-$search-input-width: $dropdown-width;
+$search-input-width: 244px;
 $location-badge-color: #aaa;
 $location-badge-bg: $gray-normal;
+$location-badge-active-bg: #4f91f8;
 $location-icon-color: #e7e9ed;
-$location-active-color: $gl-text-color;
-$location-active-bg: $search-input-border-color;
+$location-icon-active-color: #807e7e;
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 3c74d25beb0..9274796233b 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -135,13 +135,13 @@
 
     .location-badge {
       @include transition(all .15s);
-      background-color: $location-active-bg;
+      background-color: $location-badge-active-bg;
       color: $white-light;
     }
 
     .search-input-wrap {
       i {
-        color: $location-active-color;
+        color: $location-icon-active-color;
       }
     }
 
-- 
cgit v1.2.1


From e3a983050714aa54a3c7911666cdd0abbc36e57a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 31 Mar 2016 15:28:45 -0500
Subject: Skip default behaviour if we are clicking a result for the same
 location

---
 app/assets/javascripts/gl_dropdown.js.coffee         | 2 +-
 app/assets/javascripts/search_autocomplete.js.coffee | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 0fea2a69cb7..e4df7d46d51 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -174,7 +174,7 @@ class GitLabDropdown
         selected = self.rowClicked $(@)
 
         if self.options.clicked
-          self.options.clicked(selected)
+          self.options.clicked(selected, e)
 
   # Finds an element inside wrapper element
   getElement: (selector) ->
diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 030655491bf..2656c6e30a2 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -62,6 +62,8 @@ class @SearchAutocomplete
         search:
           fields: ['text']
         data: @getData.bind(@)
+        selectable: true
+        clicked: @onClick.bind(@)
 
   getData: (term, callback) ->
     _this = @
@@ -268,3 +270,9 @@ class @SearchAutocomplete
               <li><a class='dropdown-menu-empty-link is-focused'>Loading...</a></li>
             </ul>"
     @dropdownContent.html(html)
+
+  onClick: (item, e) ->
+    if location.pathname.indexOf(item.url) isnt -1
+      e.preventDefault()
+      @disableAutocomplete()
+      @searchInput.val('')
-- 
cgit v1.2.1


From ff676333d0d257869a917a5e48e9717d219b8311 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 31 Mar 2016 19:28:17 -0500
Subject: Add current element and event as params to clicked callback

---
 app/assets/javascripts/gl_dropdown.js.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index e4df7d46d51..d447013f637 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -171,10 +171,11 @@ class GitLabDropdown
         selector = ".dropdown-page-one .dropdown-content a"
 
       @dropdown.on "click", selector, (e) ->
-        selected = self.rowClicked $(@)
+        $el = $(@)
+        selected = self.rowClicked $el
 
         if self.options.clicked
-          self.options.clicked(selected, e)
+          self.options.clicked(selected, $el, e)
 
   # Finds an element inside wrapper element
   getElement: (selector) ->
-- 
cgit v1.2.1


From ab42560ea6c2fade09b8436a893bf4a269e67c39 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 31 Mar 2016 19:28:41 -0500
Subject: Return selected object if toggleLabel option is not defined

---
 app/assets/javascripts/gl_dropdown.js.coffee | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index d447013f637..ca8d9a16940 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -352,6 +352,8 @@ class GitLabDropdown
       # Toggle the dropdown label
       if @options.toggleLabel
         $(@el).find(".dropdown-toggle-text").text @options.toggleLabel
+      else
+        selectedObject
     else
       if !value?
         field.remove()
-- 
cgit v1.2.1


From 824fecb728ae7534b8ef56aaa6679814f3924cd5 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 31 Mar 2016 19:31:01 -0500
Subject: Bring back search context when chosing the same project/group

---
 .../javascripts/search_autocomplete.js.coffee      | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 2656c6e30a2..564fb265b9d 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -104,6 +104,8 @@ class @SearchAutocomplete
             lastCategory = suggestion.category
 
           data.push
+            id: "#{suggestion.category.toLowerCase()}-#{suggestion.id}"
+            category: suggestion.category
             text: suggestion.label
             url: suggestion.url
 
@@ -271,8 +273,27 @@ class @SearchAutocomplete
             </ul>"
     @dropdownContent.html(html)
 
-  onClick: (item, e) ->
+  onClick: (item, $el, e) ->
     if location.pathname.indexOf(item.url) isnt -1
       e.preventDefault()
+      if not @badgePresent
+        if item.category is 'Projects'
+          @projectInputEl.val(item.id)
+          @addLocationBadge(
+            value: 'This project'
+          )
+
+        if item.category is 'Groups'
+          @groupInputEl.val(item.id)
+          @addLocationBadge(
+            value: 'This group'
+          )
+
+      $el.removeClass('is-active')
       @disableAutocomplete()
-      @searchInput.val('')
+      @searchInput.val('').focus()
+
+      # We need to wait because of @skipBlurEvent
+      setTimeout( =>
+        @onSearchInputFocus()
+      , 200)
-- 
cgit v1.2.1


From deca9fc6266dfd5588b23f64157ddb05e5713412 Mon Sep 17 00:00:00 2001
From: Alessio Biancalana <dottorblaster@gmail.com>
Date: Sat, 2 Apr 2016 14:44:50 +0200
Subject: Added bottom margin to CLI instructions

---
 app/assets/stylesheets/pages/projects.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 4e6aa8cd1a6..61150746c7d 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -315,7 +315,7 @@ pre.light-well {
 }
 
 .git-empty {
-  margin: 0 7px;
+  margin: 0 7px 7px;
 
   h5 {
     color: #5c5d5e;
-- 
cgit v1.2.1


From 261c8e765f5b13dd627fcda5ca1ae263ecfad0c8 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Thu, 31 Mar 2016 23:33:32 +0100
Subject: fix missing filters on status tab when user swithches to another
 state

---
 app/assets/javascripts/issues.js.coffee   | 15 ++++++++++++++
 app/assets/javascripts/lib/url_utility.js | 33 +++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 app/assets/javascripts/lib/url_utility.js

(limited to 'app')

diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee
index b1479bfb449..8d069a209d2 100644
--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -26,6 +26,20 @@
 
     $(".selected_issue").bind "change", Issues.checkChanged
 
+  # Update state filters if present in page
+  updateStateFilters: ->
+    stateFilters =  $('.issues-state-filters')
+    newParams = {}
+    paramKeys = ['author_id', 'label_name', 'milestone_title', 'assignee_id', 'issue_search']
+
+    for paramKey in paramKeys
+      newParams[paramKey] = getUrlParameter(paramKey) or ''
+
+    if stateFilters.length
+      stateFilters.find('a').each ->
+        initialUrl = $(this).attr 'href'
+        $(this).attr 'href', mergeUrlParams(newParams, initialUrl)
+
   # Make sure we trigger ajax request only after user stop typing
   initSearch: ->
     @timer = null
@@ -54,6 +68,7 @@
         # Change url so if user reload a page - search results are saved
         history.replaceState {page: issuesUrl}, document.title, issuesUrl
         Issues.reload()
+        Issues.updateStateFilters()
       dataType: "json"
 
   checkChanged: ->
diff --git a/app/assets/javascripts/lib/url_utility.js b/app/assets/javascripts/lib/url_utility.js
new file mode 100644
index 00000000000..5fa3a4c69d3
--- /dev/null
+++ b/app/assets/javascripts/lib/url_utility.js
@@ -0,0 +1,33 @@
+function getUrlParameter(sParam) {
+  var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+      sURLVariables = sPageURL.split('&'),
+      sParameterName,
+      i;
+
+  for (i = 0; i < sURLVariables.length; i++) {
+    sParameterName = sURLVariables[i].split('=');
+
+    if (sParameterName[0] === sParam) {
+      return sParameterName[1] === undefined ? true : sParameterName[1];
+    }
+  }
+}
+
+/**
+ * @param {Object} params - url keys and value to merge
+ * @param {String} url
+ */
+function mergeUrlParams(params, url){
+  var newUrl = decodeURIComponent(url);
+
+  Object.keys(params).forEach(function(paramName) {
+    var pattern = new RegExp('\\b('+paramName+'=).*?(&|$)')
+    if (url.search(pattern) >= 0){
+      newUrl = newUrl.replace(pattern,'$1' + params[paramName] + '$2');
+    } else {
+      newUrl = newUrl + (newUrl.indexOf('?') > 0 ? '&' : '?') + paramName + '=' + params[paramName]
+    }
+  });
+
+  return newUrl;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From db8836ca84ab86dc39b4d8b3282603c724a78e67 Mon Sep 17 00:00:00 2001
From: Arinde Eniola <eniolaarinde1@gmail.com>
Date: Sat, 2 Apr 2016 16:56:31 +0100
Subject: attach the utitlity function to the global scope with some changes

---
 app/assets/javascripts/issues.js.coffee          |  4 +--
 app/assets/javascripts/lib/url_utility.js        | 33 ------------------------
 app/assets/javascripts/lib/url_utility.js.coffee | 31 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 app/assets/javascripts/lib/url_utility.js
 create mode 100644 app/assets/javascripts/lib/url_utility.js.coffee

(limited to 'app')

diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee
index 8d069a209d2..0d9f2094c2a 100644
--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -33,12 +33,12 @@
     paramKeys = ['author_id', 'label_name', 'milestone_title', 'assignee_id', 'issue_search']
 
     for paramKey in paramKeys
-      newParams[paramKey] = getUrlParameter(paramKey) or ''
+      newParams[paramKey] = gl.utils.getUrlParameter(paramKey) or ''
 
     if stateFilters.length
       stateFilters.find('a').each ->
         initialUrl = $(this).attr 'href'
-        $(this).attr 'href', mergeUrlParams(newParams, initialUrl)
+        $(this).attr 'href', gl.utils.mergeUrlParams(newParams, initialUrl)
 
   # Make sure we trigger ajax request only after user stop typing
   initSearch: ->
diff --git a/app/assets/javascripts/lib/url_utility.js b/app/assets/javascripts/lib/url_utility.js
deleted file mode 100644
index 5fa3a4c69d3..00000000000
--- a/app/assets/javascripts/lib/url_utility.js
+++ /dev/null
@@ -1,33 +0,0 @@
-function getUrlParameter(sParam) {
-  var sPageURL = decodeURIComponent(window.location.search.substring(1)),
-      sURLVariables = sPageURL.split('&'),
-      sParameterName,
-      i;
-
-  for (i = 0; i < sURLVariables.length; i++) {
-    sParameterName = sURLVariables[i].split('=');
-
-    if (sParameterName[0] === sParam) {
-      return sParameterName[1] === undefined ? true : sParameterName[1];
-    }
-  }
-}
-
-/**
- * @param {Object} params - url keys and value to merge
- * @param {String} url
- */
-function mergeUrlParams(params, url){
-  var newUrl = decodeURIComponent(url);
-
-  Object.keys(params).forEach(function(paramName) {
-    var pattern = new RegExp('\\b('+paramName+'=).*?(&|$)')
-    if (url.search(pattern) >= 0){
-      newUrl = newUrl.replace(pattern,'$1' + params[paramName] + '$2');
-    } else {
-      newUrl = newUrl + (newUrl.indexOf('?') > 0 ? '&' : '?') + paramName + '=' + params[paramName]
-    }
-  });
-
-  return newUrl;
-}
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/url_utility.js.coffee
new file mode 100644
index 00000000000..abd556e0b4e
--- /dev/null
+++ b/app/assets/javascripts/lib/url_utility.js.coffee
@@ -0,0 +1,31 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.getUrlParameter = (sParam) ->
+    sPageURL = decodeURIComponent(window.location.search.substring(1))
+    sURLVariables = sPageURL.split('&')
+    sParameterName = undefined
+    i = 0
+    while i < sURLVariables.length
+      sParameterName = sURLVariables[i].split('=')
+      if sParameterName[0] is sParam
+        return if sParameterName[1] is undefined then true else sParameterName[1]
+      i++
+
+  # #
+  #  @param {Object} params - url keys and value to merge
+  #  @param {String} url
+  # #
+  w.gl.utils.mergeUrlParams = (params, url) ->
+    newUrl = decodeURIComponent(url)
+    for paramName, paramValue of params
+      pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
+      if url.search(pattern) >= 0
+        newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
+      else
+        newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
+    newUrl
+
+) window
-- 
cgit v1.2.1


From 0ab6b82a234f6dcc208591724036f152eca0e1c4 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 5 Apr 2016 12:09:19 -0700
Subject: Update shades of red

---
 app/assets/stylesheets/framework/variables.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 98fe794d362..dd189a2cb79 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -104,9 +104,9 @@ $orange-light: rgba(252, 109, 38, 0.80);
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;
 
-$red-light: #f06559;
-$red-normal: #e52c5a;
-$red-dark: #d22852;
+$red-light: #e52c5a;
+$red-normal: #d22852;
+$red-dark: darken($red-normal, 5%);
 
 $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
@@ -128,9 +128,9 @@ $border-orange-light: #fc6d26;
 $border-orange-normal: #ce5237;
 $border-orange-dark: #c14e35;
 
-$border-red-light: #f24f41;
-$border-red-normal: #d22852;
-$border-red-dark: #ca264f;
+$border-red-light: #d22852;
+$border-red-normal: #ca264f;
+$border-red-dark: darken($border-red-normal, 5%);
 
 $help-well-bg: #fafafa;
 $help-well-border: #e5e5e5;
-- 
cgit v1.2.1


From b23e67bce5ae5f3bed8f27feba7eb5f833dcdca5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 5 Apr 2016 14:12:47 -0700
Subject: Add CI styling to all CI updates

---
 app/assets/stylesheets/pages/projects.scss | 2 +-
 app/assets/stylesheets/pages/status.scss   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 4e6aa8cd1a6..a0ac06008b6 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -401,7 +401,7 @@ pre.light-well {
   }
 
   .commit_short_id {
-    margin-right: 5px;
+    margin: 0 5px;
     color: $gl-link-color;
     font-weight: 600;
   }
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 5e5e38a0ba6..dbb6daf0d70 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,4 +1,4 @@
-.container-fluid .content {
+.container-fluid {
   .ci-status {
     padding: 2px 7px;
     margin-right: 5px;
-- 
cgit v1.2.1


From 7baebd322008e0ca912c447792f1d7cffd74f8e2 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 19:18:34 -0500
Subject: Do not create input if fieldName is not defined

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

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 6b55917ec89..362ddda3596 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -369,7 +369,7 @@ class GitLabDropdown
       if @options.toggleLabel
         $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject)
       if value?
-        if !field.length
+        if !field.length and fieldName
           # Create hidden input for form
           input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
           if @options.inputId?
-- 
cgit v1.2.1


From 4d463c3b0f05fa8873b76afce621eaaf44c19836 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 09:54:49 +0100
Subject: Fixed delete comment button color

---
 app/views/projects/notes/_note.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 34fe1743f4b..a681d6dece4 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -18,7 +18,7 @@
                 = access
             = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
               = icon('pencil-square-o')
-            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
+            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete' do
               = icon('trash-o')
       .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
         .note-text
-- 
cgit v1.2.1


From d6f276eacfdb7e8287df69dfc1dbf756288bade8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 6 Apr 2016 10:05:39 +0100
Subject: Fixed issue with enter key not selecting correct value in dropdown

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

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2a4811b8763..33c5126087f 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -394,7 +394,7 @@ class GitLabDropdown
       selector = ".dropdown-page-one #{selector}"
 
     # simulate a click on the first link
-    $(selector).trigger "click"
+    $(selector, @dropdown).trigger "click"
 
   addArrowKeyEvent: ->
     ARROW_KEY_CODES = [38, 40]
-- 
cgit v1.2.1


From e79b867d2b24f97cdf91315abd9dbbb22dc2d0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 5 Apr 2016 18:15:13 +0200
Subject: Ensure empty recipients are rejected in BuildsEmailService
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/models/project_services/builds_email_service.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index f6313255cbb..f9f04838766 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -50,12 +50,15 @@ class BuildsEmailService < Service
 
   def execute(push_data)
     return unless supported_events.include?(push_data[:object_kind])
+    return unless should_build_be_notified?(push_data)
 
-    if should_build_be_notified?(push_data)
+    recipients = all_recipients(push_data)
+
+    if recipients.any?
       BuildEmailWorker.perform_async(
         push_data[:build_id],
-        all_recipients(push_data),
-        push_data,
+        recipients,
+        push_data
       )
     end
   end
@@ -84,7 +87,7 @@ class BuildsEmailService < Service
   end
 
   def all_recipients(data)
-    all_recipients = recipients.split(',')
+    all_recipients = recipients.split(',').compact.reject(&:blank?)
 
     if add_pusher? && data[:user][:email]
       all_recipients << "#{data[:user][:email]}"
-- 
cgit v1.2.1


From ee87d15cf443e66f47e20b92bb442b9e1874fee7 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Tue, 5 Apr 2016 19:19:00 -0500
Subject: Change approach, do not use timeouts

---
 .../javascripts/search_autocomplete.js.coffee      | 30 +++++++++-------------
 app/views/layouts/_search.html.haml                |  4 +--
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 564fb265b9d..5a0df7817c9 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -137,13 +137,17 @@ class @SearchAutocomplete
     }
 
   bindEvents: ->
+    $(document).on 'click', @onDocumentClick
     @searchInput.on 'keydown', @onSearchInputKeyDown
     @searchInput.on 'keyup', @onSearchInputKeyUp
     @searchInput.on 'click', @onSearchInputClick
     @searchInput.on 'focus', @onSearchInputFocus
-    @searchInput.on 'blur', @onSearchInputBlur
     @clearInput.on 'click', @onRemoveLocationClick
 
+  onDocumentClick: (e) =>
+    if not $.contains(@dropdown[0], e.target) and @isFocused
+      @onSearchInputBlur()
+
   enableAutocomplete: ->
     # No need to enable anything if user is not logged in
     return if !gon.current_user_id
@@ -193,27 +197,21 @@ class @SearchAutocomplete
     e.stopImmediatePropagation()
 
   onSearchInputFocus: =>
+    @isFocused = true
     @wrap.addClass('search-active')
 
   onRemoveLocationClick: (e) =>
     e.preventDefault()
     @removeLocationBadge()
     @searchInput.val('').focus()
-    @skipBlurEvent = true
 
   onSearchInputBlur: (e) =>
-    @skipBlurEvent = false
-
-    # We should wait to make sure we are not clearing the input instead
-    setTimeout( =>
-      return if @skipBlurEvent
+    @isFocused = false
+    @wrap.removeClass('search-active')
 
-      @wrap.removeClass('search-active')
-
-      # If input is blank then restore state
-      if @searchInput.val() is ''
-        @restoreOriginalState()
-    , 150)
+    # If input is blank then restore state
+    if @searchInput.val() is ''
+      @restoreOriginalState()
 
   addLocationBadge: (item) ->
     category = if item.category? then "#{item.category}: " else ''
@@ -291,9 +289,5 @@ class @SearchAutocomplete
 
       $el.removeClass('is-active')
       @disableAutocomplete()
+      @onSearchInputFocus()
       @searchInput.val('').focus()
-
-      # We need to wait because of @skipBlurEvent
-      setTimeout( =>
-        @onSearchInputFocus()
-      , 200)
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 9d4ab9847a8..ba04bd74b8d 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -21,8 +21,8 @@
                   %a.is-focused.dropdown-menu-empty-link
                     Loading...
             = dropdown_loading
-        %i.search-icon
-        %i.clear-icon.js-clear-input
+          %i.search-icon
+          %i.clear-icon.js-clear-input
 
     = hidden_field_tag :group_id, @group.try(:id)
     = hidden_field_tag :project_id, @project && @project.persisted? ? @project.id : '', id: 'search_project_id'
-- 
cgit v1.2.1


From 5f4ce722c0f5fbf9129dddf20de879f00db4a311 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 6 Apr 2016 13:55:49 -0500
Subject: Display clear button only if input has a value

---
 app/assets/javascripts/search_autocomplete.js.coffee |  7 ++++---
 app/assets/stylesheets/pages/search.scss             | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 5a0df7817c9..9c85ce1633b 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -142,7 +142,7 @@ class @SearchAutocomplete
     @searchInput.on 'keyup', @onSearchInputKeyUp
     @searchInput.on 'click', @onSearchInputClick
     @searchInput.on 'focus', @onSearchInputFocus
-    @clearInput.on 'click', @onRemoveLocationClick
+    @clearInput.on 'click', @onClearInputClick
 
   onDocumentClick: (e) =>
     if not $.contains(@dropdown[0], e.target) and @isFocused
@@ -189,6 +189,8 @@ class @SearchAutocomplete
           # We should display the menu only when input is not empty
           @enableAutocomplete()
 
+    @wrap.toggleClass 'has-value', !!e.target.value
+
     # Avoid falsy value to be returned
     return
 
@@ -200,9 +202,8 @@ class @SearchAutocomplete
     @isFocused = true
     @wrap.addClass('search-active')
 
-  onRemoveLocationClick: (e) =>
+  onClearInputClick: (e) =>
     e.preventDefault()
-    @removeLocationBadge()
     @searchInput.val('').focus()
 
   onSearchInputBlur: (e) =>
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index 9274796233b..f0f3744c6fa 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -144,16 +144,16 @@
         color: $location-icon-active-color;
       }
     }
+  }
 
-    &.has-location-badge {
-      .search-icon {
-        display: none;
-      }
+  &.has-value {
+    .search-icon {
+      display: none;
+    }
 
-      .clear-icon {
-        cursor: pointer;
-        display: block;
-      }
+    .clear-icon {
+      cursor: pointer;
+      display: block;
     }
   }
 
-- 
cgit v1.2.1


From d1ad639010ecb8619db08f412babc6fb9e23458e Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 6 Apr 2016 14:28:15 -0500
Subject: Do not fire blur event when clicking a suggestion

---
 app/assets/javascripts/search_autocomplete.js.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 9c85ce1633b..6a7b4ad1db7 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -145,7 +145,10 @@ class @SearchAutocomplete
     @clearInput.on 'click', @onClearInputClick
 
   onDocumentClick: (e) =>
-    if not $.contains(@dropdown[0], e.target) and @isFocused
+    # If clicking outside the search box
+    # And search input is not focused
+    # And we are not clicking inside a suggestion
+    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
       @onSearchInputBlur()
 
   enableAutocomplete: ->
@@ -290,5 +293,4 @@ class @SearchAutocomplete
 
       $el.removeClass('is-active')
       @disableAutocomplete()
-      @onSearchInputFocus()
       @searchInput.val('').focus()
-- 
cgit v1.2.1