From 519642af7720349f5aec19dc9b620bbb287cc526 Mon Sep 17 00:00:00 2001
From: barthc <mackintosh02@gmail.com>
Date: Tue, 14 Jun 2016 18:57:50 +0100
Subject: fix clickable code search results

---
 app/views/search/results/_blob.html.haml   | 5 +++--
 app/views/shared/_file_highlight.html.haml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index 0fe8a3b490a..b28482f5db1 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -2,9 +2,10 @@
 .blob-result
   .file-holder
     .file-title
-      = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
+      - blob_path = namespace_project_blob_path(@project.namespace, @project, tree_join(blob.ref, blob.filename))
+      = link_to blob_path do
         %i.fa.fa-file
         %strong
           = blob.filename
     .file-content.code.term
-      = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline
+      = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, blob_path: blob_path
diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml
index 37dcf39c062..d9e9078cc1e 100644
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
@@ -2,11 +2,12 @@
   .line-numbers
     - if blob.data.present?
       - link_icon = icon('link')
+      - path = blob_path if defined?(blob_path)
       - blob.data.each_line.each_with_index do |_, index|
         - offset = defined?(first_line_number) ? first_line_number : 1
         - i = index + offset
         -# We're not using `link_to` because it is too slow once we get to thousands of lines.
-        %a.diff-line-num{href: "#L#{i}", id: "L#{i}", 'data-line-number' => i}
+        %a.diff-line-num{href: "#{path}#L#{i}", id: "L#{i}", 'data-line-number' => i}
           = link_icon
           = i
   .blob-content{data: {blob_id: blob.id}}
-- 
cgit v1.2.1


From 9b777f4187436aed84c52625ca3dbc224f8e3b7a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 17 Jun 2016 19:05:26 -0500
Subject: Pass dropdown instance to toggleLabel callback

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

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index b49bd4565a7..3d8c971b447 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -454,7 +454,7 @@ class GitLabDropdown
 
       # Toggle the dropdown label
       if @options.toggleLabel
-        @updateLabel()
+        @updateLabel(selectedObject, el, @)
       else
         selectedObject
     else if el.hasClass(INDETERMINATE_CLASS)
@@ -481,7 +481,7 @@ class GitLabDropdown
 
       # Toggle the dropdown label
       if @options.toggleLabel
-        @updateLabel(selectedObject, el)
+        @updateLabel(selectedObject, el, @)
       if value?
         if !field.length and fieldName
           @addInput(fieldName, value)
@@ -580,8 +580,8 @@ class GitLabDropdown
       # Scroll the dropdown content up
       $dropdownContent.scrollTop(listItemTop - dropdownContentTop)
 
-  updateLabel: (selected = null, el = null) =>
-    $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selected, el)
+  updateLabel: (selected = null, el = null, instance = null) =>
+    $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selected, el, instance)
 
 $.fn.glDropdown = (opts) ->
   return @.each ->
-- 
cgit v1.2.1


From fcfe87510bc6add78a6be291400df7504c84de54 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Fri, 17 Jun 2016 19:06:04 -0500
Subject: Update dropdown text accordingly to selected item

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

(limited to 'app')

diff --git a/app/assets/javascripts/issue_status_select.js.coffee b/app/assets/javascripts/issue_status_select.js.coffee
index c5740f27ddd..ed50e2e698f 100644
--- a/app/assets/javascripts/issue_status_select.js.coffee
+++ b/app/assets/javascripts/issue_status_select.js.coffee
@@ -6,6 +6,13 @@ class @IssueStatusSelect
       $(el).glDropdown(
         selectable: true
         fieldName: fieldName
+        toggleLabel: (selected, el, instance) =>
+          label = 'Author'
+          $item = instance.dropdown.find('.is-active')
+          label = $item.text() if $item.length
+          label
+        clicked: (item, $el, e)->
+          e.preventDefault()
         id: (obj, el) ->
           $(el).data("id")
       )
-- 
cgit v1.2.1


From 03a4d6e9a2eef52181a70a68847aa27a2f82dcb2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 17 Jun 2016 12:58:09 +0100
Subject: Made the search bar on emoji menu sticky

---
 app/assets/javascripts/awards_handler.coffee |  6 ++++--
 app/assets/stylesheets/pages/awards.scss     | 21 ++++++++++-----------
 app/views/emojis/index.html.haml             |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 030f1564862..37d0adaa625 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -341,7 +341,9 @@ class @AwardsHandler
       for emoji in frequentlyUsedEmojis
         $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul)
 
-      $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used'))
+      $('.emoji-menu-content')
+        .prepend(ul)
+        .prepend($('<h5>').text('Frequently used'))
 
     @frequentEmojiBlockRendered = true
 
@@ -356,7 +358,7 @@ class @AwardsHandler
 
       if term
         # Generate a search result block
-        h5 = $('<h5>').text('Search results').addClass('emoji-search')
+        h5 = $('<h5>').text('Search results')
         found_emojis = @searchEmojis(term).show()
         ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis)
         $('.emoji-menu-content ul, .emoji-menu-content h5').hide()
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 6211f3a52eb..5faedfedd66 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -8,8 +8,9 @@
 .emoji-menu {
   position: absolute;
   margin-top: 3px;
-  z-index: 1000;
-  min-width: 160px;
+  padding: $gl-padding;
+  z-index: 9;
+  width: 300px;
   font-size: 14px;
   background-color: $award-emoji-menu-bg;
   border: 1px solid $award-emoji-menu-border;
@@ -33,20 +34,18 @@
   }
 
   .emoji-menu-content {
-    padding: $gl-padding;
-    width: 300px;
     height: 300px;
     overflow-y: scroll;
-
-    input.emoji-search {
-      background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAFu0lEQVRIia1WTahkVxH+quqce7vf6zdvJpHoIlkYJ2SiJiIokmQjgoGgIAaEIYuYXWICgojiwkmC4taFwhjcyIDusogEIwwiSSCKPwsdwzAg0SjJ9Izzk5n3+nXfe8+pqizOvd395scfsJqi6dPnnDr11Vc/NJ1OwUTosqJLCmYCHCAC2mSHs+ojZv6AO46Y+20AhIneJsafhPhXVZSXDk7qi+aOLhtQNuBmQtcarAKjTXpn2+l3u2yPunvZSABRucjcAV/eMZuM48/Go/g1d19kc4wq+e8MZjWkbI/P5t2P3RFFbv7SQdyBlBUx8N8OTuqjMcof+N94yMPrY2DMm/ytnb32J0QrY+6AqsHM4Q64O9SKDmerKDD3Oy/tNL9vk342CC8RuU6n0ymCMHb22scu7zQngtASOjUHE1BX4UUAv4b7Ow6qiXCXuz/UdvogAAweDY943/b4cAz0ZlYHXeMsnT07RVb7wMUr8ykI4H5HVkMd5Rcb4/jNURVOL5qErAaAUUdCCIJ5kx5q2nw8m39ImEAAsjpE6PStB0YfMcd1wqqG3Xn7A3PfZyyKnNjaqD4fmE/fCNKshirIyY1xvI+Av6g5QIAIIWX7cJPssboSiBBEeKmsZne0Sb8kzAUWNYyq8NvbDo0fZ6beqxuLmqOOMr/lwOh+YXpXtbjERGja9JyZ9+HxpXKb9Gj5oywRESbj+Cj1ENG1QViTGBl1FbC1We1tbVRfHWIoQkhqH9xbpE92XUbb6VJZ1R4crjRz1JWcDMJvLdoMcyAEhjuwHo8Bfndg3mbszhOY+adVlMtD3po51OwzIQiEaams7oeJhxRw1FFOVpFRRUYIhMBAFRnjOsC8IFHHUA4TQQhgAqpAiIFfGbxkIqj54ayGbL7UoOqHCniAEKHLNr26l+D9wQJzeUwMAnfHvEnLECzZRwRV++d60ptjW9VLZeolEJG6GwCCE0CFVNB+Ay0NEqoQYG4YYFu7B8IEVRt3uRzy/osIoLV9QZimWXGHUMFdmI6M64DUF2Je88R9VZqCSP+QlcF5k+4tCzSsXaqjINuK6UyE0+s/mk6/qFq8oAIL9pqMLhkGsNrOyoOIlszust3aJv0U9+kFdwjTGwWl1YdF+KWlQSZ0Se/psj8yGVdg5tJyfH96EBWmLtoEMwMzMFt031NzGWLLzKhC+KV7H5ZeeaMOPxemma2x68puc0LN3+/u6LJiePS6MKHvn4wu6cPzJj0hsioeMfDrEvjv5r6W9gBvjKJujuKzQ0URIZj75NylvT+mbHfXQa4rwAMaVRTMm/SFyzvNy0yF6+4AM+1ubcSnqkAIUjQKl1RKSbE5jt+vovx1MBqF0WW7/d1Z80ab9BtmuJ3Xk5cJKds9TZt/uLPXvtiTrQ+dIwqfAejUvM1os6FNikXKUHfQ+ekUsXT5u85enJ0CaBSkkGEo1syUQ+DfMdE/4GA1uzupf9zdbzhOmLsF4efHVXjaHHAzmDtGdQRd/Nc5wAEJjNki3XfhyvwVNz80xANrht3LsENY9cBBdN1L9GUyyvFRFZ42t75sBvCQRykbRlU4tT2pPxoCvzx09d4GmPs200M6wKdWSDGK8mppYSWdhAlt0qeaLv+IadXU9/Evq4FAZ8ej+LmtcTxaRX4NWI0Uag5Vg1p5MYg8BnlhXIdPHDow+vTWZvVMVttXDLqkTzZdPj6Qii6cP1cSvIdl3iQkNYyi9HH0I22y+93tY3DcQkTZgQtM+POoCr8x97eylkmtrgKuztrvXJ21x/aNKuqIkZ/fntRfCdcTfhUTAIhRzoDojJD0aSNLLwMzmpT7+JaLtyf1MwDo6qz9djFaUq3t9MlFmy/c1OCSceY9fMsVaL9mvH9ocXdkdWxv1scAePG0THAhMOaLdOw/Gvxfxb1w4eCapyIENUcV5M3/u8FitAxZ25P6GAHT3UX39Srw+QOb1ZffA98Dl2Wy1BYkAAAAAElFTkSuQmCC");
-      background-repeat: no-repeat;
-      background-position: right 5px center;
-      background-size: 16px;
-    }
   }
 }
 
+.emoji-search {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAFu0lEQVRIia1WTahkVxH+quqce7vf6zdvJpHoIlkYJ2SiJiIokmQjgoGgIAaEIYuYXWICgojiwkmC4taFwhjcyIDusogEIwwiSSCKPwsdwzAg0SjJ9Izzk5n3+nXfe8+pqizOvd395scfsJqi6dPnnDr11Vc/NJ1OwUTosqJLCmYCHCAC2mSHs+ojZv6AO46Y+20AhIneJsafhPhXVZSXDk7qi+aOLhtQNuBmQtcarAKjTXpn2+l3u2yPunvZSABRucjcAV/eMZuM48/Go/g1d19kc4wq+e8MZjWkbI/P5t2P3RFFbv7SQdyBlBUx8N8OTuqjMcof+N94yMPrY2DMm/ytnb32J0QrY+6AqsHM4Q64O9SKDmerKDD3Oy/tNL9vk342CC8RuU6n0ymCMHb22scu7zQngtASOjUHE1BX4UUAv4b7Ow6qiXCXuz/UdvogAAweDY943/b4cAz0ZlYHXeMsnT07RVb7wMUr8ykI4H5HVkMd5Rcb4/jNURVOL5qErAaAUUdCCIJ5kx5q2nw8m39ImEAAsjpE6PStB0YfMcd1wqqG3Xn7A3PfZyyKnNjaqD4fmE/fCNKshirIyY1xvI+Av6g5QIAIIWX7cJPssboSiBBEeKmsZne0Sb8kzAUWNYyq8NvbDo0fZ6beqxuLmqOOMr/lwOh+YXpXtbjERGja9JyZ9+HxpXKb9Gj5oywRESbj+Cj1ENG1QViTGBl1FbC1We1tbVRfHWIoQkhqH9xbpE92XUbb6VJZ1R4crjRz1JWcDMJvLdoMcyAEhjuwHo8Bfndg3mbszhOY+adVlMtD3po51OwzIQiEaams7oeJhxRw1FFOVpFRRUYIhMBAFRnjOsC8IFHHUA4TQQhgAqpAiIFfGbxkIqj54ayGbL7UoOqHCniAEKHLNr26l+D9wQJzeUwMAnfHvEnLECzZRwRV++d60ptjW9VLZeolEJG6GwCCE0CFVNB+Ay0NEqoQYG4YYFu7B8IEVRt3uRzy/osIoLV9QZimWXGHUMFdmI6M64DUF2Je88R9VZqCSP+QlcF5k+4tCzSsXaqjINuK6UyE0+s/mk6/qFq8oAIL9pqMLhkGsNrOyoOIlszust3aJv0U9+kFdwjTGwWl1YdF+KWlQSZ0Se/psj8yGVdg5tJyfH96EBWmLtoEMwMzMFt031NzGWLLzKhC+KV7H5ZeeaMOPxemma2x68puc0LN3+/u6LJiePS6MKHvn4wu6cPzJj0hsioeMfDrEvjv5r6W9gBvjKJujuKzQ0URIZj75NylvT+mbHfXQa4rwAMaVRTMm/SFyzvNy0yF6+4AM+1ubcSnqkAIUjQKl1RKSbE5jt+vovx1MBqF0WW7/d1Z80ab9BtmuJ3Xk5cJKds9TZt/uLPXvtiTrQ+dIwqfAejUvM1os6FNikXKUHfQ+ekUsXT5u85enJ0CaBSkkGEo1syUQ+DfMdE/4GA1uzupf9zdbzhOmLsF4efHVXjaHHAzmDtGdQRd/Nc5wAEJjNki3XfhyvwVNz80xANrht3LsENY9cBBdN1L9GUyyvFRFZ42t75sBvCQRykbRlU4tT2pPxoCvzx09d4GmPs200M6wKdWSDGK8mppYSWdhAlt0qeaLv+IadXU9/Evq4FAZ8ej+LmtcTxaRX4NWI0Uag5Vg1p5MYg8BnlhXIdPHDow+vTWZvVMVttXDLqkTzZdPj6Qii6cP1cSvIdl3iQkNYyi9HH0I22y+93tY3DcQkTZgQtM+POoCr8x97eylkmtrgKuztrvXJ21x/aNKuqIkZ/fntRfCdcTfhUTAIhRzoDojJD0aSNLLwMzmpT7+JaLtyf1MwDo6qz9djFaUq3t9MlFmy/c1OCSceY9fMsVaL9mvH9ocXdkdWxv1scAePG0THAhMOaLdOw/Gvxfxb1w4eCapyIENUcV5M3/u8FitAxZ25P6GAHT3UX39Srw+QOb1ZffA98Dl2Wy1BYkAAAAAElFTkSuQmCC");
+  background-repeat: no-repeat;
+  background-position: right 5px center;
+  background-size: 16px;
+}
+
 .emoji-menu-list {
   list-style: none;
   padding-left: 0;
diff --git a/app/views/emojis/index.html.haml b/app/views/emojis/index.html.haml
index 97401a2e618..8b38b4c2bd4 100644
--- a/app/views/emojis/index.html.haml
+++ b/app/views/emojis/index.html.haml
@@ -1,6 +1,6 @@
 .emoji-menu
+  = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control", placeholder: "Seach emojis"
   .emoji-menu-content
-    = text_field_tag :emoji_search, "", class: "emoji-search search-input form-control"
     - Gitlab::AwardEmoji.emoji_by_category.each do |category, emojis|
       %h5.emoji-menu-title
         = Gitlab::AwardEmoji::CATEGORIES[category]
-- 
cgit v1.2.1


From 94ac45cf0ec9ec6736c4c24e8dd693ab81fe3f22 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 21 Jun 2016 17:27:34 -0500
Subject: Hide nav arrows by default; remove settings dropdown btn at larger
 breakpoint; remove unneccessary CSS

---
 app/assets/javascripts/layout_nav.js.coffee |  7 +++----
 app/assets/stylesheets/framework/nav.scss   | 16 +++++++---------
 app/views/shared/_event_filter.html.haml    |  4 ----
 3 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index f8f0aea427e..cad095daae1 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -4,10 +4,9 @@ hideEndFade = ($scrollingTabs) ->
 
     $this
       .find('.fade-right')
-      .toggleClass('end-scroll', $this.width() is $this.prop('scrollWidth'))
+      .toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'))
 
 $ ->
-  $('.fade-left').addClass('end-scroll')
 
   hideEndFade($('.scrolling-tabs'))
 
@@ -21,5 +20,5 @@ $ ->
     currentPosition = $this.scrollLeft()
     maxPosition = $this.prop('scrollWidth') - $this.outerWidth()
 
-    $this.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
-    $this.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
+    $this.find('.fade-left').toggleClass('scrolling', currentPosition > 0)
+    $this.find('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 694f09c0464..42165f13887 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -1,6 +1,6 @@
 @mixin fade($gradient-direction, $rgba, $gradient-color) {
-  visibility: visible;
-  opacity: 1;
+  visibility: hidden;
+  opacity: 0;
   z-index: 2;
   position: absolute;
   bottom: 12px;
@@ -13,9 +13,9 @@
   background: -moz-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
   background: linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
 
-  &.end-scroll {
-    visibility: hidden;
-    opacity: 0;
+  &.scrolling {
+    visibility: visible;
+    opacity: 1;
     transition-duration: .3s;
   }
 
@@ -276,7 +276,7 @@
     float: right;
     padding: 7px 0 0;
 
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $screen-sm-max) {
       display: none;
     }
 
@@ -381,9 +381,7 @@
   .nav-control {
 
     .fade-right {
-      @media (min-width: $screen-xs-max) {
-        right: 68px;
-      }
+
       @media (max-width: $screen-xs-min) {
         right: 0;
       }
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index aa18e6f236f..8824bcc158e 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,9 +1,5 @@
 %ul.nav-links.event-filter.scrolling-tabs
-  %li.fade-left
-    = icon('arrow-left')
   = event_filter_link EventFilter.push, 'Push events'
   = event_filter_link EventFilter.merged, 'Merge events'
   = event_filter_link EventFilter.comments, 'Comments'
   = event_filter_link EventFilter.team, 'Team'
-  %li.fade-right
-    = icon('arrow-right')
-- 
cgit v1.2.1


From 611bc0090a3bf5fff2f0fdab23299761413d6916 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 22 Jun 2016 00:31:53 +0100
Subject: Added bottom padding to label color suggestion link

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

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index f5f67e2cd84..47bfd144930 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -6,6 +6,7 @@
     height: 30px;
     display: inline-block;
     margin-right: 10px;
+    margin-bottom: 10px;
   }
 
   &.suggest-colors-dropdown {
-- 
cgit v1.2.1


From 0b33f90b8c2bdaf6c7a963dd01a0b47b0cd5f532 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 22 Jun 2016 02:41:38 +0100
Subject: forced filter input to process inputs after data has loaded

---
 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 2a7bf0bc306..5bfd3e3e50f 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -186,6 +186,8 @@ class GitLabDropdown
             @fullData = data
 
             @parseData @fullData
+
+            @filter.input.trigger('keyup') if @options.filterable and @filter and @filter.input
         }
 
     # Init filterable
-- 
cgit v1.2.1


From 5a09745534fd7ae04595a45f33297c0185a81b16 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 22 Jun 2016 08:43:54 +0100
Subject: Use jQuery objects in ref dropdown

---
 app/assets/javascripts/gl_dropdown.js.coffee |  7 ++++---
 app/assets/javascripts/project.js.coffee     | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2a7bf0bc306..41ca2462424 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -280,7 +280,7 @@ class GitLabDropdown
         html = @renderData(data)
 
     # Render the full menu
-    full_html = @renderMenu(html.join(""))
+    full_html = @renderMenu(html)
 
     @appendMenu(full_html)
 
@@ -351,7 +351,8 @@ class GitLabDropdown
     if @options.renderMenu
       menu_html = @options.renderMenu(html)
     else
-      menu_html = "<ul>#{html}</ul>"
+      menu_html = $('<ul />')
+        .append(html)
 
     return menu_html
 
@@ -360,7 +361,7 @@ class GitLabDropdown
     selector = '.dropdown-content'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one .dropdown-content"
-    $(selector, @dropdown).html html
+    $(selector, @dropdown).append html
 
   # Render the row
   renderItem: (data, group = false, index = false) ->
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 96e10dd7e8a..707178d1268 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -70,17 +70,20 @@ class @Project
         fieldName: 'ref'
         renderRow: (ref) ->
           if ref.header?
-            "<li class='dropdown-header'>#{ref.header}</li>"
+            $('<li />')
+              .addClass 'dropdown-header'
+              .text ref.header
           else
-            isActiveClass = if ref is selected then 'is-active' else ''
-
-            "<li>
-              <a href='#' data-ref='#{escape(ref)}' class='#{isActiveClass}'>
-                #{ref}
-              </a>
-            </li>"
+            link = $('<a />')
+              .attr 'href', '#'
+              .addClass(if ref is selected then 'is-active' else '')
+              .text ref
+              .attr 'data-ref', escape(ref)
+
+            $('<li />')
+              .append link
         id: (obj, $el) ->
-          $el.data('ref')
+          $el.attr('data-ref')
         toggleLabel: (obj, $el) ->
           $el.text().trim()
         clicked: (e) ->
-- 
cgit v1.2.1


From 363f7a5794f3cec96163f5b07cbb9af37f9a7eb6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 22 Jun 2016 08:59:03 +0100
Subject: Empty the content before append anything to the dropdown

---
 app/assets/javascripts/gl_dropdown.js.coffee | 4 +++-
 1 file changed, 3 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 41ca2462424..29eed4c9862 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -361,7 +361,9 @@ class GitLabDropdown
     selector = '.dropdown-content'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one .dropdown-content"
-    $(selector, @dropdown).append html
+    $(selector, @dropdown)
+      .empty()
+      .append html
 
   # Render the row
   renderItem: (data, group = false, index = false) ->
-- 
cgit v1.2.1


From 92c71a426cb931874f591458b9f685681c6e2bd6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 22 Jun 2016 17:32:06 +0100
Subject: Updated to add parentheses

---
 app/assets/javascripts/gl_dropdown.js.coffee |  2 +-
 app/assets/javascripts/project.js.coffee     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 29eed4c9862..deaed6c11e8 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -363,7 +363,7 @@ class GitLabDropdown
       selector = ".dropdown-page-one .dropdown-content"
     $(selector, @dropdown)
       .empty()
-      .append html
+      .append(html)
 
   # Render the row
   renderItem: (data, group = false, index = false) ->
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 707178d1268..3288c801388 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -71,17 +71,17 @@ class @Project
         renderRow: (ref) ->
           if ref.header?
             $('<li />')
-              .addClass 'dropdown-header'
-              .text ref.header
+              .addClass('dropdown-header')
+              .text(ref.header)
           else
             link = $('<a />')
-              .attr 'href', '#'
+              .attr('href', '#')
               .addClass(if ref is selected then 'is-active' else '')
-              .text ref
-              .attr 'data-ref', escape(ref)
+              .text(ref)
+              .attr('data-ref', escape(ref))
 
             $('<li />')
-              .append link
+              .append(link)
         id: (obj, $el) ->
           $el.attr('data-ref')
         toggleLabel: (obj, $el) ->
-- 
cgit v1.2.1


From 2b1ee3f3d2245eb7f2d83607a3ed3c52c797e7fe Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 22 Jun 2016 13:50:37 -0600
Subject: Restrict header logo to 36px so it doesn't overflow.

---
 app/assets/stylesheets/framework/header.scss | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index a7bcb456560..649ecb6787b 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -132,6 +132,11 @@ header {
       transition-duration: .3s;
       z-index: 999;
 
+      svg, img {
+        height: 36px;
+        width: 36px;
+      }
+
       &:hover {
         cursor: pointer;
       }
-- 
cgit v1.2.1


From 8f9b64c720d55ee40066d5a6b1017ab95dbd9781 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 22 Jun 2016 17:44:24 -0300
Subject: Fix internal snippets can be searched by anyone

---
 app/models/snippet.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index f8034cb5e6b..3a191cd91d0 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -135,7 +135,10 @@ class Snippet < ActiveRecord::Base
     end
 
     def accessible_to(user)
-      where('visibility_level IN (?) OR author_id = ?', [Snippet::INTERNAL, Snippet::PUBLIC], user)
+      visibility_levels = [Snippet::PUBLIC]
+      visibility_levels << Snippet::INTERNAL if user
+
+      where('visibility_level IN (?) OR author_id = ?', visibility_levels, user)
     end
   end
 end
-- 
cgit v1.2.1


From 80f576bb8aaab83ca78a21f20c03cb4b4fb18f11 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Mon, 11 Apr 2016 15:27:07 -0600
Subject: Replace Haml with Hamlit.

Hamlit is a library that's faster than Haml while implementing most of its features: https://github.com/k0kubun/hamlit

Not sure if this breaks anything, but as far as I can tell most things work the same. No obvious regressions that I've been able to find.
---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 41859841834..62d13a4b4f3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -197,7 +197,7 @@ module ApplicationHelper
 
   def render_markup(file_name, file_content)
     if gitlab_markdown?(file_name)
-      Haml::Helpers.preserve(markdown(file_content))
+      Hamlit::RailsHelpers.preserve(markdown(file_content))
     elsif asciidoc?(file_name)
       asciidoc(file_content)
     elsif plain?(file_name)
-- 
cgit v1.2.1


From 97ec04ac9b923ff9eb68ce51a35150d45105adf1 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 20 Jun 2016 13:38:17 -0600
Subject: Add Subresource Integrity attribute to CSS and JS assets.

This prevents compromised or malicious CDNs from modifying assets. The hash provided by Rails is compared to the hash of the asset the browser has downloaded. The browser will refuse to execute/parse the assets if the hashes don't match. SRI is currently implemented in Firefox, Chrome, and Opera.

More information is available in #18230 and on MDN: https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity

This doesn't apply to the dynamically-generated per-page JavaScript due to a bug in sprockets-rails (https://github.com/rails/sprockets-rails/issues/359).
---
 app/views/layouts/_head.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index e0ed657919e..be29ed532ee 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -25,10 +25,10 @@
 
   = favicon_link_tag 'favicon.ico'
 
-  = stylesheet_link_tag "application", media: "all"
-  = stylesheet_link_tag "print",       media: "print"
+  = stylesheet_link_tag "application", media: "all", integrity: true
+  = stylesheet_link_tag "print",       media: "print", integrity: true
 
-  = javascript_include_tag "application"
+  = javascript_include_tag "application", integrity: true
 
   - if page_specific_javascripts
     = javascript_include_tag page_specific_javascripts, {"data-turbolinks-track" => true}
-- 
cgit v1.2.1


From bba1d2de3bc76bf65b4c2ded07e94ab0d7455bfd Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Wed, 22 Jun 2016 16:25:59 -0600
Subject: Add clarifying comment and a Changelog entry.

---
 app/views/layouts/_head.html.haml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app')

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index be29ed532ee..d5965a6ec99 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -30,6 +30,9 @@
 
   = javascript_include_tag "application", integrity: true
 
+  -# FIXME: SRI doesn't apply to the dynamically-generated per-page
+  -# JavaScript due to a bug in sprockets-rails.
+  -# See https://github.com/rails/sprockets-rails/issues/359
   - if page_specific_javascripts
     = javascript_include_tag page_specific_javascripts, {"data-turbolinks-track" => true}
 
-- 
cgit v1.2.1


From 256cd8e498edfcbb8199abfb2b54d2d2905f030e Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 22 Jun 2016 19:29:40 -0300
Subject: Fix visibility of private project snippets for members when searching

---
 app/models/snippet.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 3a191cd91d0..51f6ae7b25c 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -135,10 +135,16 @@ class Snippet < ActiveRecord::Base
     end
 
     def accessible_to(user)
-      visibility_levels = [Snippet::PUBLIC]
-      visibility_levels << Snippet::INTERNAL if user
-
-      where('visibility_level IN (?) OR author_id = ?', visibility_levels, user)
+      return are_public unless user.present?
+      return all if user.admin?
+
+      where(
+        'visibility_level IN (:visibility_levels)
+         OR author_id = :author_id
+         OR project_id IN (:project_ids)',
+         visibility_levels: [Snippet::PUBLIC, Snippet::INTERNAL],
+         author_id: user.id,
+         project_ids: user.authorized_projects.select(:id))
     end
   end
 end
-- 
cgit v1.2.1


From fa42ffa1191ace7dd849af6dffc3c3c400d5a4c4 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 22 Jun 2016 22:09:11 -0400
Subject: Restore old behavior around diff notes to outdated discussions

---
 app/models/legacy_diff_note.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb
index 95fd510eb3a..33d2a69ebaf 100644
--- a/app/models/legacy_diff_note.rb
+++ b/app/models/legacy_diff_note.rb
@@ -20,7 +20,7 @@ class LegacyDiffNote < Note
   end
 
   def discussion_id
-    @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code, active?)
+    @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code)
   end
 
   def diff_file_hash
-- 
cgit v1.2.1


From e393a8f0bb2b358a5d039dba1d462baa355b4763 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Thu, 23 Jun 2016 00:50:50 -0400
Subject: Fix header logo width/height issues

---
 app/assets/stylesheets/framework/header.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 649ecb6787b..e8cbe7f3c02 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -134,7 +134,6 @@ header {
 
       svg, img {
         height: 36px;
-        width: 36px;
       }
 
       &:hover {
-- 
cgit v1.2.1


From 14fdcc196bc0c151d9760161ceeb6b9f2b44211b Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Wed, 22 Jun 2016 21:58:29 +0200
Subject: Check if pipeline is nil before merging

---
 app/controllers/projects/merge_requests_controller.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 851822d805a..b57caae68bb 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -204,8 +204,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @merge_request.update(merge_error: nil)
 
-    if params[:merge_when_build_succeeds].present? 
-      if @merge_request.pipeline && @merge_request.pipeline.active?
+    if params[:merge_when_build_succeeds].present?
+      unless @merge_request.pipeline
+        @status = :failed
+        return
+      end
+
+      if @merge_request.pipeline.active?
         MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                         .execute(@merge_request)
         @status = :merge_when_build_succeeds
-- 
cgit v1.2.1


From f854f6cd021c539df96d2677fd900d8ae6b5784b Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 23 Jun 2016 12:29:11 +0200
Subject: fixed pipeline notes issue

---
 app/models/ci/pipeline.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index ca5a685dd11..0c9a5e42eec 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -170,6 +170,19 @@ module Ci
       builds.where.not(environment: nil).success.pluck(:environment).uniq
     end
 
+    # Manually set the notes for a Ci::Pipeline
+    # There is no ActiveRecord relation between Ci::Pipeline and notes
+    # as they are related to a commit sha. This method helps importing
+    # them using the +Gitlab::ImportExport::RelationFactory+ class.
+    def notes=(notes)
+      notes.each do |note|
+        note[:id] = nil
+        note[:commit_id] = sha
+        note[:noteable_id] = self['id']
+        note.save!
+      end
+    end
+
     def notes
       Note.for_commit_id(sha)
     end
-- 
cgit v1.2.1


From 9b49c466f2ad5f54de441160e625a874220aea28 Mon Sep 17 00:00:00 2001
From: barthc <mackintosh02@gmail.com>
Date: Thu, 23 Jun 2016 12:44:50 +0100
Subject: renamed path to link

---
 app/views/search/results/_blob.html.haml   | 6 +++---
 app/views/shared/_file_highlight.html.haml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index b28482f5db1..290743feb4a 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -2,10 +2,10 @@
 .blob-result
   .file-holder
     .file-title
-      - blob_path = namespace_project_blob_path(@project.namespace, @project, tree_join(blob.ref, blob.filename))
-      = link_to blob_path do
+      - blob_link = namespace_project_blob_path(@project.namespace, @project, tree_join(blob.ref, blob.filename))
+      = link_to blob_link do
         %i.fa.fa-file
         %strong
           = blob.filename
     .file-content.code.term
-      = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, blob_path: blob_path
+      = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, blob_link: blob_link
diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml
index d9e9078cc1e..ad944a19ca1 100644
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
@@ -2,12 +2,12 @@
   .line-numbers
     - if blob.data.present?
       - link_icon = icon('link')
-      - path = blob_path if defined?(blob_path)
+      - link = blob_link if defined?(blob_link)
       - blob.data.each_line.each_with_index do |_, index|
         - offset = defined?(first_line_number) ? first_line_number : 1
         - i = index + offset
         -# We're not using `link_to` because it is too slow once we get to thousands of lines.
-        %a.diff-line-num{href: "#{path}#L#{i}", id: "L#{i}", 'data-line-number' => i}
+        %a.diff-line-num{href: "#{link}#L#{i}", id: "L#{i}", 'data-line-number' => i}
           = link_icon
           = i
   .blob-content{data: {blob_id: blob.id}}
-- 
cgit v1.2.1


From d7a5a28c53c3af710ceb8ef4867ea61af7462903 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Thu, 23 Jun 2016 14:15:46 +0100
Subject: Fix pagination on sorts with lots of ties

Postgres and MySQL don't guarantee that pagination with `LIMIT` and
`OFFSET` will work if the ordering isn't unique. From the Postgres docs:

> When using `LIMIT`, it is important to use an `ORDER BY` clause that
> constrains the result rows into a unique order. Otherwise you will get
> an unpredictable subset of the query's rows

Before:

    [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten
    [2] pry(main)> issues.count
    => 81
    [3] pry(main)> issues.uniq.count
    => 42

After:

    [1] pry(main)> issues = 1.upto(Issue.count).map { |i| Issue.sort('priority').page(i).per(1).map(&:id) }.flatten
    [2] pry(main)> issues.count
    => 81
    [3] pry(main)> issues.uniq.count
    => 81
---
 app/models/concerns/issuable.rb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 0ccd3474b81..38da0dafad2 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -112,15 +112,18 @@ module Issuable
     end
 
     def sort(method, excluded_labels: [])
-      case method.to_s
-      when 'milestone_due_asc' then order_milestone_due_asc
-      when 'milestone_due_desc' then order_milestone_due_desc
-      when 'downvotes_desc' then order_downvotes_desc
-      when 'upvotes_desc' then order_upvotes_desc
-      when 'priority' then order_labels_priority(excluded_labels: excluded_labels)
-      else
-        order_by(method)
-      end
+      sorted = case method.to_s
+               when 'milestone_due_asc' then order_milestone_due_asc
+               when 'milestone_due_desc' then order_milestone_due_desc
+               when 'downvotes_desc' then order_downvotes_desc
+               when 'upvotes_desc' then order_upvotes_desc
+               when 'priority' then order_labels_priority(excluded_labels: excluded_labels)
+               else
+                 order_by(method)
+               end
+
+      # Break ties with the ID column for pagination
+      sorted.order(id: :desc)
     end
 
     def order_labels_priority(excluded_labels: [])
-- 
cgit v1.2.1


From aa05fbc05d794ad94b9f377d3cb761a42d6c4533 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 21 Jun 2016 10:11:07 +0200
Subject: Fix 404 for pipelines

---
 app/models/ability.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 9c58b956007..f5950879ccb 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -196,7 +196,8 @@ class Ability
       @public_project_rules ||= project_guest_rules + [
         :download_code,
         :fork_project,
-        :read_commit_status
+        :read_commit_status,
+        :read_pipeline
       ]
     end
 
-- 
cgit v1.2.1


From 23c898fc409b28d61ee5af67ef3d8562b40681fc Mon Sep 17 00:00:00 2001
From: Steve Norman <steve.norman@thomsonreuters.com>
Date: Thu, 23 Jun 2016 08:33:05 +0000
Subject: Fix merge requests project settings help link anchor.

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

(limited to 'app')

diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml
index da522b53417..771a2e0df7d 100644
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -8,4 +8,4 @@
         %strong Only allow merge requests to be merged if the build succeeds
       .help-block
         Builds need to be configured to enable this feature.
-        = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests#only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
+        = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
-- 
cgit v1.2.1


From 64883faa6ebffd1e67d36d537e1e0bf2196bf107 Mon Sep 17 00:00:00 2001
From: Nathan Bush <nathan@pfmediatech.com>
Date: Thu, 5 May 2016 10:40:49 -0400
Subject: Fix user creation with stronger minimum password requirements:q

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/user.rb b/app/models/user.rb
index 876ccc69d8d..04b220ee13c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -308,7 +308,7 @@ class User < ActiveRecord::Base
 
   def generate_password
     if self.force_random_password
-      self.password = self.password_confirmation = Devise.friendly_token.first(8)
+      self.password = self.password_confirmation = Devise.friendly_token.first(Devise.password_length.min)
     end
   end
 
-- 
cgit v1.2.1


From 8fdd419a4469c55e447418f39b248ffcd3c4026a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Wed, 22 Jun 2016 11:26:14 -0400
Subject: Improve performance of searching tags by name by using a memorized
 tag array

---
 app/models/repository.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 221c87164ca..acc720ccfa3 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -130,7 +130,7 @@ class Repository
   end
 
   def find_tag(name)
-    raw_repository.tags.find { |tag| tag.name == name }
+    tags.find { |tag| tag.name == name }
   end
 
   def add_branch(user, branch_name, target)
-- 
cgit v1.2.1


From 7ce0968a52a5bc013e49865205a8998881884c02 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 10:33:38 -0600
Subject: Re-implement page-specific JS in a better way.

This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
---
 app/assets/javascripts/application.js.coffee             | 2 +-
 app/assets/javascripts/graphs/application.js.coffee      | 1 -
 app/assets/javascripts/lib/chart/application.js.coffee   | 1 +
 app/assets/javascripts/lib/d3/application.js.coffee      | 1 +
 app/assets/javascripts/lib/raphael/application.js.coffee | 3 +++
 app/assets/javascripts/users/application.js.coffee       | 6 ------
 app/views/layouts/_head.html.haml                        | 7 ++-----
 app/views/projects/graphs/_head.html.haml                | 4 +++-
 app/views/projects/network/show.html.haml                | 4 +++-
 app/views/users/show.html.haml                           | 4 +++-
 10 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/javascripts/lib/chart/application.js.coffee
 create mode 100644 app/assets/javascripts/lib/d3/application.js.coffee
 create mode 100644 app/assets/javascripts/lib/raphael/application.js.coffee

(limited to 'app')

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 0206db461da..07b45eae9bb 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -50,7 +50,7 @@
 #= require_directory ./ci
 #= require_directory ./commit
 #= require_directory ./extensions
-#= require_directory ./lib
+#= require_directory ./lib/.
 #= require_directory ./u2f
 #= require_directory .
 #= require fuzzaldrin-plus
diff --git a/app/assets/javascripts/graphs/application.js.coffee b/app/assets/javascripts/graphs/application.js.coffee
index 91f81a5d249..e0f681acf0b 100644
--- a/app/assets/javascripts/graphs/application.js.coffee
+++ b/app/assets/javascripts/graphs/application.js.coffee
@@ -4,5 +4,4 @@
 # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 # the compiled file.
 #
-#= require Chart
 #= require_tree .
diff --git a/app/assets/javascripts/lib/chart/application.js.coffee b/app/assets/javascripts/lib/chart/application.js.coffee
new file mode 100644
index 00000000000..82217fc5107
--- /dev/null
+++ b/app/assets/javascripts/lib/chart/application.js.coffee
@@ -0,0 +1 @@
+#= require Chart
diff --git a/app/assets/javascripts/lib/d3/application.js.coffee b/app/assets/javascripts/lib/d3/application.js.coffee
new file mode 100644
index 00000000000..74f0a0bb06a
--- /dev/null
+++ b/app/assets/javascripts/lib/d3/application.js.coffee
@@ -0,0 +1 @@
+#= require d3
diff --git a/app/assets/javascripts/lib/raphael/application.js.coffee b/app/assets/javascripts/lib/raphael/application.js.coffee
new file mode 100644
index 00000000000..ab8e5979b87
--- /dev/null
+++ b/app/assets/javascripts/lib/raphael/application.js.coffee
@@ -0,0 +1,3 @@
+#= require raphael
+#= require g.raphael
+#= require g.bar
diff --git a/app/assets/javascripts/users/application.js.coffee b/app/assets/javascripts/users/application.js.coffee
index 647ffbf5f45..91cacfece46 100644
--- a/app/assets/javascripts/users/application.js.coffee
+++ b/app/assets/javascripts/users/application.js.coffee
@@ -1,8 +1,2 @@
-# This is a manifest file that'll be compiled into including all the files listed below.
-# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-# be included in the compiled file accessible from http://example.com/assets/application.js
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
 #
-#= require d3
 #= require_tree .
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index d5965a6ec99..bc3118f70aa 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -30,11 +30,8 @@
 
   = javascript_include_tag "application", integrity: true
 
-  -# FIXME: SRI doesn't apply to the dynamically-generated per-page
-  -# JavaScript due to a bug in sprockets-rails.
-  -# See https://github.com/rails/sprockets-rails/issues/359
-  - if page_specific_javascripts
-    = javascript_include_tag page_specific_javascripts, {"data-turbolinks-track" => true}
+  - if :page_specific_javascripts
+    = yield :page_specific_javascripts
 
   = csrf_meta_tags
 
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index a388d9a0a61..5ea4adcd0fa 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -1,7 +1,9 @@
 .nav-links.sub-nav
   %ul{ class: (container_class) }
 
-    - page_specific_javascripts asset_path("graphs/application.js")
+    - content_for :page_specific_javascripts do
+      = javascript_include_tag 'lib/chart/application.js', {integrity: true, "data-turbolinks-track" => true}
+      = javascript_include_tag 'graphs/application.js', {integrity: true, "data-turbolinks-track" => true}
     = nav_link(action: :show) do
       = link_to 'Contributors', namespace_project_graph_path
     = nav_link(action: :commits) do
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 593af319a47..749afe6b6ab 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,5 +1,7 @@
 - page_title "Network", @ref
-- page_specific_javascripts asset_path("network/application.js")
+- content_for :page_specific_javascripts do
+  = javascript_include_tag 'lib/raphael/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = javascript_include_tag 'network/application.js', {integrity: true, "data-turbolinks-track" => true}
 = render "projects/commits/head"
 = render "head"
 %div{ class: (container_class) }
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 92305594a81..9ca351e5147 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,6 +1,8 @@
 - page_title       @user.name
 - page_description @user.bio
-- page_specific_javascripts asset_path("users/application.js")
+- content_for :page_specific_javascripts do
+  = javascript_include_tag 'lib/d3/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = javascript_include_tag 'users/application.js', {integrity: true, "data-turbolinks-track" => true}
 - header_title     @user.name, user_path(@user)
 - @no_container = true
 
-- 
cgit v1.2.1


From 4cca9a3e0f388210883ea2e3be97e92ac0576b38 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 10:55:40 -0600
Subject: Reorganize the lib directory.

---
 app/assets/javascripts/application.js.coffee       |   2 +-
 app/assets/javascripts/lib/animate.js.coffee       |  39 ----
 app/assets/javascripts/lib/chart.js.coffee         |   1 +
 .../javascripts/lib/chart/application.js.coffee    |   1 -
 app/assets/javascripts/lib/common_utils.js.coffee  |  65 -------
 app/assets/javascripts/lib/d3.js.coffee            |   1 +
 .../javascripts/lib/d3/application.js.coffee       |   1 -
 .../javascripts/lib/datetime_utility.js.coffee     |  24 ---
 .../javascripts/lib/emoji_aliases.js.coffee.erb    |   2 -
 app/assets/javascripts/lib/jquery.timeago.js       | 181 ------------------
 app/assets/javascripts/lib/md5.js                  | 211 ---------------------
 app/assets/javascripts/lib/notify.js.coffee        |  35 ----
 app/assets/javascripts/lib/raphael.js.coffee       |   3 +
 .../javascripts/lib/raphael/application.js.coffee  |   3 -
 app/assets/javascripts/lib/text_utility.js.coffee  |  79 --------
 app/assets/javascripts/lib/type_utility.js.coffee  |   9 -
 app/assets/javascripts/lib/url_utility.js.coffee   |  52 -----
 app/assets/javascripts/lib/utf8_encode.js          |  70 -------
 app/assets/javascripts/lib/utils/animate.js.coffee |  39 ++++
 .../javascripts/lib/utils/common_utils.js.coffee   |  65 +++++++
 .../lib/utils/datetime_utility.js.coffee           |  24 +++
 .../lib/utils/emoji_aliases.js.coffee.erb          |   2 +
 app/assets/javascripts/lib/utils/jquery.timeago.js | 181 ++++++++++++++++++
 app/assets/javascripts/lib/utils/md5.js            | 211 +++++++++++++++++++++
 app/assets/javascripts/lib/utils/notify.js.coffee  |  35 ++++
 .../javascripts/lib/utils/text_utility.js.coffee   |  79 ++++++++
 .../javascripts/lib/utils/type_utility.js.coffee   |   9 +
 .../javascripts/lib/utils/url_utility.js.coffee    |  52 +++++
 app/assets/javascripts/lib/utils/utf8_encode.js    |  70 +++++++
 .../javascripts/network/application.js.coffee      |   3 -
 app/views/projects/graphs/_head.html.haml          |   2 +-
 app/views/projects/network/show.html.haml          |   2 +-
 app/views/users/show.html.haml                     |   2 +-
 33 files changed, 776 insertions(+), 779 deletions(-)
 delete mode 100644 app/assets/javascripts/lib/animate.js.coffee
 create mode 100644 app/assets/javascripts/lib/chart.js.coffee
 delete mode 100644 app/assets/javascripts/lib/chart/application.js.coffee
 delete mode 100644 app/assets/javascripts/lib/common_utils.js.coffee
 create mode 100644 app/assets/javascripts/lib/d3.js.coffee
 delete mode 100644 app/assets/javascripts/lib/d3/application.js.coffee
 delete mode 100644 app/assets/javascripts/lib/datetime_utility.js.coffee
 delete mode 100644 app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
 delete mode 100644 app/assets/javascripts/lib/jquery.timeago.js
 delete mode 100644 app/assets/javascripts/lib/md5.js
 delete mode 100644 app/assets/javascripts/lib/notify.js.coffee
 create mode 100644 app/assets/javascripts/lib/raphael.js.coffee
 delete mode 100644 app/assets/javascripts/lib/raphael/application.js.coffee
 delete mode 100644 app/assets/javascripts/lib/text_utility.js.coffee
 delete mode 100644 app/assets/javascripts/lib/type_utility.js.coffee
 delete mode 100644 app/assets/javascripts/lib/url_utility.js.coffee
 delete mode 100644 app/assets/javascripts/lib/utf8_encode.js
 create mode 100644 app/assets/javascripts/lib/utils/animate.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/common_utils.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/datetime_utility.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb
 create mode 100644 app/assets/javascripts/lib/utils/jquery.timeago.js
 create mode 100644 app/assets/javascripts/lib/utils/md5.js
 create mode 100644 app/assets/javascripts/lib/utils/notify.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/text_utility.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/type_utility.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/url_utility.js.coffee
 create mode 100644 app/assets/javascripts/lib/utils/utf8_encode.js

(limited to 'app')

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 07b45eae9bb..5c5a4ca7670 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -50,7 +50,7 @@
 #= require_directory ./ci
 #= require_directory ./commit
 #= require_directory ./extensions
-#= require_directory ./lib/.
+#= require_directory ./lib/utils
 #= require_directory ./u2f
 #= require_directory .
 #= require fuzzaldrin-plus
diff --git a/app/assets/javascripts/lib/animate.js.coffee b/app/assets/javascripts/lib/animate.js.coffee
deleted file mode 100644
index ec3b44d6126..00000000000
--- a/app/assets/javascripts/lib/animate.js.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-((w) -> 
-  if not w.gl? then w.gl = {}
-  if not gl.animate? then gl.animate = {}
-
-  gl.animate.animate = ($el, animation, options, done) ->
-    if options?.cssStart?
-      $el.css(options.cssStart)
-    $el
-      .removeClass(animation + ' animated')
-      .addClass(animation + ' animated')
-      .one 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', ->
-        $(this).removeClass(animation + ' animated')
-        if done?
-          done()
-        if options?.cssEnd?
-          $el.css(options.cssEnd)
-        return
-    return
-
-  gl.animate.animateEach = ($els, animation, time, options, done) ->
-    dfd = $.Deferred()
-    if not $els.length
-      dfd.resolve()
-    $els.each((i) ->
-      setTimeout(=>
-        $this = $(@)
-        gl.animate.animate($this, animation, options, =>
-          if i is $els.length - 1
-            dfd.resolve()
-            if done?
-              done()
-        )
-      ,time * i
-      )
-      return
-    )
-    return dfd.promise()
-  return 
-) window
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/chart.js.coffee b/app/assets/javascripts/lib/chart.js.coffee
new file mode 100644
index 00000000000..82217fc5107
--- /dev/null
+++ b/app/assets/javascripts/lib/chart.js.coffee
@@ -0,0 +1 @@
+#= require Chart
diff --git a/app/assets/javascripts/lib/chart/application.js.coffee b/app/assets/javascripts/lib/chart/application.js.coffee
deleted file mode 100644
index 82217fc5107..00000000000
--- a/app/assets/javascripts/lib/chart/application.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-#= require Chart
diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee
deleted file mode 100644
index e39dcb2daa9..00000000000
--- a/app/assets/javascripts/lib/common_utils.js.coffee
+++ /dev/null
@@ -1,65 +0,0 @@
-((w) ->
-
-  w.gl       or= {}
-  w.gl.utils or= {}
-
-  w.gl.utils.isInGroupsPage = ->
-
-    return $('body').data('page').split(':')[0] is 'groups'
-
-
-  w.gl.utils.isInProjectPage = ->
-
-    return $('body').data('page').split(':')[0] is 'projects'
-
-
-  w.gl.utils.getProjectSlug = ->
-
-    return if @isInProjectPage() then $('body').data 'project' else null
-
-
-  w.gl.utils.getGroupSlug = ->
-
-    return if @isInGroupsPage() then $('body').data 'group' else null
-
-
-
-  gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) ->
-
-    $tooltipEl
-      .tooltip 'destroy'
-      .attr    'title', newTitle
-      .tooltip 'fixTitle'
-
-
-  gl.utils.preventDisabledButtons = ->
-
-    $('.btn').click (e) ->
-      if $(this).hasClass 'disabled'
-        e.preventDefault()
-        e.stopImmediatePropagation()
-        return false
-
-
-  jQuery.timefor = (time, suffix, expiredLabel) ->
-
-    return '' unless time
-
-    suffix       or= 'remaining'
-    expiredLabel or= 'Past due'
-
-    jQuery.timeago.settings.allowFuture = yes
-
-    { suffixFromNow } = jQuery.timeago.settings.strings
-    jQuery.timeago.settings.strings.suffixFromNow = suffix
-
-    timefor = $.timeago time
-
-    if timefor.indexOf('ago') > -1
-      timefor = expiredLabel
-
-    jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow
-
-    return timefor
-
-) window
diff --git a/app/assets/javascripts/lib/d3.js.coffee b/app/assets/javascripts/lib/d3.js.coffee
new file mode 100644
index 00000000000..74f0a0bb06a
--- /dev/null
+++ b/app/assets/javascripts/lib/d3.js.coffee
@@ -0,0 +1 @@
+#= require d3
diff --git a/app/assets/javascripts/lib/d3/application.js.coffee b/app/assets/javascripts/lib/d3/application.js.coffee
deleted file mode 100644
index 74f0a0bb06a..00000000000
--- a/app/assets/javascripts/lib/d3/application.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-#= require d3
diff --git a/app/assets/javascripts/lib/datetime_utility.js.coffee b/app/assets/javascripts/lib/datetime_utility.js.coffee
deleted file mode 100644
index 948d6dbf07e..00000000000
--- a/app/assets/javascripts/lib/datetime_utility.js.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  w.gl.utils.formatDate = (datetime) ->
-    dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
-
-  w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) ->
-    $timeagoEls.each( ->
-          $el = $(@)
-          $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
-    )
-
-    if setTimeago
-      $timeagoEls.timeago()
-      $timeagoEls.tooltip('destroy')
-
-      # Recreate with custom template
-      $timeagoEls.tooltip(
-        template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-      )
-
-) window
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
deleted file mode 100644
index 80f9936b9c2..00000000000
--- a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-gl.emojiAliases = ->
-  JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')
diff --git a/app/assets/javascripts/lib/jquery.timeago.js b/app/assets/javascripts/lib/jquery.timeago.js
deleted file mode 100644
index cc17aa7d3d1..00000000000
--- a/app/assets/javascripts/lib/jquery.timeago.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Timeago is a jQuery plugin that makes it easy to support automatically
- * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
- *
- * @name timeago
- * @version 1.1.0
- * @requires jQuery v1.2.3+
- * @author Ryan McGeary
- * @license MIT License - http://www.opensource.org/licenses/mit-license.php
- *
- * For usage and examples, visit:
- * http://timeago.yarp.com/
- *
- * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
- */
-
-(function (factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['jquery'], factory);
-  } else {
-    // Browser globals
-    factory(jQuery);
-  }
-}(function ($) {
-  $.timeago = function(timestamp) {
-    if (timestamp instanceof Date) {
-      return inWords(timestamp);
-    } else if (typeof timestamp === "string") {
-      return inWords($.timeago.parse(timestamp));
-    } else if (typeof timestamp === "number") {
-      return inWords(new Date(timestamp));
-    } else {
-      return inWords($.timeago.datetime(timestamp));
-    }
-  };
-  var $t = $.timeago;
-
-  $.extend($.timeago, {
-    settings: {
-      refreshMillis: 60000,
-      allowFuture: false,
-      strings: {
-        prefixAgo: null,
-        prefixFromNow: null,
-        suffixAgo: "ago",
-        suffixFromNow: "from now",
-        seconds: "less than a minute",
-        minute: "about a minute",
-        minutes: "%d minutes",
-        hour: "about an hour",
-        hours: "about %d hours",
-        day: "a day",
-        days: "%d days",
-        month: "about a month",
-        months: "%d months",
-        year: "about a year",
-        years: "%d years",
-        wordSeparator: " ",
-        numbers: []
-      }
-    },
-    inWords: function(distanceMillis) {
-      var $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
-      if (this.settings.allowFuture) {
-        if (distanceMillis < 0) {
-          prefix = $l.prefixFromNow;
-          suffix = $l.suffixFromNow;
-        }
-      }
-
-      var seconds = Math.abs(distanceMillis) / 1000;
-      var minutes = seconds / 60;
-      var hours = minutes / 60;
-      var days = hours / 24;
-      var years = days / 365;
-
-      function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
-        return string.replace(/%d/i, value);
-      }
-
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
-        seconds < 90 && substitute($l.minute, 1) ||
-        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
-        minutes < 90 && substitute($l.hour, 1) ||
-        hours < 24 && substitute($l.hours, Math.round(hours)) ||
-        hours < 42 && substitute($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.round(days)) ||
-        days < 45 && substitute($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.round(days / 30)) ||
-        years < 1.5 && substitute($l.year, 1) ||
-        substitute($l.years, Math.round(years));
-
-      var separator = $l.wordSeparator || "";
-      if ($l.wordSeparator === undefined) { separator = " "; }
-      return $.trim([prefix, words, suffix].join(separator));
-    },
-    parse: function(iso8601) {
-      var s = $.trim(iso8601);
-      s = s.replace(/\.\d+/,""); // remove milliseconds
-      s = s.replace(/-/,"/").replace(/-/,"/");
-      s = s.replace(/T/," ").replace(/Z/," UTC");
-      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
-      return new Date(s);
-    },
-    datetime: function(elem) {
-      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
-      return $t.parse(iso8601);
-    },
-    isTime: function(elem) {
-      // jQuery's `is()` doesn't play well with HTML5 in IE
-      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
-    }
-  });
-
-  // functions that can be called via $(el).timeago('action')
-  // init is default when no action is given
-  // functions are called with context of a single element
-  var functions = {
-    init: function(){
-      var refresh_el = $.proxy(refresh, this);
-      refresh_el();
-      var $s = $t.settings;
-      if ($s.refreshMillis > 0) {
-        setInterval(refresh_el, $s.refreshMillis);
-      }
-    },
-    update: function(time){
-      $(this).data('timeago', { datetime: $t.parse(time) });
-      refresh.apply(this);
-    }
-  };
-
-  $.fn.timeago = function(action, options) {
-    var fn = action ? functions[action] : functions.init;
-    if(!fn){
-      throw new Error("Unknown function name '"+ action +"' for timeago");
-    }
-    // each over objects here and call the requested function
-    this.each(function(){
-      fn.call(this, options);
-    });
-    return this;
-  };
-
-  function refresh() {
-    var data = prepareData(this);
-    if (!isNaN(data.datetime)) {
-      $(this).text(inWords(data.datetime));
-    }
-    return this;
-  }
-
-  function prepareData(element) {
-    element = $(element);
-    if (!element.data("timeago")) {
-      element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
-      if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
-        element.attr("title", text);
-      }
-    }
-    return element.data("timeago");
-  }
-
-  function inWords(date) {
-    return $t.inWords(distance(date));
-  }
-
-  function distance(date) {
-    return (new Date().getTime() - date.getTime());
-  }
-
-  // fix for IE6 suckage
-  document.createElement("abbr");
-  document.createElement("time");
-}));
diff --git a/app/assets/javascripts/lib/md5.js b/app/assets/javascripts/lib/md5.js
deleted file mode 100644
index b63716eaad2..00000000000
--- a/app/assets/javascripts/lib/md5.js
+++ /dev/null
@@ -1,211 +0,0 @@
-function md5 (str) {
-  // http://kevin.vanzonneveld.net
-  // +   original by: Webtoolkit.info (http://www.webtoolkit.info/)
-  // + namespaced by: Michael White (http://getsprink.com)
-  // +    tweaked by: Jack
-  // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // +      input by: Brett Zamir (http://brett-zamir.me)
-  // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // -    depends on: utf8_encode
-  // *     example 1: md5('Kevin van Zonneveld');
-  // *     returns 1: '6e658d4bfcb59cc13f96c14450ac40b9'
-  var xl;
-
-  var rotateLeft = function (lValue, iShiftBits) {
-    return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
-  };
-
-  var addUnsigned = function (lX, lY) {
-    var lX4, lY4, lX8, lY8, lResult;
-    lX8 = (lX & 0x80000000);
-    lY8 = (lY & 0x80000000);
-    lX4 = (lX & 0x40000000);
-    lY4 = (lY & 0x40000000);
-    lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
-    if (lX4 & lY4) {
-      return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
-    }
-    if (lX4 | lY4) {
-      if (lResult & 0x40000000) {
-        return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
-      } else {
-        return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
-      }
-    } else {
-      return (lResult ^ lX8 ^ lY8);
-    }
-  };
-
-  var _F = function (x, y, z) {
-    return (x & y) | ((~x) & z);
-  };
-  var _G = function (x, y, z) {
-    return (x & z) | (y & (~z));
-  };
-  var _H = function (x, y, z) {
-    return (x ^ y ^ z);
-  };
-  var _I = function (x, y, z) {
-    return (y ^ (x | (~z)));
-  };
-
-  var _FF = function (a, b, c, d, x, s, ac) {
-    a = addUnsigned(a, addUnsigned(addUnsigned(_F(b, c, d), x), ac));
-    return addUnsigned(rotateLeft(a, s), b);
-  };
-
-  var _GG = function (a, b, c, d, x, s, ac) {
-    a = addUnsigned(a, addUnsigned(addUnsigned(_G(b, c, d), x), ac));
-    return addUnsigned(rotateLeft(a, s), b);
-  };
-
-  var _HH = function (a, b, c, d, x, s, ac) {
-    a = addUnsigned(a, addUnsigned(addUnsigned(_H(b, c, d), x), ac));
-    return addUnsigned(rotateLeft(a, s), b);
-  };
-
-  var _II = function (a, b, c, d, x, s, ac) {
-    a = addUnsigned(a, addUnsigned(addUnsigned(_I(b, c, d), x), ac));
-    return addUnsigned(rotateLeft(a, s), b);
-  };
-
-  var convertToWordArray = function (str) {
-    var lWordCount;
-    var lMessageLength = str.length;
-    var lNumberOfWords_temp1 = lMessageLength + 8;
-    var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
-    var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
-    var lWordArray = new Array(lNumberOfWords - 1);
-    var lBytePosition = 0;
-    var lByteCount = 0;
-    while (lByteCount < lMessageLength) {
-      lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-      lBytePosition = (lByteCount % 4) * 8;
-      lWordArray[lWordCount] = (lWordArray[lWordCount] | (str.charCodeAt(lByteCount) << lBytePosition));
-      lByteCount++;
-    }
-    lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-    lBytePosition = (lByteCount % 4) * 8;
-    lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
-    lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
-    lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
-    return lWordArray;
-  };
-
-  var wordToHex = function (lValue) {
-    var wordToHexValue = "",
-      wordToHexValue_temp = "",
-      lByte, lCount;
-    for (lCount = 0; lCount <= 3; lCount++) {
-      lByte = (lValue >>> (lCount * 8)) & 255;
-      wordToHexValue_temp = "0" + lByte.toString(16);
-      wordToHexValue = wordToHexValue + wordToHexValue_temp.substr(wordToHexValue_temp.length - 2, 2);
-    }
-    return wordToHexValue;
-  };
-
-  var x = [],
-    k, AA, BB, CC, DD, a, b, c, d, S11 = 7,
-    S12 = 12,
-    S13 = 17,
-    S14 = 22,
-    S21 = 5,
-    S22 = 9,
-    S23 = 14,
-    S24 = 20,
-    S31 = 4,
-    S32 = 11,
-    S33 = 16,
-    S34 = 23,
-    S41 = 6,
-    S42 = 10,
-    S43 = 15,
-    S44 = 21;
-
-  str = this.utf8_encode(str);
-  x = convertToWordArray(str);
-  a = 0x67452301;
-  b = 0xEFCDAB89;
-  c = 0x98BADCFE;
-  d = 0x10325476;
-
-  xl = x.length;
-  for (k = 0; k < xl; k += 16) {
-    AA = a;
-    BB = b;
-    CC = c;
-    DD = d;
-    a = _FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
-    d = _FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
-    c = _FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
-    b = _FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
-    a = _FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
-    d = _FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
-    c = _FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
-    b = _FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
-    a = _FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
-    d = _FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
-    c = _FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
-    b = _FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
-    a = _FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
-    d = _FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
-    c = _FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
-    b = _FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
-    a = _GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
-    d = _GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
-    c = _GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
-    b = _GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
-    a = _GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
-    d = _GG(d, a, b, c, x[k + 10], S22, 0x2441453);
-    c = _GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
-    b = _GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
-    a = _GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
-    d = _GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
-    c = _GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
-    b = _GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
-    a = _GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
-    d = _GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
-    c = _GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
-    b = _GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
-    a = _HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
-    d = _HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
-    c = _HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
-    b = _HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
-    a = _HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
-    d = _HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
-    c = _HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
-    b = _HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
-    a = _HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
-    d = _HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
-    c = _HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
-    b = _HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
-    a = _HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
-    d = _HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
-    c = _HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
-    b = _HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
-    a = _II(a, b, c, d, x[k + 0], S41, 0xF4292244);
-    d = _II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
-    c = _II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
-    b = _II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
-    a = _II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
-    d = _II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
-    c = _II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
-    b = _II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
-    a = _II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
-    d = _II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
-    c = _II(c, d, a, b, x[k + 6], S43, 0xA3014314);
-    b = _II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
-    a = _II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
-    d = _II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
-    c = _II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
-    b = _II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
-    a = addUnsigned(a, AA);
-    b = addUnsigned(b, BB);
-    c = addUnsigned(c, CC);
-    d = addUnsigned(d, DD);
-  }
-
-  var temp = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
-
-  return temp.toLowerCase();
-}
diff --git a/app/assets/javascripts/lib/notify.js.coffee b/app/assets/javascripts/lib/notify.js.coffee
deleted file mode 100644
index 9e28353ac34..00000000000
--- a/app/assets/javascripts/lib/notify.js.coffee
+++ /dev/null
@@ -1,35 +0,0 @@
-((w) ->
-  notificationGranted = (message, opts, onclick) ->
-    notification = new Notification(message, opts)
-
-    # Hide the notification after X amount of seconds
-    setTimeout ->
-      notification.close()
-    , 8000
-
-    if onclick
-      notification.onclick = onclick
-
-  notifyPermissions = ->
-    if 'Notification' of window
-      Notification.requestPermission()
-
-  notifyMe = (message, body, icon, onclick) ->
-    opts =
-      body: body
-      icon: icon
-    # Let's check if the browser supports notifications
-    if !('Notification' of window)
-      # do nothing
-    else if Notification.permission == 'granted'
-      # If it's okay let's create a notification
-      notificationGranted message, opts, onclick
-    else if Notification.permission != 'denied'
-      Notification.requestPermission (permission) ->
-        # If the user accepts, let's create a notification
-        if permission == 'granted'
-          notificationGranted message, opts, onclick
-
-  w.notify = notifyMe
-  w.notifyPermissions = notifyPermissions
-) window
diff --git a/app/assets/javascripts/lib/raphael.js.coffee b/app/assets/javascripts/lib/raphael.js.coffee
new file mode 100644
index 00000000000..ab8e5979b87
--- /dev/null
+++ b/app/assets/javascripts/lib/raphael.js.coffee
@@ -0,0 +1,3 @@
+#= require raphael
+#= require g.raphael
+#= require g.bar
diff --git a/app/assets/javascripts/lib/raphael/application.js.coffee b/app/assets/javascripts/lib/raphael/application.js.coffee
deleted file mode 100644
index ab8e5979b87..00000000000
--- a/app/assets/javascripts/lib/raphael/application.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-#= require raphael
-#= require g.raphael
-#= require g.bar
diff --git a/app/assets/javascripts/lib/text_utility.js.coffee b/app/assets/javascripts/lib/text_utility.js.coffee
deleted file mode 100644
index bb2772dfed2..00000000000
--- a/app/assets/javascripts/lib/text_utility.js.coffee
+++ /dev/null
@@ -1,79 +0,0 @@
-((w) ->
-  w.gl ?= {}
-  w.gl.text ?= {}
-
-  gl.text.randomString = -> Math.random().toString(36).substring(7)
-
-  gl.text.replaceRange = (s, start, end, substitute) ->
-    s.substring(0, start) + substitute + s.substring(end);
-
-  gl.text.selectedText = (text, textarea) ->
-    text.substring(textarea.selectionStart, textarea.selectionEnd)
-
-  gl.text.insertText = (textArea, text, tag, selected, wrap) ->
-    selectedSplit = selected.split('\n')
-    startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
-
-    if selectedSplit.length > 1 and not wrap
-      insertText = selectedSplit.map((val) ->
-        if val.indexOf(tag) is 0
-          "#{val.replace(tag, '')}"
-        else
-          "#{tag}#{val}"
-      ).join('\n')
-    else
-      insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
-
-    if document.queryCommandSupported('insertText')
-      document.execCommand 'insertText', false, insertText
-    else
-      try
-        document.execCommand("ms-beginUndoUnit")
-
-      textArea.value = @replaceRange(
-          text,
-          textArea.selectionStart,
-          textArea.selectionEnd,
-          insertText)
-      try
-        document.execCommand("ms-endUndoUnit")
-
-    @moveCursor(textArea, tag, wrap)
-
-  gl.text.moveCursor = (textArea, tag, wrapped) ->
-    return unless textArea.setSelectionRange
-
-    if textArea.selectionStart is textArea.selectionEnd
-      if wrapped
-        pos = textArea.selectionStart - tag.length
-      else
-        pos = textArea.selectionStart
-
-      textArea.setSelectionRange pos, pos
-
-  gl.text.updateText = (textArea, tag, wrap) ->
-    $textArea = $(textArea)
-    oldVal = $textArea.val()
-    textArea = $textArea.get(0)
-    text = $textArea.val()
-    selected = @selectedText(text, textArea)
-    $textArea.focus()
-
-    @insertText(textArea, text, tag, selected, wrap)
-
-  gl.text.init = (form) ->
-    self = @
-    $('.js-md', form)
-      .off 'click'
-      .on 'click', ->
-        $this = $(@)
-        self.updateText(
-          $this.closest('.md-area').find('textarea'),
-          $this.data('md-tag'),
-          not $this.data('md-prepend')
-        )
-
-  gl.text.removeListeners = (form) ->
-    $('.js-md', form).off()
-
-) window
diff --git a/app/assets/javascripts/lib/type_utility.js.coffee b/app/assets/javascripts/lib/type_utility.js.coffee
deleted file mode 100644
index 957f0d86b36..00000000000
--- a/app/assets/javascripts/lib/type_utility.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  w.gl.utils.isObject = (obj) ->
-    obj? and (obj.constructor is Object)
-
-) window
diff --git a/app/assets/javascripts/lib/url_utility.js.coffee b/app/assets/javascripts/lib/url_utility.js.coffee
deleted file mode 100644
index e8085e1c2e4..00000000000
--- a/app/assets/javascripts/lib/url_utility.js.coffee
+++ /dev/null
@@ -1,52 +0,0 @@
-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  # Returns an array containing the value(s) of the
-  # of the key passed as an argument
-  w.gl.utils.getParameterValues = (sParam) ->
-    sPageURL = decodeURIComponent(window.location.search.substring(1))
-    sURLVariables = sPageURL.split('&')
-    sParameterName = undefined
-    values = []
-    i = 0
-    while i < sURLVariables.length
-      sParameterName = sURLVariables[i].split('=')
-      if sParameterName[0] is sParam
-        values.push(sParameterName[1])
-      i++
-    values
-
-  # #
-  #  @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 not paramValue?
-        newUrl = newUrl.replace pattern, ''
-      else if url.search(pattern) isnt -1
-        newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
-      else
-        newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
-
-    # Remove a trailing ampersand
-    lastChar = newUrl[newUrl.length - 1]
-
-    if lastChar is '&'
-        newUrl = newUrl.slice 0, -1
-
-    newUrl
-
-  # removes parameter query string from url. returns the modified url
-  w.gl.utils.removeParamQueryString = (url, param) ->
-    url = decodeURIComponent(url)
-    urlVariables = url.split('&')
-    (
-      variables for variables in urlVariables when variables.indexOf(param) is -1
-    ).join('&')
-
-) window
diff --git a/app/assets/javascripts/lib/utf8_encode.js b/app/assets/javascripts/lib/utf8_encode.js
deleted file mode 100644
index 39ffe44dae0..00000000000
--- a/app/assets/javascripts/lib/utf8_encode.js
+++ /dev/null
@@ -1,70 +0,0 @@
-function utf8_encode (argString) {
-  // http://kevin.vanzonneveld.net
-  // +   original by: Webtoolkit.info (http://www.webtoolkit.info/)
-  // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // +   improved by: sowberry
-  // +    tweaked by: Jack
-  // +   bugfixed by: Onno Marsman
-  // +   improved by: Yves Sucaet
-  // +   bugfixed by: Onno Marsman
-  // +   bugfixed by: Ulrich
-  // +   bugfixed by: Rafal Kukawski
-  // +   improved by: kirilloid
-  // +   bugfixed by: kirilloid
-  // *     example 1: utf8_encode('Kevin van Zonneveld');
-  // *     returns 1: 'Kevin van Zonneveld'
-
-  if (argString === null || typeof argString === "undefined") {
-    return "";
-  }
-
-  var string = (argString + ''); // .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  var utftext = '',
-    start, end, stringl = 0;
-
-  start = end = 0;
-  stringl = string.length;
-  for (var n = 0; n < stringl; n++) {
-    var c1 = string.charCodeAt(n);
-    var enc = null;
-
-    if (c1 < 128) {
-      end++;
-    } else if (c1 > 127 && c1 < 2048) {
-      enc = String.fromCharCode(
-         (c1 >> 6)        | 192,
-        ( c1        & 63) | 128
-      );
-    } else if (c1 & 0xF800 != 0xD800) {
-      enc = String.fromCharCode(
-         (c1 >> 12)       | 224,
-        ((c1 >> 6)  & 63) | 128,
-        ( c1        & 63) | 128
-      );
-    } else { // surrogate pairs
-      if (c1 & 0xFC00 != 0xD800) { throw new RangeError("Unmatched trail surrogate at " + n); }
-      var c2 = string.charCodeAt(++n);
-      if (c2 & 0xFC00 != 0xDC00) { throw new RangeError("Unmatched lead surrogate at " + (n-1)); }
-      c1 = ((c1 & 0x3FF) << 10) + (c2 & 0x3FF) + 0x10000;
-      enc = String.fromCharCode(
-         (c1 >> 18)       | 240,
-        ((c1 >> 12) & 63) | 128,
-        ((c1 >> 6)  & 63) | 128,
-        ( c1        & 63) | 128
-      );
-    }
-    if (enc !== null) {
-      if (end > start) {
-        utftext += string.slice(start, end);
-      }
-      utftext += enc;
-      start = end = n + 1;
-    }
-  }
-
-  if (end > start) {
-    utftext += string.slice(start, stringl);
-  }
-
-  return utftext;
-}
diff --git a/app/assets/javascripts/lib/utils/animate.js.coffee b/app/assets/javascripts/lib/utils/animate.js.coffee
new file mode 100644
index 00000000000..ec3b44d6126
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/animate.js.coffee
@@ -0,0 +1,39 @@
+((w) -> 
+  if not w.gl? then w.gl = {}
+  if not gl.animate? then gl.animate = {}
+
+  gl.animate.animate = ($el, animation, options, done) ->
+    if options?.cssStart?
+      $el.css(options.cssStart)
+    $el
+      .removeClass(animation + ' animated')
+      .addClass(animation + ' animated')
+      .one 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', ->
+        $(this).removeClass(animation + ' animated')
+        if done?
+          done()
+        if options?.cssEnd?
+          $el.css(options.cssEnd)
+        return
+    return
+
+  gl.animate.animateEach = ($els, animation, time, options, done) ->
+    dfd = $.Deferred()
+    if not $els.length
+      dfd.resolve()
+    $els.each((i) ->
+      setTimeout(=>
+        $this = $(@)
+        gl.animate.animate($this, animation, options, =>
+          if i is $els.length - 1
+            dfd.resolve()
+            if done?
+              done()
+        )
+      ,time * i
+      )
+      return
+    )
+    return dfd.promise()
+  return 
+) window
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.coffee b/app/assets/javascripts/lib/utils/common_utils.js.coffee
new file mode 100644
index 00000000000..e39dcb2daa9
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/common_utils.js.coffee
@@ -0,0 +1,65 @@
+((w) ->
+
+  w.gl       or= {}
+  w.gl.utils or= {}
+
+  w.gl.utils.isInGroupsPage = ->
+
+    return $('body').data('page').split(':')[0] is 'groups'
+
+
+  w.gl.utils.isInProjectPage = ->
+
+    return $('body').data('page').split(':')[0] is 'projects'
+
+
+  w.gl.utils.getProjectSlug = ->
+
+    return if @isInProjectPage() then $('body').data 'project' else null
+
+
+  w.gl.utils.getGroupSlug = ->
+
+    return if @isInGroupsPage() then $('body').data 'group' else null
+
+
+
+  gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) ->
+
+    $tooltipEl
+      .tooltip 'destroy'
+      .attr    'title', newTitle
+      .tooltip 'fixTitle'
+
+
+  gl.utils.preventDisabledButtons = ->
+
+    $('.btn').click (e) ->
+      if $(this).hasClass 'disabled'
+        e.preventDefault()
+        e.stopImmediatePropagation()
+        return false
+
+
+  jQuery.timefor = (time, suffix, expiredLabel) ->
+
+    return '' unless time
+
+    suffix       or= 'remaining'
+    expiredLabel or= 'Past due'
+
+    jQuery.timeago.settings.allowFuture = yes
+
+    { suffixFromNow } = jQuery.timeago.settings.strings
+    jQuery.timeago.settings.strings.suffixFromNow = suffix
+
+    timefor = $.timeago time
+
+    if timefor.indexOf('ago') > -1
+      timefor = expiredLabel
+
+    jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow
+
+    return timefor
+
+) window
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee
new file mode 100644
index 00000000000..948d6dbf07e
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee
@@ -0,0 +1,24 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.formatDate = (datetime) ->
+    dateFormat(datetime, 'mmm d, yyyy h:MMtt Z')
+
+  w.gl.utils.localTimeAgo = ($timeagoEls, setTimeago = true) ->
+    $timeagoEls.each( ->
+          $el = $(@)
+          $el.attr('title', gl.utils.formatDate($el.attr('datetime')))
+    )
+
+    if setTimeago
+      $timeagoEls.timeago()
+      $timeagoEls.tooltip('destroy')
+
+      # Recreate with custom template
+      $timeagoEls.tooltip(
+        template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+      )
+
+) window
diff --git a/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb
new file mode 100644
index 00000000000..80f9936b9c2
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb
@@ -0,0 +1,2 @@
+gl.emojiAliases = ->
+  JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>')
diff --git a/app/assets/javascripts/lib/utils/jquery.timeago.js b/app/assets/javascripts/lib/utils/jquery.timeago.js
new file mode 100644
index 00000000000..cc17aa7d3d1
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/jquery.timeago.js
@@ -0,0 +1,181 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 1.1.0
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function ($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowFuture: false,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+    inWords: function(distanceMillis) {
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator || "";
+      if ($l.wordSeparator === undefined) { separator = " "; }
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  // functions that can be called via $(el).timeago('action')
+  // init is default when no action is given
+  // functions are called with context of a single element
+  var functions = {
+    init: function(){
+      var refresh_el = $.proxy(refresh, this);
+      refresh_el();
+      var $s = $t.settings;
+      if ($s.refreshMillis > 0) {
+        setInterval(refresh_el, $s.refreshMillis);
+      }
+    },
+    update: function(time){
+      $(this).data('timeago', { datetime: $t.parse(time) });
+      refresh.apply(this);
+    }
+  };
+
+  $.fn.timeago = function(action, options) {
+    var fn = action ? functions[action] : functions.init;
+    if(!fn){
+      throw new Error("Unknown function name '"+ action +"' for timeago");
+    }
+    // each over objects here and call the requested function
+    this.each(function(){
+      fn.call(this, options);
+    });
+    return this;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    if (!isNaN(data.datetime)) {
+      $(this).text(inWords(data.datetime));
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}));
diff --git a/app/assets/javascripts/lib/utils/md5.js b/app/assets/javascripts/lib/utils/md5.js
new file mode 100644
index 00000000000..b63716eaad2
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/md5.js
@@ -0,0 +1,211 @@
+function md5 (str) {
+  // http://kevin.vanzonneveld.net
+  // +   original by: Webtoolkit.info (http://www.webtoolkit.info/)
+  // + namespaced by: Michael White (http://getsprink.com)
+  // +    tweaked by: Jack
+  // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+  // +      input by: Brett Zamir (http://brett-zamir.me)
+  // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+  // -    depends on: utf8_encode
+  // *     example 1: md5('Kevin van Zonneveld');
+  // *     returns 1: '6e658d4bfcb59cc13f96c14450ac40b9'
+  var xl;
+
+  var rotateLeft = function (lValue, iShiftBits) {
+    return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
+  };
+
+  var addUnsigned = function (lX, lY) {
+    var lX4, lY4, lX8, lY8, lResult;
+    lX8 = (lX & 0x80000000);
+    lY8 = (lY & 0x80000000);
+    lX4 = (lX & 0x40000000);
+    lY4 = (lY & 0x40000000);
+    lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
+    if (lX4 & lY4) {
+      return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
+    }
+    if (lX4 | lY4) {
+      if (lResult & 0x40000000) {
+        return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
+      } else {
+        return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
+      }
+    } else {
+      return (lResult ^ lX8 ^ lY8);
+    }
+  };
+
+  var _F = function (x, y, z) {
+    return (x & y) | ((~x) & z);
+  };
+  var _G = function (x, y, z) {
+    return (x & z) | (y & (~z));
+  };
+  var _H = function (x, y, z) {
+    return (x ^ y ^ z);
+  };
+  var _I = function (x, y, z) {
+    return (y ^ (x | (~z)));
+  };
+
+  var _FF = function (a, b, c, d, x, s, ac) {
+    a = addUnsigned(a, addUnsigned(addUnsigned(_F(b, c, d), x), ac));
+    return addUnsigned(rotateLeft(a, s), b);
+  };
+
+  var _GG = function (a, b, c, d, x, s, ac) {
+    a = addUnsigned(a, addUnsigned(addUnsigned(_G(b, c, d), x), ac));
+    return addUnsigned(rotateLeft(a, s), b);
+  };
+
+  var _HH = function (a, b, c, d, x, s, ac) {
+    a = addUnsigned(a, addUnsigned(addUnsigned(_H(b, c, d), x), ac));
+    return addUnsigned(rotateLeft(a, s), b);
+  };
+
+  var _II = function (a, b, c, d, x, s, ac) {
+    a = addUnsigned(a, addUnsigned(addUnsigned(_I(b, c, d), x), ac));
+    return addUnsigned(rotateLeft(a, s), b);
+  };
+
+  var convertToWordArray = function (str) {
+    var lWordCount;
+    var lMessageLength = str.length;
+    var lNumberOfWords_temp1 = lMessageLength + 8;
+    var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
+    var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
+    var lWordArray = new Array(lNumberOfWords - 1);
+    var lBytePosition = 0;
+    var lByteCount = 0;
+    while (lByteCount < lMessageLength) {
+      lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+      lBytePosition = (lByteCount % 4) * 8;
+      lWordArray[lWordCount] = (lWordArray[lWordCount] | (str.charCodeAt(lByteCount) << lBytePosition));
+      lByteCount++;
+    }
+    lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+    lBytePosition = (lByteCount % 4) * 8;
+    lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
+    lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
+    lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
+    return lWordArray;
+  };
+
+  var wordToHex = function (lValue) {
+    var wordToHexValue = "",
+      wordToHexValue_temp = "",
+      lByte, lCount;
+    for (lCount = 0; lCount <= 3; lCount++) {
+      lByte = (lValue >>> (lCount * 8)) & 255;
+      wordToHexValue_temp = "0" + lByte.toString(16);
+      wordToHexValue = wordToHexValue + wordToHexValue_temp.substr(wordToHexValue_temp.length - 2, 2);
+    }
+    return wordToHexValue;
+  };
+
+  var x = [],
+    k, AA, BB, CC, DD, a, b, c, d, S11 = 7,
+    S12 = 12,
+    S13 = 17,
+    S14 = 22,
+    S21 = 5,
+    S22 = 9,
+    S23 = 14,
+    S24 = 20,
+    S31 = 4,
+    S32 = 11,
+    S33 = 16,
+    S34 = 23,
+    S41 = 6,
+    S42 = 10,
+    S43 = 15,
+    S44 = 21;
+
+  str = this.utf8_encode(str);
+  x = convertToWordArray(str);
+  a = 0x67452301;
+  b = 0xEFCDAB89;
+  c = 0x98BADCFE;
+  d = 0x10325476;
+
+  xl = x.length;
+  for (k = 0; k < xl; k += 16) {
+    AA = a;
+    BB = b;
+    CC = c;
+    DD = d;
+    a = _FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
+    d = _FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
+    c = _FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
+    b = _FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
+    a = _FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
+    d = _FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
+    c = _FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
+    b = _FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
+    a = _FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
+    d = _FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
+    c = _FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
+    b = _FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
+    a = _FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
+    d = _FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
+    c = _FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
+    b = _FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
+    a = _GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
+    d = _GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
+    c = _GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
+    b = _GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
+    a = _GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
+    d = _GG(d, a, b, c, x[k + 10], S22, 0x2441453);
+    c = _GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
+    b = _GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
+    a = _GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
+    d = _GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
+    c = _GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
+    b = _GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
+    a = _GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
+    d = _GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
+    c = _GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
+    b = _GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
+    a = _HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
+    d = _HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
+    c = _HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
+    b = _HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
+    a = _HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
+    d = _HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
+    c = _HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
+    b = _HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
+    a = _HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
+    d = _HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
+    c = _HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
+    b = _HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
+    a = _HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
+    d = _HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
+    c = _HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
+    b = _HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
+    a = _II(a, b, c, d, x[k + 0], S41, 0xF4292244);
+    d = _II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
+    c = _II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
+    b = _II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
+    a = _II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
+    d = _II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
+    c = _II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
+    b = _II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
+    a = _II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
+    d = _II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
+    c = _II(c, d, a, b, x[k + 6], S43, 0xA3014314);
+    b = _II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
+    a = _II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
+    d = _II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
+    c = _II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
+    b = _II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
+    a = addUnsigned(a, AA);
+    b = addUnsigned(b, BB);
+    c = addUnsigned(c, CC);
+    d = addUnsigned(d, DD);
+  }
+
+  var temp = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
+
+  return temp.toLowerCase();
+}
diff --git a/app/assets/javascripts/lib/utils/notify.js.coffee b/app/assets/javascripts/lib/utils/notify.js.coffee
new file mode 100644
index 00000000000..9e28353ac34
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/notify.js.coffee
@@ -0,0 +1,35 @@
+((w) ->
+  notificationGranted = (message, opts, onclick) ->
+    notification = new Notification(message, opts)
+
+    # Hide the notification after X amount of seconds
+    setTimeout ->
+      notification.close()
+    , 8000
+
+    if onclick
+      notification.onclick = onclick
+
+  notifyPermissions = ->
+    if 'Notification' of window
+      Notification.requestPermission()
+
+  notifyMe = (message, body, icon, onclick) ->
+    opts =
+      body: body
+      icon: icon
+    # Let's check if the browser supports notifications
+    if !('Notification' of window)
+      # do nothing
+    else if Notification.permission == 'granted'
+      # If it's okay let's create a notification
+      notificationGranted message, opts, onclick
+    else if Notification.permission != 'denied'
+      Notification.requestPermission (permission) ->
+        # If the user accepts, let's create a notification
+        if permission == 'granted'
+          notificationGranted message, opts, onclick
+
+  w.notify = notifyMe
+  w.notifyPermissions = notifyPermissions
+) window
diff --git a/app/assets/javascripts/lib/utils/text_utility.js.coffee b/app/assets/javascripts/lib/utils/text_utility.js.coffee
new file mode 100644
index 00000000000..bb2772dfed2
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/text_utility.js.coffee
@@ -0,0 +1,79 @@
+((w) ->
+  w.gl ?= {}
+  w.gl.text ?= {}
+
+  gl.text.randomString = -> Math.random().toString(36).substring(7)
+
+  gl.text.replaceRange = (s, start, end, substitute) ->
+    s.substring(0, start) + substitute + s.substring(end);
+
+  gl.text.selectedText = (text, textarea) ->
+    text.substring(textarea.selectionStart, textarea.selectionEnd)
+
+  gl.text.insertText = (textArea, text, tag, selected, wrap) ->
+    selectedSplit = selected.split('\n')
+    startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
+
+    if selectedSplit.length > 1 and not wrap
+      insertText = selectedSplit.map((val) ->
+        if val.indexOf(tag) is 0
+          "#{val.replace(tag, '')}"
+        else
+          "#{tag}#{val}"
+      ).join('\n')
+    else
+      insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
+
+    if document.queryCommandSupported('insertText')
+      document.execCommand 'insertText', false, insertText
+    else
+      try
+        document.execCommand("ms-beginUndoUnit")
+
+      textArea.value = @replaceRange(
+          text,
+          textArea.selectionStart,
+          textArea.selectionEnd,
+          insertText)
+      try
+        document.execCommand("ms-endUndoUnit")
+
+    @moveCursor(textArea, tag, wrap)
+
+  gl.text.moveCursor = (textArea, tag, wrapped) ->
+    return unless textArea.setSelectionRange
+
+    if textArea.selectionStart is textArea.selectionEnd
+      if wrapped
+        pos = textArea.selectionStart - tag.length
+      else
+        pos = textArea.selectionStart
+
+      textArea.setSelectionRange pos, pos
+
+  gl.text.updateText = (textArea, tag, wrap) ->
+    $textArea = $(textArea)
+    oldVal = $textArea.val()
+    textArea = $textArea.get(0)
+    text = $textArea.val()
+    selected = @selectedText(text, textArea)
+    $textArea.focus()
+
+    @insertText(textArea, text, tag, selected, wrap)
+
+  gl.text.init = (form) ->
+    self = @
+    $('.js-md', form)
+      .off 'click'
+      .on 'click', ->
+        $this = $(@)
+        self.updateText(
+          $this.closest('.md-area').find('textarea'),
+          $this.data('md-tag'),
+          not $this.data('md-prepend')
+        )
+
+  gl.text.removeListeners = (form) ->
+    $('.js-md', form).off()
+
+) window
diff --git a/app/assets/javascripts/lib/utils/type_utility.js.coffee b/app/assets/javascripts/lib/utils/type_utility.js.coffee
new file mode 100644
index 00000000000..957f0d86b36
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/type_utility.js.coffee
@@ -0,0 +1,9 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.isObject = (obj) ->
+    obj? and (obj.constructor is Object)
+
+) window
diff --git a/app/assets/javascripts/lib/utils/url_utility.js.coffee b/app/assets/javascripts/lib/utils/url_utility.js.coffee
new file mode 100644
index 00000000000..e8085e1c2e4
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/url_utility.js.coffee
@@ -0,0 +1,52 @@
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  # Returns an array containing the value(s) of the
+  # of the key passed as an argument
+  w.gl.utils.getParameterValues = (sParam) ->
+    sPageURL = decodeURIComponent(window.location.search.substring(1))
+    sURLVariables = sPageURL.split('&')
+    sParameterName = undefined
+    values = []
+    i = 0
+    while i < sURLVariables.length
+      sParameterName = sURLVariables[i].split('=')
+      if sParameterName[0] is sParam
+        values.push(sParameterName[1])
+      i++
+    values
+
+  # #
+  #  @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 not paramValue?
+        newUrl = newUrl.replace pattern, ''
+      else if url.search(pattern) isnt -1
+        newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
+      else
+        newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
+
+    # Remove a trailing ampersand
+    lastChar = newUrl[newUrl.length - 1]
+
+    if lastChar is '&'
+        newUrl = newUrl.slice 0, -1
+
+    newUrl
+
+  # removes parameter query string from url. returns the modified url
+  w.gl.utils.removeParamQueryString = (url, param) ->
+    url = decodeURIComponent(url)
+    urlVariables = url.split('&')
+    (
+      variables for variables in urlVariables when variables.indexOf(param) is -1
+    ).join('&')
+
+) window
diff --git a/app/assets/javascripts/lib/utils/utf8_encode.js b/app/assets/javascripts/lib/utils/utf8_encode.js
new file mode 100644
index 00000000000..39ffe44dae0
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/utf8_encode.js
@@ -0,0 +1,70 @@
+function utf8_encode (argString) {
+  // http://kevin.vanzonneveld.net
+  // +   original by: Webtoolkit.info (http://www.webtoolkit.info/)
+  // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+  // +   improved by: sowberry
+  // +    tweaked by: Jack
+  // +   bugfixed by: Onno Marsman
+  // +   improved by: Yves Sucaet
+  // +   bugfixed by: Onno Marsman
+  // +   bugfixed by: Ulrich
+  // +   bugfixed by: Rafal Kukawski
+  // +   improved by: kirilloid
+  // +   bugfixed by: kirilloid
+  // *     example 1: utf8_encode('Kevin van Zonneveld');
+  // *     returns 1: 'Kevin van Zonneveld'
+
+  if (argString === null || typeof argString === "undefined") {
+    return "";
+  }
+
+  var string = (argString + ''); // .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  var utftext = '',
+    start, end, stringl = 0;
+
+  start = end = 0;
+  stringl = string.length;
+  for (var n = 0; n < stringl; n++) {
+    var c1 = string.charCodeAt(n);
+    var enc = null;
+
+    if (c1 < 128) {
+      end++;
+    } else if (c1 > 127 && c1 < 2048) {
+      enc = String.fromCharCode(
+         (c1 >> 6)        | 192,
+        ( c1        & 63) | 128
+      );
+    } else if (c1 & 0xF800 != 0xD800) {
+      enc = String.fromCharCode(
+         (c1 >> 12)       | 224,
+        ((c1 >> 6)  & 63) | 128,
+        ( c1        & 63) | 128
+      );
+    } else { // surrogate pairs
+      if (c1 & 0xFC00 != 0xD800) { throw new RangeError("Unmatched trail surrogate at " + n); }
+      var c2 = string.charCodeAt(++n);
+      if (c2 & 0xFC00 != 0xDC00) { throw new RangeError("Unmatched lead surrogate at " + (n-1)); }
+      c1 = ((c1 & 0x3FF) << 10) + (c2 & 0x3FF) + 0x10000;
+      enc = String.fromCharCode(
+         (c1 >> 18)       | 240,
+        ((c1 >> 12) & 63) | 128,
+        ((c1 >> 6)  & 63) | 128,
+        ( c1        & 63) | 128
+      );
+    }
+    if (enc !== null) {
+      if (end > start) {
+        utftext += string.slice(start, end);
+      }
+      utftext += enc;
+      start = end = n + 1;
+    }
+  }
+
+  if (end > start) {
+    utftext += string.slice(start, stringl);
+  }
+
+  return utftext;
+}
diff --git a/app/assets/javascripts/network/application.js.coffee b/app/assets/javascripts/network/application.js.coffee
index cb9eead855b..f75f63869c5 100644
--- a/app/assets/javascripts/network/application.js.coffee
+++ b/app/assets/javascripts/network/application.js.coffee
@@ -4,9 +4,6 @@
 # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 # the compiled file.
 #
-#= require raphael
-#= require g.raphael
-#= require g.bar
 #= require_tree .
 
 $ ->
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index 5ea4adcd0fa..ca04a782fcf 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -2,7 +2,7 @@
   %ul{ class: (container_class) }
 
     - content_for :page_specific_javascripts do
-      = javascript_include_tag 'lib/chart/application.js', {integrity: true, "data-turbolinks-track" => true}
+      = javascript_include_tag 'lib/chart.js', {integrity: true, "data-turbolinks-track" => true}
       = javascript_include_tag 'graphs/application.js', {integrity: true, "data-turbolinks-track" => true}
     = nav_link(action: :show) do
       = link_to 'Contributors', namespace_project_graph_path
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 749afe6b6ab..8bfda9776c7 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,6 +1,6 @@
 - page_title "Network", @ref
 - content_for :page_specific_javascripts do
-  = javascript_include_tag 'lib/raphael/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = javascript_include_tag 'lib/raphael.js', {integrity: true, "data-turbolinks-track" => true}
   = javascript_include_tag 'network/application.js', {integrity: true, "data-turbolinks-track" => true}
 = render "projects/commits/head"
 = render "head"
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 9ca351e5147..0fabc2a7714 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,7 +1,7 @@
 - page_title       @user.name
 - page_description @user.bio
 - content_for :page_specific_javascripts do
-  = javascript_include_tag 'lib/d3/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = javascript_include_tag 'lib/d3.js', {integrity: true, "data-turbolinks-track" => true}
   = javascript_include_tag 'users/application.js', {integrity: true, "data-turbolinks-track" => true}
 - header_title     @user.name, user_path(@user)
 - @no_container = true
-- 
cgit v1.2.1


From 5321f817854b2d2c6b96fe4e4f14560458940692 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 11:09:46 -0600
Subject: Readability.

---
 app/views/layouts/_head.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index bc3118f70aa..2d020e9c222 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -30,7 +30,7 @@
 
   = javascript_include_tag "application", integrity: true
 
-  - if :page_specific_javascripts
+  - if content_for?(:page_specific_javascripts)
     = yield :page_specific_javascripts
 
   = csrf_meta_tags
-- 
cgit v1.2.1


From 61959480c2a863bf33a0657b3b8d4481d6bf2269 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 23 Jun 2016 12:13:09 -0500
Subject: Apply selected value as label

---
 app/assets/javascripts/blob/template_selector.js.coffee | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/assets/javascripts/blob/template_selector.js.coffee b/app/assets/javascripts/blob/template_selector.js.coffee
index e76e303189d..40c9169beac 100644
--- a/app/assets/javascripts/blob/template_selector.js.coffee
+++ b/app/assets/javascripts/blob/template_selector.js.coffee
@@ -19,6 +19,7 @@ class @TemplateSelector
       data: @data,
       filterable: true,
       selectable: true,
+      toggleLabel: @toggleLabel,
       search:
         fields: ['name']
       clicked: @onClick
@@ -31,6 +32,9 @@ class @TemplateSelector
       @onFilenameUpdate()
     )
 
+  toggleLabel: (item) ->
+    item.name
+
   onFilenameUpdate: ->
     return unless @$input.length
 
-- 
cgit v1.2.1


From ff01ca9c96dc001fabf5e5a1200bc3355c61a3ca Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 11:42:52 -0600
Subject: Trying to make this work with sprockets in production.

---
 app/helpers/javascript_helper.rb          | 6 ++----
 app/views/projects/graphs/_head.html.haml | 4 ++--
 app/views/projects/network/show.html.haml | 4 ++--
 app/views/users/show.html.haml            | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index 91dd91718dc..4bdc8e516ac 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -1,7 +1,5 @@
 module JavascriptHelper
-  def page_specific_javascripts(js = nil)
-    @page_specific_javascripts = js unless js.nil?
-
-    @page_specific_javascripts
+  def page_specific_javascript_tag(js)
+    javascript_include_tag asset_path(js), {integrity: true, "data-turbolinks-track" => true}
   end
 end
diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml
index ca04a782fcf..ca347406dfe 100644
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
@@ -2,8 +2,8 @@
   %ul{ class: (container_class) }
 
     - content_for :page_specific_javascripts do
-      = javascript_include_tag 'lib/chart.js', {integrity: true, "data-turbolinks-track" => true}
-      = javascript_include_tag 'graphs/application.js', {integrity: true, "data-turbolinks-track" => true}
+      = page_specific_javascript_tag('lib/chart.js')
+      = page_specific_javascript_tag('graphs/application.js')
     = nav_link(action: :show) do
       = link_to 'Contributors', namespace_project_graph_path
     = nav_link(action: :commits) do
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 8bfda9776c7..3ca30b4ba6b 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,7 +1,7 @@
 - page_title "Network", @ref
 - content_for :page_specific_javascripts do
-  = javascript_include_tag 'lib/raphael.js', {integrity: true, "data-turbolinks-track" => true}
-  = javascript_include_tag 'network/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = page_specific_javascript_tag('lib/raphael.js')
+  = page_specific_javascript_tag('network/application.js')
 = render "projects/commits/head"
 = render "head"
 %div{ class: (container_class) }
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0fabc2a7714..68665858c3e 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,8 +1,8 @@
 - page_title       @user.name
 - page_description @user.bio
 - content_for :page_specific_javascripts do
-  = javascript_include_tag 'lib/d3.js', {integrity: true, "data-turbolinks-track" => true}
-  = javascript_include_tag 'users/application.js', {integrity: true, "data-turbolinks-track" => true}
+  = page_specific_javascript_tag('lib/d3.js')
+  = page_specific_javascript_tag('users/application.js')
 - header_title     @user.name, user_path(@user)
 - @no_container = true
 
-- 
cgit v1.2.1


From 3e363a5a79dd0f03e7b0feb8c028f34e7ad45330 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 11:58:20 -0600
Subject: Appease Rubocop.

---
 app/helpers/javascript_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index 4bdc8e516ac..5109356941d 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -1,5 +1,5 @@
 module JavascriptHelper
   def page_specific_javascript_tag(js)
-    javascript_include_tag asset_path(js), {integrity: true, "data-turbolinks-track" => true}
+    javascript_include_tag asset_path(js), { integrity: true, "data-turbolinks-track" => true }
   end
 end
-- 
cgit v1.2.1


From e7a27946ea6e165eac99098be6dbe8e6a408da4a Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Mon, 13 Jun 2016 14:31:47 +0200
Subject: Eager load award emoji on notes

This commit eager loads the award emoji on both the issues and the MRs.
When loading an issue with 108 comments this reduces the query count by
327 queries. On a merge request with the same amount of comments this
saves 148 queries. The large difference is not clear to me at this
point and the total query count is still huge with 387 and 1034
respectively. The biggest problem however, remains the calculation of
participants.
---
 app/models/merge_request.rb | 2 +-
 app/models/note.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 36bc98bdb1e..478827794ed 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base
     commits_for_notes_limit = 100
     commit_ids = commits.last(commits_for_notes_limit).map(&:id)
 
-    Note.where(
+    Note.includes(:award_emoji).where(
       "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
       "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
       mr_id: id,
diff --git a/app/models/note.rb b/app/models/note.rb
index 8d164647550..4bc9d1a92f8 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -54,7 +54,7 @@ class Note < ActiveRecord::Base
   scope :non_diff_notes, ->{ where(type: ['Note', nil]) }
 
   scope :with_associations, -> do
-    includes(:author, :noteable, :updated_by,
+    includes(:author, :noteable, :updated_by, :award_emoji,
              project: [:project_members, { group: [:group_members] }])
   end
 
-- 
cgit v1.2.1


From 66ec925557d63f3f168b03a8b85e15a199da7307 Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Tue, 21 Jun 2016 07:26:43 +0200
Subject: Preload notes/discussions associations (award_emoji: :user)

---
 app/controllers/projects/merge_requests_controller.rb |  4 ++--
 app/models/concerns/awardable.rb                      | 12 +++++-------
 app/models/concerns/issuable.rb                       | 18 +++++++++++++++---
 app/models/merge_request.rb                           |  2 +-
 app/models/note.rb                                    |  4 +++-
 5 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 851822d805a..6c26c7f7658 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -320,8 +320,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def define_show_vars
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
-    @notes = @merge_request.mr_and_commit_notes.inc_author.fresh
-    @discussions = @notes.discussions
+    @discussions = @merge_request.mr_and_commit_notes.inc_author_project_award_emoji.fresh.discussions
+    @notes = @discussions.flatten
     @noteable = @merge_request
 
     # Get commits from repository
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 539c7c31e30..06beff177b1 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -2,10 +2,11 @@ module Awardable
   extend ActiveSupport::Concern
 
   included do
-    has_many :award_emoji, as: :awardable, dependent: :destroy
+    has_many :award_emoji, -> { includes(:user) }, as: :awardable, dependent: :destroy
 
     if self < Participable
-      participant :award_emoji_with_associations
+      # By default we always load award_emoji user association
+      participant :award_emoji
     end
   end
 
@@ -34,12 +35,9 @@ module Awardable
     end
   end
 
-  def award_emoji_with_associations
-    award_emoji.includes(:user)
-  end
-
   def grouped_awards(with_thumbs: true)
-    awards = award_emoji_with_associations.group_by(&:name)
+    # By default we always load award_emoji user association
+    awards = award_emoji.group_by(&:name)
 
     if with_thumbs
       awards[AwardEmoji::UPVOTE_NAME]   ||= []
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 38da0dafad2..d6f55885dd6 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -19,9 +19,14 @@ module Issuable
     belongs_to :milestone
     has_many :notes, as: :noteable, dependent: :destroy do
       def authors_loaded?
-        # We check first if we're loaded to not load unnecesarily.
+        # We check first if we're loaded to not load unnecessarily.
         loaded? && to_a.all? { |note| note.association(:author).loaded? }
       end
+
+      def award_emojis_loaded?
+        # We check first if we're loaded to not load unnecessarily.
+        loaded? && to_a.all? { |note| note.association(:award_emoji).loaded? }
+      end
     end
     has_many :label_links, as: :target, dependent: :destroy
     has_many :labels, through: :label_links
@@ -49,7 +54,7 @@ module Issuable
 
     scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
     scope :join_project, -> { joins(:project) }
-    scope :inc_notes_with_associations, -> { includes(notes: :author) }
+    scope :inc_notes_with_associations, -> { includes(notes: [ :project, :author, :award_emoji ]) }
     scope :references_project, -> { references(:project) }
     scope :non_archived, -> { join_project.where(projects: { archived: false }) }
 
@@ -260,7 +265,14 @@ module Issuable
     # already have their authors loaded (possibly because the scope
     # `inc_notes_with_associations` was used) and skip the inclusion if that's
     # the case.
-    notes.authors_loaded? ? notes : notes.includes(:author)
+    includes = []
+    includes << :author unless notes.authors_loaded?
+    includes << :award_emoji unless notes.award_emojis_loaded?
+    if includes.any?
+      notes.includes(includes)
+    else
+      notes
+    end
   end
 
   def updated_tasks
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 478827794ed..36bc98bdb1e 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base
     commits_for_notes_limit = 100
     commit_ids = commits.last(commits_for_notes_limit).map(&:id)
 
-    Note.includes(:award_emoji).where(
+    Note.where(
       "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
       "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
       mr_id: id,
diff --git a/app/models/note.rb b/app/models/note.rb
index 4bc9d1a92f8..e510525b89d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -49,12 +49,14 @@ class Note < ActiveRecord::Base
   scope :fresh, ->{ order(created_at: :asc, id: :asc) }
   scope :inc_author_project, ->{ includes(:project, :author) }
   scope :inc_author, ->{ includes(:author) }
+  scope :inc_author_project_award_emoji, ->{ includes(:project, :author, :award_emoji) }
 
   scope :legacy_diff_notes, ->{ where(type: 'LegacyDiffNote') }
   scope :non_diff_notes, ->{ where(type: ['Note', nil]) }
 
   scope :with_associations, -> do
-    includes(:author, :noteable, :updated_by, :award_emoji,
+    # FYI noteable cannot be loaded for LegacyDiffNote for commits
+    includes(:author, :noteable, :updated_by,
              project: [:project_members, { group: [:group_members] }])
   end
 
-- 
cgit v1.2.1


From 618cf373ca5610d82e51b196cea113b9b7d03cc6 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 22 Jun 2016 14:58:38 -0500
Subject: Apply labels only if we picked a label from the dropdown

---
 .../javascripts/issues-bulk-assignment.js.coffee   | 23 ++++++++++++++++++----
 app/assets/javascripts/labels_select.js.coffee     |  7 +++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index b454f9389dd..8ca7409f5b4 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -7,11 +7,25 @@ class @IssuableBulkActions
       @issues = @getElement('.issues-list .issue')
     } = opts
 
+    # Save instance
+    @form.data 'bulkActions', @
+
+    @disableWillUpdate()
+
     @bindEvents()
 
     # Fixes bulk-assign not working when navigating through pages
     Issuable.initChecks();
 
+  enableWillUpdate: ->
+    @toggleWillUpdate(true)
+
+  disableWillUpdate: ->
+    @toggleWillUpdate(false)
+
+  toggleWillUpdate: (enable)->
+    @willUpdateLabels = if enable? then enable else not @willUpdateLabels
+
   getElement: (selector) ->
     @container.find selector
 
@@ -87,11 +101,12 @@ class @IssuableBulkActions
         add_label_ids     : []
         remove_label_ids  : []
 
-    @getLabelsToApply().map (id) ->
-      formData.update.add_label_ids.push id
+    if @willUpdateLabels
+      @getLabelsToApply().map (id) ->
+        formData.update.add_label_ids.push id
 
-    @getLabelsToRemove().map (id) ->
-      formData.update.remove_label_ids.push id
+      @getLabelsToRemove().map (id) ->
+        formData.update.remove_label_ids.push id
 
     formData
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 6a10db10eb1..0729d5d91ce 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -319,6 +319,8 @@ class @LabelsSelect
 
         multiSelect: $dropdown.hasClass 'js-multiselect'
         clicked: (label) ->
+          _this.enableBulkLabelDropdown()
+
           if $dropdown.hasClass('js-filter-bulk-update')
             return
 
@@ -377,3 +379,8 @@ class @LabelsSelect
       label_ids.push $("#issue_#{issue_id}").data('labels')
 
     _.intersection.apply _, label_ids
+
+  enableBulkLabelDropdown: ->
+    if $('.selected_issue:checked').length
+      issuableBulkActions = $('.bulk-update').data('bulkActions')
+      issuableBulkActions.enableWillUpdate()
-- 
cgit v1.2.1


From 3d5172b5098afd8c1e8fa2eb970c5f6493ea9d0d Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 22 Jun 2016 17:05:45 -0500
Subject: Disable Label update when no issues are selected

---
 app/assets/javascripts/issuable.js.coffee | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index d0901be1509..23c823942c7 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -68,12 +68,15 @@ issuable_created = false
     Turbolinks.visit(issuesUrl);
 
   initChecks: ->
+    @issuableBulkActions = $('.bulk-update').data('bulkActions')
+
     $('.check_all_issues').off('click').on('click', ->
       $('.selected_issue').prop('checked', @checked)
       Issuable.checkChanged()
     )
 
-    $('.selected_issue').off('change').on('change', Issuable.checkChanged)
+    $('.selected_issue').off('change').on('change', Issuable.checkChanged.bind(@))
+
 
   checkChanged: ->
     checked_issues = $('.selected_issue:checked')
@@ -88,3 +91,6 @@ issuable_created = false
       $('#update_issues_ids').val []
       $('.issues_bulk_update').hide()
       $('.issues-other-filters').show()
+      @issuableBulkActions.disableWillUpdate()
+
+    return true
-- 
cgit v1.2.1


From 0e3208c40521000ad1b82ed80078b3ecc9dbaf76 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 23 Jun 2016 07:16:45 -0500
Subject: Use instance property to enable/disable label assignment

---
 app/assets/javascripts/issuable.js.coffee               |  2 +-
 app/assets/javascripts/issues-bulk-assignment.js.coffee | 11 +----------
 app/assets/javascripts/labels_select.js.coffee          |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 23c823942c7..6a108c033ea 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -91,6 +91,6 @@ issuable_created = false
       $('#update_issues_ids').val []
       $('.issues_bulk_update').hide()
       $('.issues-other-filters').show()
-      @issuableBulkActions.disableWillUpdate()
+      @issuableBulkActions.willUpdateLabels = false
 
     return true
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 8ca7409f5b4..6b0e69dbae7 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -10,22 +10,13 @@ class @IssuableBulkActions
     # Save instance
     @form.data 'bulkActions', @
 
-    @disableWillUpdate()
+    @willUpdateLabels = false
 
     @bindEvents()
 
     # Fixes bulk-assign not working when navigating through pages
     Issuable.initChecks();
 
-  enableWillUpdate: ->
-    @toggleWillUpdate(true)
-
-  disableWillUpdate: ->
-    @toggleWillUpdate(false)
-
-  toggleWillUpdate: (enable)->
-    @willUpdateLabels = if enable? then enable else not @willUpdateLabels
-
   getElement: (selector) ->
     @container.find selector
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 0729d5d91ce..e95fd96a83f 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -383,4 +383,4 @@ class @LabelsSelect
   enableBulkLabelDropdown: ->
     if $('.selected_issue:checked').length
       issuableBulkActions = $('.bulk-update').data('bulkActions')
-      issuableBulkActions.enableWillUpdate()
+      issuableBulkActions.willUpdateLabels = true
-- 
cgit v1.2.1


From 350e57fd0e0945ff7f4d0e5e6ea392aaf8e40aa8 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 22 Jun 2016 21:02:45 -0500
Subject: Move fade out divs outside of scrolling container on project view

---
 app/assets/javascripts/layout_nav.js.coffee |  6 ++---
 app/assets/stylesheets/framework/nav.scss   | 39 +++++++++++++++++++++--------
 app/views/layouts/nav/_project.html.haml    | 10 ++++----
 3 files changed, 36 insertions(+), 19 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/layout_nav.js.coffee b/app/assets/javascripts/layout_nav.js.coffee
index cad095daae1..f639f7f5892 100644
--- a/app/assets/javascripts/layout_nav.js.coffee
+++ b/app/assets/javascripts/layout_nav.js.coffee
@@ -3,7 +3,7 @@ hideEndFade = ($scrollingTabs) ->
     $this = $(@)
 
     $this
-      .find('.fade-right')
+      .siblings('.fade-right')
       .toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'))
 
 $ ->
@@ -20,5 +20,5 @@ $ ->
     currentPosition = $this.scrollLeft()
     maxPosition = $this.prop('scrollWidth') - $this.outerWidth()
 
-    $this.find('.fade-left').toggleClass('scrolling', currentPosition > 0)
-    $this.find('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1)
+    $this.siblings('.fade-left').toggleClass('scrolling', currentPosition > 0)
+    $this.siblings('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1)
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index f53e63606de..147afc49ab4 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -32,6 +32,7 @@
   overflow-x: auto;
   overflow-y: hidden;
   -webkit-overflow-scrolling: touch;
+
   &::-webkit-scrollbar {
     display: none;
   }
@@ -322,7 +323,7 @@
 
     .fade-right {
       @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
-      right: 0;
+      right: -5px;
 
       .fa {
         right: -7px;
@@ -331,7 +332,7 @@
 
     .fade-left {
       @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
-      left: 0;
+      left: -5px;
 
       .fa {
         left: -7px;
@@ -379,7 +380,7 @@
     .fade-right {
 
       @media (max-width: $screen-xs-min) {
-        right: 0;
+        right: -5px;
       }
     }
   }
@@ -390,15 +391,23 @@
 
   .nav-links {
     @include scrolling-links();
+  }
 
-    .fade-right {
-      @include fade(left, rgba(255, 255, 255, 0.4), $background-color);
-      right: 0;
+  .fade-right {
+    @include fade(left, rgba(255, 255, 255, 0.4), $background-color);
+    right: -5px;
+
+    .fa {
+      right: -7px;
     }
+  }
 
-    .fade-left {
-      @include fade(right, rgba(255, 255, 255, 0.4), $background-color);
-      left: 0;
+  .fade-left {
+    @include fade(right, rgba(255, 255, 255, 0.4), $background-color);
+    left: -5px;
+
+    .fa {
+      left: -7px;
     }
   }
 }
@@ -411,12 +420,20 @@
 
     .fade-right {
       @include fade(left, rgba(255, 255, 255, 0.4), $white-light);
-      right: 0;
+      right: -5px;
+
+      .fa {
+        right: -7px;
+      }
     }
 
     .fade-left {
       @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
-      left: 0;
+      left: -5px;
+
+      .fa {
+        left: -7px;
+      }
     }
 
     &.event-filter {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 27e840df503..a4bb56aa56f 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -24,10 +24,12 @@
                 data: { confirm: leave_confirmation_message(@project) }, method: :delete, title: 'Leave project' do
                 Leave Project
 
-%div{ class: nav_control_class }
+.scrolling-tabs-container{ class: nav_control_class }
+  .fade-left
+    = icon('arrow-left')
+  .fade-right
+    = icon('arrow-right')
   %ul.nav-links.scrolling-tabs
-    %li.fade-left
-      = icon('arrow-left')
     = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
       = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
         %span
@@ -111,5 +113,3 @@
       %li.hidden
         = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do
           Commits
-    %li.fade-right
-      = icon('arrow-right')
-- 
cgit v1.2.1


From ee8b0d37fa086e2a467c383b01e7138587151570 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 22 Jun 2016 21:16:10 -0500
Subject: Move fade divs out of every scrolling container; remove unneeded
 scrolling CSS

---
 app/assets/stylesheets/framework/nav.scss  | 52 -----------------
 app/views/layouts/nav/_admin.html.haml     | 11 ++--
 app/views/layouts/nav/_group.html.haml     | 11 ++--
 app/views/layouts/nav/_profile.html.haml   | 93 +++++++++++++++---------------
 app/views/projects/commits/_head.html.haml |  8 +--
 5 files changed, 61 insertions(+), 114 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 147afc49ab4..5578cd6b8e1 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -304,41 +304,9 @@
   }
 
   .nav-links {
-    @include scrolling-links();
     border-bottom: none;
     height: 51px;
 
-    svg {
-      position: relative;
-      top: 2px;
-      margin-right: 2px;
-      height: 15px;
-      width: auto;
-
-      path,
-      polygon {
-        fill: $layout-link-gray;
-      }
-    }
-
-    .fade-right {
-      @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
-      right: -5px;
-
-      .fa {
-        right: -7px;
-      }
-    }
-
-    .fade-left {
-      @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
-      left: -5px;
-
-      .fa {
-        left: -7px;
-      }
-    }
-
     li {
 
       a {
@@ -374,16 +342,6 @@
       }
     }
   }
-
-  .nav-control {
-
-    .fade-right {
-
-      @media (max-width: $screen-xs-min) {
-        right: -5px;
-      }
-    }
-  }
 }
 
 .scrolling-tabs-container {
@@ -435,16 +393,6 @@
         left: -7px;
       }
     }
-
-    &.event-filter {
-      .fade-right {
-        visibility: hidden;
-
-        @media (max-width: $screen-xs-max) {
-          visibility: visible;
-        }
-      }
-    }
   }
 }
 
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 66e5ec1ad1a..0f264cd2e06 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,9 +1,10 @@
-%div{ class: nav_control_class }
+.scrolling-tabs-container{ class: nav_control_class }
   = render 'layouts/nav/admin_settings'
-
+  .fade-left
+    = icon('arrow-left')
+  .fade-right
+    = icon('arrow-right')
   %ul.nav-links.scrolling-tabs
-    %li.fade-left
-      = icon('arrow-left')
     = nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
         %span
@@ -37,5 +38,3 @@
         = link_to admin_spam_logs_path, title: "Spam Logs" do
           %span
             Spam Logs
-    %li.fade-right
-      = icon('arrow-right')
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index f7aa9fab7cf..5d657a9ac84 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,9 +1,10 @@
-%div{ class: nav_control_class }
+.scrolling-tabs-container{ class: nav_control_class }
   = render 'layouts/nav/group_settings'
-
+  .fade-left
+    = icon('arrow-left')
+  .fade-right
+    = icon('arrow-right')
   %ul.nav-links.scrolling-tabs
-    %li.fade-left
-      = icon('arrow-left')
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
         %span
@@ -32,5 +33,3 @@
       = link_to group_group_members_path(@group), title: 'Members' do
         %span
           Members
-    %li.fade-right
-      = icon('arrow-right')
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 44ea939b7e4..f37f9b0f5a3 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,48 +1,49 @@
-%ul.nav-links.scrolling-tabs
-  %li.fade-left
+.scrolling-tabs-container
+  .fade-left
     = icon('arrow-left')
-  = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
-    = link_to profile_path, title: 'Profile Settings' do
-      %span
-        Profile
-  = nav_link(controller: [:accounts, :two_factor_auths]) do
-    = link_to profile_account_path, title: 'Account' do
-      %span
-        Account
-  - if current_application_settings.user_oauth_applications?
-    = nav_link(controller: 'oauth/applications') do
-      = link_to applications_profile_path, title: 'Applications' do
-        %span
-          Applications
-  = nav_link(controller: :personal_access_tokens) do
-    = link_to profile_personal_access_tokens_path, title: 'Personal Access Tokens' do
-      %span
-        Personal Access Tokens
-  = nav_link(controller: :emails) do
-    = link_to profile_emails_path, title: 'Emails' do
-      %span
-        Emails
-  - unless current_user.ldap_user?
-    = nav_link(controller: :passwords) do
-      = link_to edit_profile_password_path, title: 'Password' do
-        %span
-          Password
-  = nav_link(controller: :notifications) do
-    = link_to profile_notifications_path, title: 'Notifications' do
-      %span
-        Notifications
-
-  = nav_link(controller: :keys) do
-    = link_to profile_keys_path, title: 'SSH Keys' do
-      %span
-        SSH Keys
-  = nav_link(controller: :preferences) do
-    = link_to profile_preferences_path, title: 'Preferences' do
-      %span
-        Preferences
-  = nav_link(path: 'profiles#audit_log') do
-    = link_to audit_log_profile_path, title: 'Audit Log' do
-      %span
-        Audit Log
-  %li.fade-right
+  .fade-right
     = icon('arrow-right')
+  %ul.nav-links.scrolling-tabs
+    = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
+      = link_to profile_path, title: 'Profile Settings' do
+        %span
+          Profile
+    = nav_link(controller: [:accounts, :two_factor_auths]) do
+      = link_to profile_account_path, title: 'Account' do
+        %span
+          Account
+    - if current_application_settings.user_oauth_applications?
+      = nav_link(controller: 'oauth/applications') do
+        = link_to applications_profile_path, title: 'Applications' do
+          %span
+            Applications
+    = nav_link(controller: :personal_access_tokens) do
+      = link_to profile_personal_access_tokens_path, title: 'Personal Access Tokens' do
+        %span
+          Personal Access Tokens
+    = nav_link(controller: :emails) do
+      = link_to profile_emails_path, title: 'Emails' do
+        %span
+          Emails
+    - unless current_user.ldap_user?
+      = nav_link(controller: :passwords) do
+        = link_to edit_profile_password_path, title: 'Password' do
+          %span
+            Password
+    = nav_link(controller: :notifications) do
+      = link_to profile_notifications_path, title: 'Notifications' do
+        %span
+          Notifications
+
+    = nav_link(controller: :keys) do
+      = link_to profile_keys_path, title: 'SSH Keys' do
+        %span
+          SSH Keys
+    = nav_link(controller: :preferences) do
+      = link_to profile_preferences_path, title: 'Preferences' do
+        %span
+          Preferences
+    = nav_link(path: 'profiles#audit_log') do
+      = link_to audit_log_profile_path, title: 'Audit Log' do
+        %span
+          Audit Log
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 54dab4bff07..db0d3754082 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,8 +1,10 @@
 .scrolling-tabs-container
+  .fade-left
+    = icon('arrow-left')
+  .fade-right
+    = icon('arrow-right')
   .nav-links.sub-nav.scrolling-tabs
     %ul{ class: (container_class) }
-      %li.fade-left
-        = icon('arrow-left')
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
         = link_to project_files_path(@project) do
           Files
@@ -26,5 +28,3 @@
       = nav_link(controller: [:tags, :releases]) do
         = link_to namespace_project_tags_path(@project.namespace, @project) do
           Tags
-      %li.fade-right
-        = icon('arrow-right')
-- 
cgit v1.2.1


From 12aca07723c62b3ef79c774ae43ffa2c5b1f5ab1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 22 Jun 2016 21:26:41 -0500
Subject: Fix positioning of Repository sub nav scrolling

---
 app/assets/stylesheets/framework/nav.scss  | 19 +++++++++++++++++++
 app/views/projects/commits/_head.html.haml |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 5578cd6b8e1..6211bc04597 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -368,6 +368,25 @@
       left: -7px;
     }
   }
+
+  &.sub-nav-scroll {
+
+    .fade-right {
+      right: 0;
+
+      .fa {
+        right: -23px;
+      }
+    }
+
+    .fade-left {
+      left: 0;
+
+      .fa {
+        left: 10px;
+      }
+    }
+  }
 }
 
 .nav-block {
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index db0d3754082..b11b6c24ccd 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,4 +1,4 @@
-.scrolling-tabs-container
+.scrolling-tabs-container.sub-nav-scroll
   .fade-left
     = icon('arrow-left')
   .fade-right
-- 
cgit v1.2.1


From efabe5a4441bf85ad3b25f5f67d3cbf9a8dabed8 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Thu, 23 Jun 2016 15:58:10 -0600
Subject: Remove width restriction for logo on sign-in page.

---
 app/assets/stylesheets/framework/header.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index e8cbe7f3c02..c32ce5195c6 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -26,7 +26,6 @@ header {
       text-align: center;
 
       #tanuki-logo, img {
-        width: 36px;
         height: 36px;
       }
     }
-- 
cgit v1.2.1


From 46b89a270f7eef15f6d8e41c79600795265054fb Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 24 Jun 2016 10:50:23 +0200
Subject: Fix tmp file being deleted after the request plus some cleanup and
 improved erroring for this situation

---
 app/controllers/import/gitlab_projects_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb
index f99aa490d3e..b521daa03aa 100644
--- a/app/controllers/import/gitlab_projects_controller.rb
+++ b/app/controllers/import/gitlab_projects_controller.rb
@@ -12,9 +12,13 @@ class Import::GitlabProjectsController < Import::BaseController
       return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." })
     end
 
+    imported_file = params[:file].path + "-import"
+
+    FileUtils.copy_entry(params[:file].path, imported_file)
+
     @project = Gitlab::ImportExport::ProjectCreator.new(project_params[:namespace_id],
                                                         current_user,
-                                                        File.expand_path(project_params[:file].path),
+                                                        File.expand_path(imported_file),
                                                         project_params[:path]).execute
 
     if @project.saved?
-- 
cgit v1.2.1


From c3b6eadc33272d08069244f196ffba21709114d5 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 24 Jun 2016 11:41:33 +0200
Subject: fix params

---
 app/controllers/import/gitlab_projects_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb
index b521daa03aa..513348c39af 100644
--- a/app/controllers/import/gitlab_projects_controller.rb
+++ b/app/controllers/import/gitlab_projects_controller.rb
@@ -12,9 +12,9 @@ class Import::GitlabProjectsController < Import::BaseController
       return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." })
     end
 
-    imported_file = params[:file].path + "-import"
+    imported_file = project_params[:file].path + "-import"
 
-    FileUtils.copy_entry(params[:file].path, imported_file)
+    FileUtils.copy_entry(project_params[:file].path, imported_file)
 
     @project = Gitlab::ImportExport::ProjectCreator.new(project_params[:namespace_id],
                                                         current_user,
-- 
cgit v1.2.1


From d470f3d1954a33d2ea6069fadcbb9810267b024f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 21 Jun 2016 13:35:09 +0200
Subject: Support for rendering/redacting multiple documents

This commit changes the way certain documents are rendered (currently
only Notes) and how documents are redacted. Previously both rendering
and redacting would run on a per document basis. The result of this was
that for every document we'd have to run countless queries just to
figure out if we could display a set of links or not.

This commit changes things around so that redacting Markdown documents
is no longer tied into the html-pipeline Gem. This in turn allows it to
redact multiple documents in a single pass, thus reducing the number of
queries needed.

In turn rendering issue/merge request notes has been adjusted to take
advantage of this new setup. Instead of rendering Markdown somewhere
deep down in a view the Markdown is rendered and redacted in the
controller (taking the current user and all that into account). This has
been done in such a way that the "markdown()" helper method can still be
used on its own.

This particular commit also paves the way for caching rendered HTML on
object level. Right now there's an accessor method Note#note_html which
is used for setting/getting the rendered HTML. Once we cache HTML on row
level we can simply change this field to be a column and call a "save"
whenever needed and we're pretty much done.
---
 app/controllers/projects/issues_controller.rb      |  6 ++++-
 .../projects/merge_requests_controller.rb          | 26 ++++++++++++++++++++--
 app/controllers/projects/notes_controller.rb       | 10 +++++++++
 app/models/note.rb                                 |  4 ++++
 app/views/projects/notes/_note.html.haml           |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 4e2d3bebb2e..fbf8b01b7c2 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -62,8 +62,12 @@ class Projects::IssuesController < Projects::ApplicationController
   end
 
   def show
+    raw_notes = @issue.notes_with_associations.fresh
+
+    @notes = Banzai::NoteRenderer.
+      render(raw_notes, @project, current_user, @path, @project_wiki, @ref)
+
     @note     = @project.notes.new(noteable: @issue)
-    @notes    = @issue.notes.with_associations.fresh
     @noteable = @issue
 
     respond_to do |format|
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 089669841d3..79ba032996c 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -85,6 +85,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
     @grouped_diff_notes = @merge_request.notes.grouped_diff_notes
 
+    Banzai::NoteRenderer.render(
+      @grouped_diff_notes.values.flatten,
+      @project,
+      current_user,
+      @path,
+      @project_wiki,
+      @ref
+    )
+
     respond_to do |format|
       format.html
       format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
@@ -325,8 +334,21 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def define_show_vars
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
-    @discussions = @merge_request.mr_and_commit_notes.inc_author_project_award_emoji.fresh.discussions
-    @notes = @discussions.flatten
+
+    @discussions = @merge_request.mr_and_commit_notes.
+      inc_author_project_award_emoji.
+      fresh.
+      discussions
+
+    @notes = Banzai::NoteRenderer.render(
+      @discussions.flatten,
+      @project,
+      current_user,
+      @path,
+      @project_wiki,
+      @ref
+    )
+
     @noteable = @merge_request
 
     # Get commits from repository
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 836f79ff080..e14fe26dde7 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -24,6 +24,10 @@ class Projects::NotesController < Projects::ApplicationController
   def create
     @note = Notes::CreateService.new(project, current_user, note_params).execute
 
+    if @note.is_a?(Note)
+      Banzai::NoteRenderer.render([@note], @project, current_user)
+    end
+
     respond_to do |format|
       format.json { render json: note_json(@note) }
       format.html { redirect_back_or_default }
@@ -33,6 +37,10 @@ class Projects::NotesController < Projects::ApplicationController
   def update
     @note = Notes::UpdateService.new(project, current_user, note_params).execute(note)
 
+    if @note.is_a?(Note)
+      Banzai::NoteRenderer.render([@note], @project, current_user)
+    end
+
     respond_to do |format|
       format.json { render json: note_json(@note) }
       format.html { redirect_back_or_default }
@@ -118,6 +126,8 @@ class Projects::NotesController < Projects::ApplicationController
         name:   note.name
       }
     elsif note.valid?
+      Banzai::NoteRenderer.render([note], @project, current_user)
+
       {
         valid: true,
         id: note.id,
diff --git a/app/models/note.rb b/app/models/note.rb
index e510525b89d..8db500a5219 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -6,6 +6,10 @@ class Note < ActiveRecord::Base
   include Awardable
   include Importable
 
+  # Attribute containing rendered and redacted Markdown as generated by
+  # Banzai::ObjectRenderer.
+  attr_accessor :note_html
+
   default_value_for :system, false
 
   attr_mentionable :note, pipeline: :note
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index c04d291412c..a5e163b91e9 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -32,7 +32,7 @@
       .note-body{class: note_editable ? 'js-task-list-container' : ''}
         .note-text
           = preserve do
-            = markdown(note.note, pipeline: :note, cache_key: [note, "note"], author: note.author)
+            = note.note_html
           = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
         - if note_editable
           = render 'projects/notes/edit_form', note: note
-- 
cgit v1.2.1


From aec3475df94bc9681a723c344f3df05972ebe68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 24 Jun 2016 12:01:48 +0200
Subject: Fix an information disclosure when requesting access to a group
 containing private projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The issue was with the `User#groups` and `User#projects` associations
which goes through the `User#group_members` and `User#project_members`.

Initially I chose to use a secure approach by storing the requester's
user ID in `Member#created_by_id` instead of `Member#user_id` because I
was aware that there was a security risk since I didn't know the
codebase well enough.

Then during the review, we decided to change that and directly store the
requester's user ID into `Member#user_id` (for the sake of simplifying
the code I believe), meaning that every `group_members` / `project_members`
association would include the requesters by default...

My bad for not checking that all the `group_members` / `project_members`
associations and the ones that go through them (e.g. `Group#users` and
`Project#users`) were made safe with the `where(requested_at: nil)` /
`where(members: { requested_at: nil })` scopes.

Now they are all secure.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/controllers/dashboard/groups_controller.rb | 2 +-
 app/models/group.rb                            | 2 +-
 app/models/user.rb                             | 4 ++--
 app/views/admin/users/groups.html.haml         | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb
index 71ba6153021..de6bc689bb7 100644
--- a/app/controllers/dashboard/groups_controller.rb
+++ b/app/controllers/dashboard/groups_controller.rb
@@ -1,5 +1,5 @@
 class Dashboard::GroupsController < Dashboard::ApplicationController
   def index
-    @group_members = current_user.group_members.page(params[:page])
+    @group_members = current_user.group_members.includes(:source).page(params[:page])
   end
 end
diff --git a/app/models/group.rb b/app/models/group.rb
index e66e04371b2..c70c719e338 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -11,7 +11,7 @@ class Group < Namespace
   has_many :users, -> { where(members: { requested_at: nil }) }, through: :group_members
 
   has_many :owners,
-    -> { where(members: { access_level: Gitlab::Access::OWNER }) },
+    -> { where(members: { requested_at: nil, access_level: Gitlab::Access::OWNER }) },
     through: :group_members,
     source: :user
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 04b220ee13c..599b2fb1191 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -57,7 +57,7 @@ class User < ActiveRecord::Base
 
   # Groups
   has_many :members, dependent: :destroy
-  has_many :group_members, dependent: :destroy, source: 'GroupMember'
+  has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, source: 'GroupMember'
   has_many :groups, through: :group_members
   has_many :owned_groups, -> { where members: { access_level: Gitlab::Access::OWNER } }, through: :group_members, source: :group
   has_many :masters_groups, -> { where members: { access_level: Gitlab::Access::MASTER } }, through: :group_members, source: :group
@@ -65,7 +65,7 @@ class User < ActiveRecord::Base
   # Projects
   has_many :groups_projects,          through: :groups, source: :projects
   has_many :personal_projects,        through: :namespace, source: :projects
-  has_many :project_members,          dependent: :destroy, class_name: 'ProjectMember'
+  has_many :project_members, -> { where(requested_at: nil) }, dependent: :destroy, class_name: 'ProjectMember'
   has_many :projects,                 through: :project_members
   has_many :created_projects,         foreign_key: :creator_id, class_name: 'Project'
   has_many :users_star_projects, dependent: :destroy
diff --git a/app/views/admin/users/groups.html.haml b/app/views/admin/users/groups.html.haml
index b0a709a568a..8f6d13b881a 100644
--- a/app/views/admin/users/groups.html.haml
+++ b/app/views/admin/users/groups.html.haml
@@ -1,11 +1,12 @@
 - page_title "Groups", @user.name, "Users"
 = render 'admin/users/head'
 
-- if @user.group_members.present?
+- group_members = @user.group_members.includes(:source)
+- if group_members.any?
   .panel.panel-default
     .panel-heading Groups:
     %ul.well-list
-      - @user.group_members.each do |group_member|
+      - group_members.each do |group_member|
         - group = group_member.group
         %li.group_member
           %span{class: ("list-item-name" unless group_member.owner?)}
-- 
cgit v1.2.1


From 42e515ddd2f8ba4c3d8b0f8a1a0d369a1e23b052 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 24 Jun 2016 12:52:48 +0100
Subject: Fixed avatar alignment in new MR view

---
 app/assets/stylesheets/pages/merge_requests.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index aca82f7f7bf..124f4afaa0d 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -264,8 +264,15 @@
       margin-bottom: 4px;
     }
 
+    .item-title {
+      @media (min-width: $screen-sm-min) {
+        width: 49%;
+      }
+    }
+
     .avatar {
-      margin-left: 0;
+      left: 0;
+      top: 2px;
     }
 
     .commit-row-info {
-- 
cgit v1.2.1


From e3d464d82a15cb524d066c2ba5d0973efbbfeeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 24 Jun 2016 18:13:56 +0200
Subject: Fix a wrong MR status when merge_when_build_succeeds &
 project.only_allow_merge_if_build_succeeds are true
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The issue was that `MergeRequest#mergeable?` returns false when the CI
state is not success and project.only_allow_merge_if_build_succeeds is
true. In this case `Projects::MergeRequestsController#merge` would
return the `:failed` status when enabling `merge_when_build_succeeds`,
thus leading to a weird state and the MR never automatically merged.

The fix is to disable the CI state check in the controller safeguard
that early return the `:failed` status.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/controllers/projects/merge_requests_controller.rb | 9 ++++++++-
 app/models/merge_request.rb                           | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 79ba032996c..39c8ba40ca2 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -199,7 +199,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def merge
     return access_denied! unless @merge_request.can_be_merged_by?(current_user)
 
-    unless @merge_request.mergeable?
+    # Disable the CI check if merge_when_build_succeeds is enabled since we have
+    # to wait until CI completes to know
+    unless @merge_request.mergeable?(skip_ci_check: merge_when_build_succeeds_active?)
       @status = :failed
       return
     end
@@ -395,4 +397,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def ensure_ref_fetched
     @merge_request.ensure_ref_fetched
   end
+
+  def merge_when_build_succeeds_active?
+    params[:merge_when_build_succeeds].present? &&
+      @merge_request.pipeline && @merge_request.pipeline.active?
+  end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 36bc98bdb1e..f5c5b7c1306 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -264,19 +264,19 @@ class MergeRequest < ActiveRecord::Base
     self.title.sub(WIP_REGEX, "")
   end
 
-  def mergeable?
-    return false unless mergeable_state?
+  def mergeable?(skip_ci_check: false)
+    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
 
     check_if_can_be_merged
 
     can_be_merged?
   end
 
-  def mergeable_state?
+  def mergeable_state?(skip_ci_check: false)
     return false unless open?
     return false if work_in_progress?
     return false if broken?
-    return false unless mergeable_ci_state?
+    return false unless skip_ci_check || mergeable_ci_state?
 
     true
   end
-- 
cgit v1.2.1


From c391a72c18e7081cfbc1b80627663fdfcf4bbfe6 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 25 May 2016 18:34:40 -0400
Subject: Fix issue being ordered twice and callback when moving between states

---
 app/assets/javascripts/milestone.js.coffee    | 5 +++--
 app/controllers/projects/issues_controller.rb | 2 +-
 app/models/issue.rb                           | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee
index 0037a3a21c2..0fd64e9384e 100644
--- a/app/assets/javascripts/milestone.js.coffee
+++ b/app/assets/javascripts/milestone.js.coffee
@@ -81,8 +81,9 @@ class @Milestone
       stop: (event, ui) ->
         $(".issues-sortable-list").css "min-height", "0px"
       update: (event, ui) ->
-        data = $(this).sortable("serialize")
-        Milestone.sortIssues(data)
+        if this == ui.item.parent()[0]
+          data = $(this).sortable("serialize")
+          Milestone.sortIssues(data)
 
       receive: (event, ui) ->
         new_state = $(this).data('state')
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index fbf8b01b7c2..80dbabf51a5 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -116,7 +116,7 @@ class Projects::IssuesController < Projects::ApplicationController
         end
       end
       format.json do
-        render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
+        render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: :saved)
       end
     end
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 3c5859194b4..421fd44dffc 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -190,4 +190,8 @@ class Issue < ActiveRecord::Base
   def overdue?
     due_date.try(:past?) || false
   end
+
+  def saved
+    valid?
+  end
 end
-- 
cgit v1.2.1


From bade71ba5a25dfa6ca49c84650a7178b9275bf63 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Wed, 25 May 2016 19:08:48 -0400
Subject: Add specs and improve coffescript sortable binding function

---
 app/assets/javascripts/milestone.js.coffee      | 60 ++++++++++++-------------
 app/controllers/projects/issues_controller.rb   |  3 +-
 app/models/issue.rb                             |  4 --
 app/views/shared/milestones/_issuable.html.haml |  9 ++--
 4 files changed, 36 insertions(+), 40 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee
index 0fd64e9384e..a19e68b39e2 100644
--- a/app/assets/javascripts/milestone.js.coffee
+++ b/app/assets/javascripts/milestone.js.coffee
@@ -4,18 +4,10 @@ class @Milestone
       type: "PUT"
       url: issue_url
       data: data
-      success: (data) ->
-        if data.saved == true
-          if data.assignee_avatar_url
-            img_tag = $('<img/>')
-            img_tag.attr('src', data.assignee_avatar_url)
-            img_tag.addClass('avatar s16')
-            $(li).find('.assignee-icon').html(img_tag)
-          else
-            $(li).find('.assignee-icon').html('')
-          $(li).effect 'highlight'
-        else
-          new Flash("Issue update failed", 'alert')
+      success: (_data) =>
+        @successCallback(_data, li)
+      error: (data) ->
+        new Flash("Issue update failed", 'alert')
       dataType: "json"
 
   @sortIssues: (data) ->
@@ -25,9 +17,10 @@ class @Milestone
       type: "PUT"
       url: sort_issues_url
       data: data
-      success: (data) ->
-        if data.saved != true
-          new Flash("Issues update failed", 'alert')
+      success: (_data) =>
+        @successCallback(_data)
+      error: ->
+        new Flash("Issues update failed", 'alert')
       dataType: "json"
 
   @sortMergeRequests: (data) ->
@@ -37,9 +30,10 @@ class @Milestone
       type: "PUT"
       url: sort_mr_url
       data: data
-      success: (data) ->
-        if data.saved != true
-          new Flash("MR update failed", 'alert')
+      success: (_data) =>
+        @successCallback(_data)
+      error: (data) ->
+        new Flash("Issue update failed", 'alert')
       dataType: "json"
 
   @updateMergeRequest: (li, merge_request_url, data) ->
@@ -47,20 +41,23 @@ class @Milestone
       type: "PUT"
       url: merge_request_url
       data: data
-      success: (data) ->
-        if data.saved == true
-          if data.assignee_avatar_url
-            img_tag = $('<img/>')
-            img_tag.attr('src', data.assignee_avatar_url)
-            img_tag.addClass('avatar s16')
-            $(li).find('.assignee-icon').html(img_tag)
-          else
-            $(li).find('.assignee-icon').html('')
-          $(li).effect 'highlight'
-        else
-          new Flash("Issue update failed", 'alert')
+      success: (_data) =>
+        @successCallback(_data, li)
+      error: (data) ->
+        new Flash("Issue update failed", 'alert')
       dataType: "json"
 
+  @successCallback: (data, element) =>
+    if data.assignee
+      img_tag = $('<img/>')
+      img_tag.attr('src', data.assignee.avatar_url)
+      img_tag.addClass('avatar s16')
+      $(element).find('.assignee-icon').html(img_tag)
+    else
+      $(element).find('.assignee-icon').html('')
+
+    $(element).effect 'highlight'
+
   constructor: ->
     oldMouseStart = $.ui.sortable.prototype._mouseStart
     $.ui.sortable.prototype._mouseStart = (event, overrideHandle, noActivation) ->
@@ -81,7 +78,8 @@ class @Milestone
       stop: (event, ui) ->
         $(".issues-sortable-list").css "min-height", "0px"
       update: (event, ui) ->
-        if this == ui.item.parent()[0]
+        # Prevents sorting from container which element has been removed.
+        if $(this).find(ui.item).length > 0
           data = $(this).sortable("serialize")
           Milestone.sortIssues(data)
 
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 80dbabf51a5..8b8df680739 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -115,8 +115,9 @@ class Projects::IssuesController < Projects::ApplicationController
           render :edit
         end
       end
+
       format.json do
-        render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: :saved)
+        render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
       end
     end
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 421fd44dffc..3c5859194b4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -190,8 +190,4 @@ class Issue < ActiveRecord::Base
   def overdue?
     due_date.try(:past?) || false
   end
-
-  def saved
-    valid?
-  end
 end
diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml
index 47b66d44e43..3c03c220ddd 100644
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@@ -21,7 +21,8 @@
       = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }) do
         - render_colored_label(label)
 
-    - if assignee
-      = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, assignee_id: issuable.assignee_id, state: 'all' }),
-                class: 'has-tooltip', title: "Assigned to #{assignee.name}", data: { container: 'body' } do
-        - image_tag(avatar_icon(issuable.assignee, 16), class: "avatar s16", alt: '')
+    %span{ class: "assignee-icon" }
+      - if assignee
+        = link_to polymorphic_path(base_url_args, { milestone_title: @milestone.title, assignee_id: issuable.assignee_id, state: 'all' }),
+                  class: 'has-tooltip', title: "Assigned to #{assignee.name}", data: { container: 'body' } do
+          - image_tag(avatar_icon(issuable.assignee, 16), class: "avatar s16", alt: '')
-- 
cgit v1.2.1


From 7627cc19897d1ff8963fde37697e6dc5d32e51ba Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Fri, 24 Jun 2016 16:20:53 -0500
Subject: Validate presence of essential params for diff rendering

This will avoid application errors generated by the assumption of the
presence of these params.
---
 app/controllers/projects/blob_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app')

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index cd8b2911674..7599fec3cdf 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -16,6 +16,7 @@ class Projects::BlobController < Projects::ApplicationController
   before_action :from_merge_request, only: [:edit, :update]
   before_action :require_branch_head, only: [:edit, :update]
   before_action :editor_variables, except: [:show, :preview, :diff]
+  before_action :validate_diff_params, only: :diff
 
   def new
     commit unless @repository.empty?
@@ -146,4 +147,10 @@ class Projects::BlobController < Projects::ApplicationController
       file_content_encoding: params[:encoding]
     }
   end
+
+  def validate_diff_params
+    if [:since, :to, :offset].any? { |key| params[key].blank? }
+      render nothing: true
+    end
+  end
 end
-- 
cgit v1.2.1


From 2fc91c48659b84375173b038b4e7957e56294aa4 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Sun, 19 Jun 2016 09:44:50 +1000
Subject: Allow "ci skip" to be in any case

---
 app/models/ci/pipeline.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 0c9a5e42eec..89434abca05 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -163,7 +163,7 @@ module Ci
     end
 
     def skip_ci?
-      git_commit_message =~ /(\[ci skip\])/ if git_commit_message
+      git_commit_message =~ /(\[ci skip\])/i if git_commit_message
     end
 
     def environments
-- 
cgit v1.2.1


From 0550f2a5e7d8a7ed65632190b8febe2a9e01d6a0 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Thu, 23 Jun 2016 20:09:54 +1000
Subject: Add support for "skip ci" too

---
 app/models/ci/pipeline.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 89434abca05..10324bf2257 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -163,7 +163,7 @@ module Ci
     end
 
     def skip_ci?
-      git_commit_message =~ /(\[ci skip\])/i if git_commit_message
+      git_commit_message =~ /\[(ci skip|skip ci)\]/i if git_commit_message
     end
 
     def environments
-- 
cgit v1.2.1


From ed713c81d73b56fafd4f9228a2e2787584cdf6d7 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sun, 26 Jun 2016 14:59:51 +0900
Subject: Clean up some unused templates imported from GitLab CI

---
 app/views/ci/errors/show.haml             |  2 --
 app/views/ci/shared/_guide.html.haml      | 13 -------------
 app/views/ci/shared/_no_runners.html.haml |  7 -------
 app/views/layouts/ci/_info.html.haml      |  2 --
 app/views/layouts/ci/_page.html.haml      | 22 ----------------------
 app/views/layouts/ci/notify.html.haml     | 19 -------------------
 6 files changed, 65 deletions(-)
 delete mode 100644 app/views/ci/errors/show.haml
 delete mode 100644 app/views/ci/shared/_guide.html.haml
 delete mode 100644 app/views/ci/shared/_no_runners.html.haml
 delete mode 100644 app/views/layouts/ci/_info.html.haml
 delete mode 100644 app/views/layouts/ci/_page.html.haml
 delete mode 100644 app/views/layouts/ci/notify.html.haml

(limited to 'app')

diff --git a/app/views/ci/errors/show.haml b/app/views/ci/errors/show.haml
deleted file mode 100644
index 2788112c835..00000000000
--- a/app/views/ci/errors/show.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%h3.error Error
-= @error
diff --git a/app/views/ci/shared/_guide.html.haml b/app/views/ci/shared/_guide.html.haml
deleted file mode 100644
index 09e7e653521..00000000000
--- a/app/views/ci/shared/_guide.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-.bs-callout.help-callout
-  %h4 How to setup CI for this project
-
-  %ol
-    %li
-      Add at least one runner to the project.
-      Go to #{link_to 'Runners page', runners_path(@project), target: :blank} for instructions.
-    %li
-      Put the .gitlab-ci.yml in the root of your repository. Examples can be found in
-      #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}.
-      You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
-    %li
-      Return to this page and refresh it, it should show a new build.
diff --git a/app/views/ci/shared/_no_runners.html.haml b/app/views/ci/shared/_no_runners.html.haml
deleted file mode 100644
index f56c37d9b37..00000000000
--- a/app/views/ci/shared/_no_runners.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.alert.alert-danger
-  %p
-    Now you need Runners to process your builds.
-  %span
-    Checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} to install it
-
-
diff --git a/app/views/layouts/ci/_info.html.haml b/app/views/layouts/ci/_info.html.haml
deleted file mode 100644
index 24c68a6dbf5..00000000000
--- a/app/views/layouts/ci/_info.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-- if current_user && current_user.is_admin? && Ci::Runner.count.zero?
-  = render 'ci/shared/no_runners'
diff --git a/app/views/layouts/ci/_page.html.haml b/app/views/layouts/ci/_page.html.haml
deleted file mode 100644
index 2e56d0ac6a3..00000000000
--- a/app/views/layouts/ci/_page.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-.page-with-sidebar{ class: page_sidebar_class }
-  = render "layouts/broadcast"
-  .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
-
-    - if defined?(sidebar) && sidebar
-      = render "layouts/ci/#{sidebar}"
-    - elsif current_user
-      = render 'layouts/nav/dashboard'
-    .collapse-nav
-      = render partial: 'layouts/collapse_button'
-    - if current_user
-      = link_to current_user, class: 'sidebar-user', title: "Profile" do
-        = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
-        .username
-          = current_user.username
-  .content-wrapper
-    = render "layouts/flash"
-    = render 'layouts/ci/info'
-    %div{ class: container_class }
-      .content
-        .clearfix
-          = yield
diff --git a/app/views/layouts/ci/notify.html.haml b/app/views/layouts/ci/notify.html.haml
deleted file mode 100644
index 270b206df5e..00000000000
--- a/app/views/layouts/ci/notify.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-%html{lang: "en"}
-  %head
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-      %title
-        GitLab CI
-
-  %body
-    = yield :header
-
-    %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          = yield
-          %br
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          %p{style: "font-size:small;color:#777"}
-            - if @project
-              You're receiving this notification because you are the one who triggered a build on the #{@project.name} project.
-- 
cgit v1.2.1


From 47b9b162c7df91fda0bb47d4c83f0fe4681e055b Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Mon, 27 Jun 2016 07:47:33 -0600
Subject: Revert Subresource Integrity pending a fix for Firefox's incorrect
 hashing implementation.

---
 app/helpers/javascript_helper.rb  | 2 +-
 app/views/layouts/_head.html.haml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index 5109356941d..0e456214d37 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -1,5 +1,5 @@
 module JavascriptHelper
   def page_specific_javascript_tag(js)
-    javascript_include_tag asset_path(js), { integrity: true, "data-turbolinks-track" => true }
+    javascript_include_tag asset_path(js), { "data-turbolinks-track" => true }
   end
 end
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 2d020e9c222..757de92d6d4 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -25,10 +25,10 @@
 
   = favicon_link_tag 'favicon.ico'
 
-  = stylesheet_link_tag "application", media: "all", integrity: true
-  = stylesheet_link_tag "print",       media: "print", integrity: true
+  = stylesheet_link_tag "application", media: "all"
+  = stylesheet_link_tag "print",       media: "print"
 
-  = javascript_include_tag "application", integrity: true
+  = javascript_include_tag "application"
 
   - if content_for?(:page_specific_javascripts)
     = yield :page_specific_javascripts
-- 
cgit v1.2.1


From 4678e22b5f9ff0fd81375091e3de864784522d20 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 27 Jun 2016 16:12:03 +0100
Subject: Markdown toolbar inserts code blocks

Closes #19173
---
 .../javascripts/lib/utils/text_utility.js.coffee   | 45 +++++++++++++++++-----
 app/views/projects/_md_preview.html.haml           |  4 +-
 2 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/lib/utils/text_utility.js.coffee b/app/assets/javascripts/lib/utils/text_utility.js.coffee
index bb2772dfed2..7bcb876d056 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js.coffee
+++ b/app/assets/javascripts/lib/utils/text_utility.js.coffee
@@ -10,17 +10,41 @@
   gl.text.selectedText = (text, textarea) ->
     text.substring(textarea.selectionStart, textarea.selectionEnd)
 
-  gl.text.insertText = (textArea, text, tag, selected, wrap) ->
+  gl.text.lineBefore = (text, textarea) ->
+    split = text.substring(0, textarea.selectionStart).trim().split('\n')
+    split[split.length - 1]
+
+  gl.text.lineAfter = (text, textarea) ->
+    text.substring(textarea.selectionEnd).trim().split('\n')[0]
+
+  gl.text.blockTagText = (text, textArea, blockTag, selected) ->
+    lineBefore = @lineBefore(text, textArea)
+    lineAfter = @lineAfter(text, textArea)
+
+    if lineBefore is blockTag and lineAfter is blockTag
+      # To remove the block tag we have to select the line before & after
+      if blockTag?
+        textArea.selectionStart = textArea.selectionStart - (blockTag.length + 1)
+        textArea.selectionEnd = textArea.selectionEnd + (blockTag.length + 1)
+
+      selected
+    else
+      "#{blockTag}\n#{selected}\n#{blockTag}"
+
+  gl.text.insertText = (textArea, text, tag, blockTag, selected, wrap) ->
     selectedSplit = selected.split('\n')
     startChar = if not wrap and textArea.selectionStart > 0 then '\n' else ''
 
-    if selectedSplit.length > 1 and not wrap
-      insertText = selectedSplit.map((val) ->
-        if val.indexOf(tag) is 0
-          "#{val.replace(tag, '')}"
-        else
-          "#{tag}#{val}"
-      ).join('\n')
+    if selectedSplit.length > 1 and (not wrap or blockTag?)
+      if blockTag?
+        insertText = @blockTagText(text, textArea, blockTag, selected)
+      else
+        insertText = selectedSplit.map((val) ->
+          if val.indexOf(tag) is 0
+            "#{val.replace(tag, '')}"
+          else
+            "#{tag}#{val}"
+        ).join('\n')
     else
       insertText = "#{startChar}#{tag}#{selected}#{if wrap then tag else ' '}"
 
@@ -51,7 +75,7 @@
 
       textArea.setSelectionRange pos, pos
 
-  gl.text.updateText = (textArea, tag, wrap) ->
+  gl.text.updateText = (textArea, tag, blockTag, wrap) ->
     $textArea = $(textArea)
     oldVal = $textArea.val()
     textArea = $textArea.get(0)
@@ -59,7 +83,7 @@
     selected = @selectedText(text, textArea)
     $textArea.focus()
 
-    @insertText(textArea, text, tag, selected, wrap)
+    @insertText(textArea, text, tag, blockTag, selected, wrap)
 
   gl.text.init = (form) ->
     self = @
@@ -70,6 +94,7 @@
         self.updateText(
           $this.closest('.md-area').find('textarea'),
           $this.data('md-tag'),
+          $this.data('md-block'),
           not $this.data('md-prepend')
         )
 
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index ca6714ef42b..58d961d93ca 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -12,13 +12,13 @@
         %li.confidential-issue-warning
           = icon('warning')
           %span This is a confidential issue. Your comment will not be visible to the public.
-          
+
       %li.pull-right
         .toolbar-group
           = markdown_toolbar_button({icon: "bold fw", data: { "md-tag" => "**" }, title: "Add bold text" })
           = markdown_toolbar_button({icon: "italic fw", data: { "md-tag" => "*" }, title: "Add italic text" })
           = markdown_toolbar_button({icon: "quote-right fw", data: { "md-tag" => "> ", "md-prepend" => true }, title: "Insert a quote" })
-          = markdown_toolbar_button({icon: "code fw", data: { "md-tag" => "`" }, title: "Insert code" })
+          = markdown_toolbar_button({icon: "code fw", data: { "md-tag" => "`", "md-block" => "```" }, title: "Insert code" })
           = markdown_toolbar_button({icon: "list-ul fw", data: { "md-tag" => "* ", "md-prepend" => true }, title: "Add a bullet list" })
           = markdown_toolbar_button({icon: "list-ol fw", data: { "md-tag" => "1. ", "md-prepend" => true }, title: "Add a numbered list" })
           = markdown_toolbar_button({icon: "check-square-o fw", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: "Add a task list" })
-- 
cgit v1.2.1


From c7b04841c0b742146d88c63b83f6ac4474e77e05 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 21 Jun 2016 10:24:00 -0600
Subject: Wrap images in divs with Banzai and limit max-height.

Add max-height to prevent images from displaying larger than the provided screen size.

Also fix a failing test and add a new one.
---
 app/assets/stylesheets/pages/help.scss     | 1 +
 app/assets/stylesheets/pages/issuable.scss | 1 +
 app/assets/stylesheets/pages/notes.scss    | 1 +
 3 files changed, 3 insertions(+)

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 0b710ef168b..00ab42bec5c 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -63,5 +63,6 @@
     border: 1px solid $table-border-gray;
     padding: 5px;
     margin: 5px;
+    max-height: calc(100vh - 100px);
   }
 }
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 21ff6ab71f0..542fa244689 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -10,6 +10,7 @@
     border: 1px solid $table-border-gray;
     padding: 5px;
     margin: 5px;
+    max-height: calc(100vh - 100px);
   }
 }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ffba3dc5bc6..ee7c98f805b 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -113,6 +113,7 @@ ul.notes {
           border: 1px solid $table-border-gray;
           padding: 5px;
           margin: 5px 0;
+          max-height: calc(100vh - 100px);
         }
       }
     }
-- 
cgit v1.2.1


From 87fcb0abcb36400bb1dc5415d9de3f658e3e43c2 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Mon, 13 Jun 2016 17:24:45 +0200
Subject: Fix check for existence of new branch button (!4630)

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

(limited to 'app')

diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 157361404e0..f446aa49cde 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -99,7 +99,7 @@ class @Issue
 
     # If the user doesn't have the required permissions the container isn't
     # rendered at all.
-    return unless $container
+    return if $container.length is 0
 
     $.getJSON($container.data('path'))
       .error ->
-- 
cgit v1.2.1


From d17ab054cfa0d44fa36a20b249b2cab7ef99e9d4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 27 Jun 2016 14:08:57 +0100
Subject: Correctly returns todo ID after creating todo

---
 app/services/todo_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 540bf54b920..239bd17a035 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -159,8 +159,9 @@ class TodoService
   def create_todos(users, attributes)
     Array(users).map do |user|
       next if pending_todos(user, attributes).exists?
-      Todo.create(attributes.merge(user_id: user.id))
+      todo = Todo.create(attributes.merge(user_id: user.id))
       user.update_todos_count_cache
+      todo
     end
   end
 
-- 
cgit v1.2.1


From 4e1b670f811834dc810ca625a218a02b4cd7202d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 27 Jun 2016 10:22:30 +0100
Subject: Removed fade when filtering results

---
 app/assets/javascripts/issuable.js.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 6a108c033ea..0527c66461c 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -59,13 +59,12 @@ issuable_created = false
   filterResults: (form) =>
     formData = form.serialize()
 
-    $('.issues-holder, .merge-requests-holder').css('opacity', '0.5')
     formAction = form.attr('action')
     issuesUrl = formAction
     issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}")
     issuesUrl += formData
 
-    Turbolinks.visit(issuesUrl);
+    Turbolinks.visit(issuesUrl)
 
   initChecks: ->
     @issuableBulkActions = $('.bulk-update').data('bulkActions')
-- 
cgit v1.2.1


From 5d7153e61dce279c06da54908674861682a9740d Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 24 Jun 2016 09:46:20 -0500
Subject: Remove duplicate new page btn from edit wiki

---
 app/views/projects/wikis/edit.html.haml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index bf5d09d50c2..af9d23bbfb3 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -15,9 +15,6 @@
         Edit Page
 
     .nav-controls
-      - if can?(current_user, :create_wiki, @project)
-        = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
-          New Page
       = render 'main_links'
 
 
-- 
cgit v1.2.1


From 550e40a53cba0c50983c845b7b8ae437b4514186 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 24 Jun 2016 14:44:02 -0500
Subject: Add conditional for new pag link

---
 app/views/projects/wikis/edit.html.haml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index af9d23bbfb3..817bf9b3f69 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -15,6 +15,10 @@
         Edit Page
 
     .nav-controls
+      - if !(@page && @page.persisted?)
+        - if can?(current_user, :create_wiki, @project)
+          = link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
+            New Page
       = render 'main_links'
 
 
-- 
cgit v1.2.1


From c2223efe840e344da8d6e1347bd028899bb6117a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Sun, 26 Jun 2016 10:09:42 -0400
Subject: Fix rendering of commit notes

---
 app/controllers/projects/commit_controller.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 6751737d15e..d162a5a3165 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -18,9 +18,16 @@ class Projects::CommitController < Projects::ApplicationController
     apply_diff_view_cookie!
 
     @grouped_diff_notes = commit.notes.grouped_diff_notes
+    @notes = commit.notes.non_diff_notes.fresh
+    
+    Banzai::NoteRenderer.render(
+      @grouped_diff_notes.values.flatten + @notes,
+      @project,
+      current_user,
+    )
 
     @note = @project.build_commit_note(commit)
-    @notes = commit.notes.non_diff_notes.fresh
+
     @noteable = @commit
     @comments_target = {
       noteable_type: 'Commit',
-- 
cgit v1.2.1


From 16a0303801319e722bfcdadbcdeae8550e3e5dcf Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Mon, 27 Jun 2016 13:23:19 -0500
Subject: Check for conflict with wiki projects when creating a new project.

This fix avoids exposing the information from the wiki repository of other project.
---
 app/models/project.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app')

diff --git a/app/models/project.rb b/app/models/project.rb
index ca3bc04e2dd..96837364423 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -163,6 +163,7 @@ class Project < ActiveRecord::Base
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
   validate :visibility_level_allowed_by_group
   validate :visibility_level_allowed_as_fork
+  validate :check_wiki_path_conflict
 
   add_authentication_token_field :runners_token
   before_save :ensure_runners_token
@@ -539,6 +540,16 @@ class Project < ActiveRecord::Base
     self.errors.add(:visibility_level, "#{level_name} is not allowed since the fork source project has lower visibility.")
   end
 
+  def check_wiki_path_conflict
+    return if path.blank?
+
+    path_to_check = path.ends_with?('.wiki') ? path.chomp('.wiki') : "#{path}.wiki"
+
+    if Project.where(namespace_id: namespace_id, path: path_to_check).exists?
+      errors.add(:name, 'has already been taken')
+    end
+  end
+
   def to_param
     path
   end
-- 
cgit v1.2.1


From f8b80f7faedef7515d05abd9a5cc315d98724ae3 Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Fri, 10 Jun 2016 15:42:43 -0700
Subject: add custom highlighting via .gitattributes

paired with @stanhu
---
 app/helpers/blob_helper.rb                 | 8 ++++----
 app/models/repository.rb                   | 4 ++++
 app/views/projects/blob/_text.html.haml    | 2 +-
 app/views/shared/_file_highlight.html.haml | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 4b4bc3d4276..428a42266d0 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -1,10 +1,10 @@
 module BlobHelper
-  def highlighter(blob_name, blob_content, nowrap: false)
-    Gitlab::Highlight.new(blob_name, blob_content, nowrap: nowrap)
+  def highlighter(blob_name, blob_content, repository: nil, nowrap: false)
+    Gitlab::Highlight.new(blob_name, blob_content, nowrap: nowrap, repository: repository)
   end
 
-  def highlight(blob_name, blob_content, nowrap: false, plain: false)
-    Gitlab::Highlight.highlight(blob_name, blob_content, nowrap: nowrap, plain: plain)
+  def highlight(blob_name, blob_content, repository: nil, nowrap: false, plain: false)
+    Gitlab::Highlight.highlight(blob_name, blob_content, nowrap: nowrap, plain: plain, repository: repository)
   end
 
   def no_highlight_files
diff --git a/app/models/repository.rb b/app/models/repository.rb
index acc720ccfa3..2a6a3b086c2 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -978,6 +978,10 @@ class Repository
     raw_repository.ls_files(actual_ref)
   end
 
+  def gitattribute(path, name)
+    raw_repository.attributes(path)[name]
+  end
+
   def copy_gitattributes(ref)
     actual_ref = ref || root_ref
     begin
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml
index b1769759dce..58524418a67 100644
--- a/app/views/projects/blob/_text.html.haml
+++ b/app/views/projects/blob/_text.html.haml
@@ -16,4 +16,4 @@
       .file-content.code
         .nothing-here-block Empty file
     - else
-      = render 'shared/file_highlight', blob: blob
+      = render 'shared/file_highlight', blob: blob, repository: @repository
diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml
index ad944a19ca1..e26693bf5b9 100644
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
@@ -1,3 +1,5 @@
+- repository = nil unless local_assigns.key?(:repository)
+
 .file-content.code.js-syntax-highlight
   .line-numbers
     - if blob.data.present?
@@ -11,4 +13,4 @@
           = link_icon
           = i
   .blob-content{data: {blob_id: blob.id}}
-    = highlight(blob.name, blob.data, plain: blob.no_highlighting?)
+    = highlight(blob.path, blob.data, repository: repository, plain: blob.no_highlighting?)
-- 
cgit v1.2.1


From 5ff8371c5edac7d57c495e6fa8bb664361b8880f Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Thu, 16 Jun 2016 11:55:04 -0700
Subject: add an alias for Snippet#path

---
 app/models/snippet.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index f8034cb5e6b..40728d04574 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -20,6 +20,12 @@ class Snippet < ActiveRecord::Base
     length: { within: 0..255 },
     format: { with: Gitlab::Regex.file_name_regex,
               message: Gitlab::Regex.file_name_regex_message }
+
+  # [jneen] alias for compatibility with blobs and highlighting
+  def path
+    file_name
+  end
+
   validates :content, presence: true
   validates :visibility_level, inclusion: { in: Gitlab::VisibilityLevel.values }
 
-- 
cgit v1.2.1


From e7b512efa65aebe26cd0240a4d077475c42761c1 Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Wed, 22 Jun 2016 11:50:58 -0700
Subject: move the path alias to a more appropriate location

---
 app/models/snippet.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 40728d04574..d18d1474855 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -21,11 +21,6 @@ class Snippet < ActiveRecord::Base
     format: { with: Gitlab::Regex.file_name_regex,
               message: Gitlab::Regex.file_name_regex_message }
 
-  # [jneen] alias for compatibility with blobs and highlighting
-  def path
-    file_name
-  end
-
   validates :content, presence: true
   validates :visibility_level, inclusion: { in: Gitlab::VisibilityLevel.values }
 
@@ -87,6 +82,11 @@ class Snippet < ActiveRecord::Base
     0
   end
 
+  # alias for compatibility with blobs and highlighting
+  def path
+    file_name
+  end
+
   def name
     file_name
   end
-- 
cgit v1.2.1


From 957143347c1b810476e86c2d09bbde8434b4f653 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 8 Jun 2016 02:10:55 +0100
Subject: Wiped old page and started on new UI

Completed new project page

Updated CHANGELOG

Corrected 'Create project' button

Made responsive

Added gitlab export button

Changed Spinach test to match updated UI

reverted test changes and fixed UI

Corrected 'Repo by URL' text

Fixed static namespace style

Added errors partial

Added padding to bottom of page-with-sidebar
---
 app/assets/stylesheets/framework/sidebar.scss |   1 +
 app/assets/stylesheets/pages/projects.scss    |  73 ++++++++-
 app/views/projects/new.html.haml              | 209 ++++++++++++++------------
 3 files changed, 178 insertions(+), 105 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 98f917ce69b..e8d6a7f2775 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -1,5 +1,6 @@
 .page-with-sidebar {
   padding-top: $header-height;
+  padding-bottom: 25px;
   transition: padding $sidebar-transition-duration;
 
   .sidebar-wrapper {
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index d3e59d7fdb9..89ce1b2df20 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -13,10 +13,53 @@
 
 .new_project,
 .edit-project {
-  fieldset.features {
-    .control-label {
+  fieldset {
+    &.features .control-label {
       font-weight: normal;
     }
+    .form-group {
+      margin-bottom: 5px;
+    }
+    &> .form-group {
+      padding-left: 0;
+    }
+  }
+  .help-block {
+    margin-bottom: 10px;
+  }
+  .project-path {
+    padding-right: 0;
+    .form-control {
+      border-radius: $border-radius-base;
+    }
+  }
+  .input-group > div {
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+  @media (max-width: $screen-xs-max) {
+    .input-group > div {
+      margin-bottom: 14px;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+    fieldset > .form-group:first-child {
+      padding-right: 0;
+    }
+  }
+
+  .input-group-addon {
+    &.static-namespace {
+      height: 35px;
+      border-radius: 3px;
+      border: 1px solid #e5e5e5;
+    }
+    &+ .select2 a {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
   }
 }
 
@@ -365,10 +408,28 @@ a.deploy-project-label {
   }
 }
 
-.project-import .btn {
-  float: left;
-  margin-bottom: 10px;
-  margin-right: 10px;
+.project-import {
+  .form-group {
+    margin-bottom: 0;
+  }
+  .import-buttons {
+    padding-left: 0;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-wrap: wrap;
+    flex-wrap: wrap;
+    .btn {
+      margin-right: 10px;
+      padding: 8px 12px;
+    }
+    &> div {
+      margin-bottom: 14px;
+      padding-left: 0;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
 }
 
 .project-stats {
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 3c1c6060504..8a73b077357 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -1,110 +1,121 @@
 - page_title    'New Project'
 - header_title  "Projects", dashboard_projects_path
 
-%h3.page-title
-  New Project
-%hr
-
 .project-edit-container
   .project-edit-errors
     = render 'projects/errors'
-  .project-edit-content
-
-    = form_for @project, html: { class: 'new_project form-horizontal js-requires-input' } do |f|
-      .form-group
-        = f.label :path, class: 'control-label' do
-          Project owner
-        .col-sm-10
-          = f.select :namespace_id, namespaces_options(:current_user), {}, {class: 'select2 js-select-namespace', tabindex: 1}
-        
-          - if current_user.can_create_group?
-            .help-block
-              Want to house several dependent projects under the same namespace?
-              = link_to "Create a group", new_group_path
-              
-      .form-group
-        = f.label :path, class: 'control-label' do
-          Project name
-        .col-sm-10
-          = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true
-
-      - if import_sources_enabled?
-        .project-import.js-toggle-container
-          .form-group
-            %label.control-label Import project from
-            .col-sm-10
-              - if github_import_enabled?
-                - if github_import_configured?
-                  = link_to status_import_github_path, class: 'btn import_github' do
-                    %i.fa.fa-github
-                    GitHub
-                - else
-                  = link_to '#', class: 'how_to_import_link btn import_github' do
-                    %i.fa.fa-github
-                    GitHub
-                  = render 'github_import_modal'
-
-              - if bitbucket_import_enabled?
-                - if bitbucket_import_configured?
-                  = link_to status_import_bitbucket_path, class: 'btn import_bitbucket', "data-no-turbolink" => "true" do
-                    %i.fa.fa-bitbucket
-                    Bitbucket
-                - else
-                  = link_to status_import_bitbucket_path, class: 'how_to_import_link btn import_bitbucket', "data-no-turbolink" => "true" do
-                    %i.fa.fa-bitbucket
-                    Bitbucket
-                  = render 'bitbucket_import_modal'
-
-              - if gitlab_import_enabled?
-                - if gitlab_import_configured?
-                  = link_to status_import_gitlab_path, class: 'btn import_gitlab' do
-                    %i.fa.fa-heart
-                    GitLab.com
+  .row.prepend-top-default
+    .col-lg-3.profile-settings-sidebar
+      %h4.prepend-top-0
+        New project
+      %p
+        Create or Import your project from popular Git services
+    .col-lg-9
+      = form_for @project, html: { class: 'new_project' } do |f|
+        %fieldset.append-bottom-0
+          .form-group.col-xs-12.col-sm-6
+            = f.label :namespace_id, class: 'label-light' do
+              %span
+                Project path
+            .form-group
+              .input-group
+                - if current_user.can_select_namespace?
+                  .input-group-addon
+                    = root_url
+                  = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user, display_path: true), {}, {class: 'select2 js-select-namespace', tabindex: 1}
                 - else
-                  = link_to status_import_gitlab_path, class: 'how_to_import_link btn import_gitlab' do
-                    %i.fa.fa-heart
-                    GitLab.com
-                  = render 'gitlab_import_modal'
-
-              - if gitorious_import_enabled?
-                = link_to new_import_gitorious_path, class: 'btn import_gitorious' do
-                  %i.icon-gitorious.icon-gitorious-small
-                  Gitorious.org
-
-              - if google_code_import_enabled?
-                = link_to new_import_google_code_path, class: 'btn import_google_code' do
-                  %i.fa.fa-google
-                  Google Code
-
-              - if fogbugz_import_enabled?
-                = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
-                  %i.fa.fa-bug
-                  Fogbugz
-
-              - if git_import_enabled?
-                = link_to "#", class: 'btn js-toggle-button import_git' do
-                  %i.fa.fa-git
-                  %span Repo by URL
-
-              - if gitlab_project_import_enabled?
-                = link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project project-submit' do
-                  %i.fa.fa-gitlab
-                  %span GitLab export
-
-          .js-toggle-content.hide
-            = render "shared/import_form", f: f
-
-      .prepend-botton-10
-
-      .form-group
-        = f.label :description, class: 'control-label' do
-          Description
-          %span.light (optional)
-        .col-sm-10
-          = f.text_area :description, class: "form-control", rows: 3, maxlength: 250, tabindex: 3
-      = render 'shared/visibility_level', f: f, visibility_level: default_project_visibility, can_change_visibility_level: true, form_model: @project
+                  .input-group-addon.static-namespace
+                    #{root_url}#{current_user.username}/
+          .form-group.col-xs-12.col-sm-6.project-path
+            = f.label :namespace_id, class: 'label-light' do
+              %span
+                Project name
+            = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true
+        - if current_user.can_create_group?
+          .help-block
+            Want to house several dependent projects under the same namespace?
+            = link_to "Create a group", new_group_path
+
+        - if import_sources_enabled?
+          .project-import.js-toggle-container
+            .form-group.clearfix
+              = f.label :visibility_level, class: 'label-light' do
+                Import project from
+              .col-sm-12.import-buttons
+                %div
+                  - if github_import_enabled?
+                    - if github_import_configured?
+                      = link_to status_import_github_path, class: 'btn import_github' do
+                        %i.fa.fa-github
+                        GitHub
+                    - else
+                      = link_to '#', class: 'how_to_import_link btn import_github' do
+                        %i.fa.fa-github
+                        GitHub
+                      = render 'github_import_modal'
+                %div
+                  - if bitbucket_import_enabled?
+                    - if bitbucket_import_configured?
+                      = link_to status_import_bitbucket_path, class: 'btn import_bitbucket', "data-no-turbolink" => "true" do
+                        %i.fa.fa-bitbucket
+                        Bitbucket
+                    - else
+                      = link_to status_import_bitbucket_path, class: 'how_to_import_link btn import_bitbucket', "data-no-turbolink" => "true" do
+                        %i.fa.fa-bitbucket
+                        Bitbucket
+                      = render 'bitbucket_import_modal'
+                %div
+                  - if gitlab_import_enabled?
+                    - if gitlab_import_configured?
+                      = link_to status_import_gitlab_path, class: 'btn import_gitlab' do
+                        %i.fa.fa-heart
+                        GitLab.com
+                    - else
+                      = link_to status_import_gitlab_path, class: 'how_to_import_link btn import_gitlab' do
+                        %i.fa.fa-heart
+                        GitLab.com
+                      = render 'gitlab_import_modal'
+                %div
+                  - if gitorious_import_enabled?
+                    = link_to new_import_gitorious_path, class: 'btn import_gitorious' do
+                      %i.icon-gitorious.icon-gitorious-small
+                      Gitorious.org
+                %div
+                  - if google_code_import_enabled?
+                    = link_to new_import_google_code_path, class: 'btn import_google_code' do
+                      %i.fa.fa-google
+                      Google Code
+                %div
+                  - if fogbugz_import_enabled?
+                    = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
+                      %i.fa.fa-bug
+                      Fogbugz
+                %div
+                  - if git_import_enabled?
+                    = link_to "#", class: 'btn js-toggle-button import_git' do
+                      %i.fa.fa-git
+                      %span Repo by URL
+                %div
+                  - if gitlab_project_import_enabled?
+                    = link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project project-submit' do
+                      %i.fa.fa-gitlab
+                      %span GitLab export
+
+            .js-toggle-content.hide
+              = render "shared/import_form", f: f
+
+        .form-group
+          = f.label :description, class: 'label-light' do
+            Project description
+            %span.light (optional)
+          = f.text_area :description, placeholder: 'Description format',  class: "form-control", rows: 3, maxlength: 250
+
+        .form-group.project-visibility-level-holder
+          = f.label :visibility_level, class: 'label-light' do
+            Visibility Level
+            = link_to "(?)", help_page_path("public_access", "public_access")
+          = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: @project.visibility_level, form_model: @project)
 
-      .form-actions
         = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
         = link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
 
-- 
cgit v1.2.1


From 31c95aa031ea6e5e7cd1bf8d08e3c6543f0ab2e7 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 28 Jun 2016 09:55:19 +0200
Subject: add missing attribute to attr_encrypted so it is fully
 backwards-compatible

---
 app/models/ci/variable.rb         | 1 +
 app/models/project_import_data.rb | 1 +
 app/models/user.rb                | 1 +
 3 files changed, 3 insertions(+)

(limited to 'app')

diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index f8d5d4486fd..c9c47ec7419 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -13,6 +13,7 @@ module Ci
 
     attr_encrypted :value, 
        mode: :per_attribute_iv_and_salt,
+       insecure_mode: true,
        key: Gitlab::Application.secrets.db_key_base,
        algorithm: 'aes-256-cbc'
   end
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index ca8a9b4217b..331123a5a5b 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -7,6 +7,7 @@ class ProjectImportData < ActiveRecord::Base
                  marshal: true,
                  encode: true,
                  mode: :per_attribute_iv_and_salt,
+                 insecure_mode: true,
                  algorithm: 'aes-256-cbc'
 
   serialize :data, JSON
diff --git a/app/models/user.rb b/app/models/user.rb
index 599b2fb1191..767d6366c79 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -25,6 +25,7 @@ class User < ActiveRecord::Base
   attr_encrypted :otp_secret,
     key:       Gitlab::Application.config.secret_key_base,
     mode:      :per_attribute_iv_and_salt,
+    insecure_mode: true,
     algorithm: 'aes-256-cbc'
 
   devise :two_factor_authenticatable,
-- 
cgit v1.2.1


From 8fb4c506e29cce8c14a5371e844c5d50fdfd5220 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Thu, 16 Jun 2016 00:27:54 +0200
Subject: Display last commit of deleted branch in push events (!4699)

---
 app/models/event.rb                    |  2 +-
 app/views/events/event/_push.html.haml | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/models/event.rb b/app/models/event.rb
index 716039fb54b..d7d23c7ae6d 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -315,7 +315,7 @@ class Event < ActiveRecord::Base
 
   def body?
     if push?
-      push_with_commits?
+      push_with_commits? || rm_ref?
     elsif note?
       true
     else
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index dc4ff17e31a..ea54ef226ec 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -1,3 +1,5 @@
+- project = event.project
+
 .event-title
   %span.author_name= link_to_author event
   %span.event_label.pushed #{event.action_name} #{event.ref_type}
@@ -5,19 +7,18 @@
     %strong= event.ref_name
   - else
     %strong
-      = link_to event.ref_name, namespace_project_commits_path(event.project.namespace, event.project, event.ref_name), title: h(event.target_title)
+      = link_to event.ref_name, namespace_project_commits_path(project.namespace, project, event.ref_name), title: h(event.target_title)
   at
-  = link_to_project event.project
+  = link_to_project project
 
 - if event.push_with_commits?
-  - project = event.project
   .event-body
     %ul.well-list.event_commits
       - few_commits = event.commits[0...2]
       - few_commits.each do |commit|
         = render "events/commit", commit: commit, project: project, event: event
 
-      - create_mr = event.new_ref? && create_mr_button?(event.project.default_branch, event.ref_name, event.project)
+      - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project)
       - if event.commits_count > 1
         %li.commits-stat
           - if event.commits_count > 2
@@ -27,18 +28,26 @@
             - from = event.commit_from
             - from_label = truncate_sha(from)
           - else
-            - from = event.project.default_branch
+            - from = project.default_branch
             - from_label = from
 
-          = link_to namespace_project_compare_path(event.project.namespace, event.project, from: from, to: event.commit_to) do
+          = link_to namespace_project_compare_path(project.namespace, project, from: from, to: event.commit_to) do
             Compare #{from_label}...#{truncate_sha(event.commit_to)}
 
           - if create_mr
             %span{"data-user-is" => event.author_id, "data-display" => "inline"}
               or
-              = link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
+              = link_to create_mr_path(project.default_branch, event.ref_name, project) do
                 create a merge request
       - elsif create_mr
         %li.commits-stat{"data-user-is" => event.author_id}
-          = link_to create_mr_path(event.project.default_branch, event.ref_name, event.project) do
+          = link_to create_mr_path(project.default_branch, event.ref_name, project) do
             Create Merge Request
+- elsif event.rm_ref?
+  - repository = project.repository
+  - last_commit = repository.commit(event.commit_from)
+  - if last_commit
+    .event-body
+      %ul.well-list.event_commits
+        = render "events/commit", commit: last_commit, project: project, event: event
+
-- 
cgit v1.2.1


From c31f876a275c03111488ef72474116a619ffb0d8 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Fri, 10 Jun 2016 14:57:50 +0200
Subject: Workhorse to serve email diffs

Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).
---
 app/controllers/projects/merge_requests_controller.rb | 8 +++++++-
 app/models/merge_request.rb                           | 7 -------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 39c8ba40ca2..dd86b940a08 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -59,7 +59,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     respond_to do |format|
       format.html
       format.json   { render json: @merge_request }
-      format.patch  { render text: @merge_request.to_patch }
+      format.patch  do
+        headers.store(*Gitlab::Workhorse.send_git_patch(@project.repository,
+                                                        @merge_request.diff_base_commit.id,
+                                                        @merge_request.last_commit.id))
+        headers['Content-Disposition'] = 'inline'
+        head :ok
+      end
       format.diff do
         return render_404 unless @merge_request.diff_refs
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index f5c5b7c1306..53d9aa588af 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -319,13 +319,6 @@ class MergeRequest < ActiveRecord::Base
     )
   end
 
-  # Returns the commit as a series of email patches.
-  #
-  # see "git format-patch"
-  def to_patch
-    target_project.repository.format_patch(diff_base_commit.sha, source_sha)
-  end
-
   def hook_attrs
     attrs = {
       source: source_project.try(:hook_attrs),
-- 
cgit v1.2.1


From 2e1a70fefca7c57c8ccc8f3dac615d42de0903c5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 27 Jun 2016 09:30:19 -0500
Subject: Decreased window min width for pinned sidebar

---
 app/assets/javascripts/application.js.coffee    | 2 +-
 app/assets/stylesheets/framework/variables.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 5c5a4ca7670..2c515dced08 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -261,7 +261,7 @@ $ ->
   new Aside()
 
   # Sidenav pinning
-  if $window.width() < 1440 and $.cookie('pin_nav') is 'true'
+  if $window.width() < 1280 and $.cookie('pin_nav') is 'true'
     $.cookie('pin_nav', 'false', { path: '/' })
     $('.page-with-sidebar')
       .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index c37574ca7a1..87f8a17659f 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -7,7 +7,7 @@ $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;
 $sidebar-transition-duration: .15s;
-$sidebar-breakpoint: 1440px;
+$sidebar-breakpoint: 1280px;
 
 /*
  * UI elements
-- 
cgit v1.2.1


From 706c5a1399c1c06a6a39a02e35d8e61f064632e8 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 27 Jun 2016 09:06:36 -0500
Subject: Switched mobile button icons to ellipsis and angle

---
 app/assets/javascripts/application.js.coffee | 1 -
 app/assets/stylesheets/framework/nav.scss    | 5 ++---
 app/views/layouts/header/_default.html.haml  | 2 +-
 app/views/layouts/nav/_admin.html.haml       | 4 ++--
 app/views/layouts/nav/_group.html.haml       | 4 ++--
 app/views/layouts/nav/_profile.html.haml     | 4 ++--
 app/views/layouts/nav/_project.html.haml     | 4 ++--
 app/views/projects/commits/_head.html.haml   | 4 ++--
 8 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 2c515dced08..b6dbf2d0cc1 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -199,7 +199,6 @@ $ ->
     $('.header-content .header-logo').toggle()
     $('.header-content .navbar-collapse').toggle()
     $('.navbar-toggle').toggleClass('active')
-    $('.navbar-toggle i').toggleClass("fa-angle-right fa-angle-left")
 
   # Show/hide comments on diff
   $body.on "click", ".js-toggle-diff-comments", (e) ->
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 6211bc04597..6e5f216c894 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -21,9 +21,8 @@
 
   .fa {
     position: relative;
-    top: 3px;
-    font-size: 13px;
-    color: $btn-placeholder-gray;
+    top: 5px;
+    font-size: 18px;
   }
 }
 
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 40a2c81eebd..1a39572ac3c 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -6,7 +6,7 @@
         = icon('bars')
       %button.navbar-toggle{type: 'button'}
         %span.sr-only Toggle navigation
-        = icon('angle-left')
+        = icon('ellipsis-v')
 
       .navbar-collapse.collapse
         %ul.nav.navbar-nav
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 0f264cd2e06..a7415507c8f 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,9 +1,9 @@
 .scrolling-tabs-container{ class: nav_control_class }
   = render 'layouts/nav/admin_settings'
   .fade-left
-    = icon('arrow-left')
+    = icon('angle-left')
   .fade-right
-    = icon('arrow-right')
+    = icon('angle-right')
   %ul.nav-links.scrolling-tabs
     = nav_link(controller: %w(dashboard admin projects users groups builds runners), html_options: {class: 'home'}) do
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 5d657a9ac84..d7d36c84b6c 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,9 +1,9 @@
 .scrolling-tabs-container{ class: nav_control_class }
   = render 'layouts/nav/group_settings'
   .fade-left
-    = icon('arrow-left')
+    = icon('angle-left')
   .fade-right
-    = icon('arrow-right')
+    = icon('angle-right')
   %ul.nav-links.scrolling-tabs
     = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
       = link_to group_path(@group), title: 'Home' do
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index f37f9b0f5a3..96fe62c39c3 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,8 +1,8 @@
 .scrolling-tabs-container
   .fade-left
-    = icon('arrow-left')
+    = icon('angle-left')
   .fade-right
-    = icon('arrow-right')
+    = icon('angle-right')
   %ul.nav-links.scrolling-tabs
     = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
       = link_to profile_path, title: 'Profile Settings' do
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index a4bb56aa56f..dcef427cda3 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -26,9 +26,9 @@
 
 .scrolling-tabs-container{ class: nav_control_class }
   .fade-left
-    = icon('arrow-left')
+    = icon('angle-left')
   .fade-right
-    = icon('arrow-right')
+    = icon('angle-right')
   %ul.nav-links.scrolling-tabs
     = nav_link(path: 'projects#show', html_options: {class: 'home'}) do
       = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index b11b6c24ccd..61152649907 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -1,8 +1,8 @@
 .scrolling-tabs-container.sub-nav-scroll
   .fade-left
-    = icon('arrow-left')
+    = icon('angle-left')
   .fade-right
-    = icon('arrow-right')
+    = icon('angle-right')
   .nav-links.sub-nav.scrolling-tabs
     %ul{ class: (container_class) }
       = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
-- 
cgit v1.2.1


From 7a3bca78816b9a92053fc29c13024dd30ae64f77 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Mon, 27 Jun 2016 13:00:43 -0500
Subject: Display user avatar inside of .discussion-body

---
 app/assets/stylesheets/pages/notes.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index ee7c98f805b..ac8c02b59dc 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -41,6 +41,10 @@ ul.notes {
     .timeline-icon {
       .avatar {
         visibility: hidden;
+
+        .discussion-body & {
+          visibility: visible;
+        }
       }
     }
   }
-- 
cgit v1.2.1


From 9ecd5d049dc0b26cf0d0589430d3c7cd3105fd8c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 22 Jun 2016 08:27:28 +0200
Subject: Fix group visibility UI consistency in settings

Closes #18949
---
 app/views/admin/application_settings/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index c883e8f97da..30ab0717164 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -15,7 +15,7 @@
       = f.label :default_snippet_visibility, class: 'control-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
-    .form-group.group-visibility-level-holder
+    .form-group.project-visibility-level-holder
       = f.label :default_group_visibility, class: 'control-label col-sm-2'
       .col-sm-10
         = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new)
-- 
cgit v1.2.1


From 82edef941406eef9e4be12341a064566ac848dce Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 22 Jun 2016 10:43:28 -0400
Subject: Show basic system info on admin panel. Closes #18886

---
 app/controllers/admin/system_info_controller.rb | 12 ++++++++++++
 app/views/admin/background_jobs/_head.html.haml |  4 ++++
 app/views/admin/system_info/show.html.haml      | 22 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 app/controllers/admin/system_info_controller.rb
 create mode 100644 app/views/admin/system_info/show.html.haml

(limited to 'app')

diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
new file mode 100644
index 00000000000..a548f941dc5
--- /dev/null
+++ b/app/controllers/admin/system_info_controller.rb
@@ -0,0 +1,12 @@
+class Admin::SystemInfoController < Admin::ApplicationController
+  def show
+    system_info = Vmstat.snapshot
+    @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
+
+    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_s('GB')
+    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_s('GB')
+
+    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_s('GB')
+    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_s('GB')
+  end
+end
diff --git a/app/views/admin/background_jobs/_head.html.haml b/app/views/admin/background_jobs/_head.html.haml
index d78682532ed..5ad99a7f6e0 100644
--- a/app/views/admin/background_jobs/_head.html.haml
+++ b/app/views/admin/background_jobs/_head.html.haml
@@ -1,5 +1,9 @@
 .nav-links.sub-nav
   %ul{ class: (container_class) }
+  = nav_link(controller: :system_info) do
+    = link_to admin_system_info_path, title: 'System Info' do
+      %span
+        System Info
     = nav_link(controller: :background_jobs) do
       = link_to admin_background_jobs_path, title: 'Background Jobs' do
         %span
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
new file mode 100644
index 00000000000..01496e4fcf5
--- /dev/null
+++ b/app/views/admin/system_info/show.html.haml
@@ -0,0 +1,22 @@
+- @no_container = true
+- page_title "System Info"
+= render 'admin/background_jobs/head'
+
+%div{ class: (container_class) }
+  %p
+  .row
+    .col-sm-4
+      .light-well
+        %h4 CPU Load
+        .data
+          %h1= @load
+    .col-sm-4
+      .light-well
+        %h4 Memory
+        .data
+          %h1= "#{@mem_used} / #{@mem_total}"
+    .col-sm-4
+      .light-well
+        %h4 Disk
+        .data
+          %h1= "#{@disk_used} / #{@disk_total}"
-- 
cgit v1.2.1


From 391a9f650eb6b29b716777972bb3c9cc62763a88 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 08:19:54 -0400
Subject: Fix styling

---
 app/views/admin/background_jobs/_head.html.haml | 8 ++++----
 app/views/admin/system_info/show.html.haml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/views/admin/background_jobs/_head.html.haml b/app/views/admin/background_jobs/_head.html.haml
index 5ad99a7f6e0..9d722bd7382 100644
--- a/app/views/admin/background_jobs/_head.html.haml
+++ b/app/views/admin/background_jobs/_head.html.haml
@@ -1,9 +1,9 @@
 .nav-links.sub-nav
   %ul{ class: (container_class) }
-  = nav_link(controller: :system_info) do
-    = link_to admin_system_info_path, title: 'System Info' do
-      %span
-        System Info
+    = nav_link(controller: :system_info) do
+      = link_to admin_system_info_path, title: 'System Info' do
+        %span
+          System Info
     = nav_link(controller: :background_jobs) do
       = link_to admin_background_jobs_path, title: 'Background Jobs' do
         %span
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 01496e4fcf5..2a1fac6e48b 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -3,7 +3,7 @@
 = render 'admin/background_jobs/head'
 
 %div{ class: (container_class) }
-  %p
+  .prepend-top-default
   .row
     .col-sm-4
       .light-well
-- 
cgit v1.2.1


From a8cf89a78c7fbcfc0a32b11f2ff4a33e2ecebb38 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 08:45:50 -0400
Subject: Ensure Monitoring tab is highlighted

---
 app/views/layouts/nav/_admin.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index a7415507c8f..e6c5ec06252 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -9,7 +9,7 @@
       = link_to admin_root_path, title: 'Overview', class: 'shortcuts-tree' do
         %span
           Overview
-    = nav_link(controller: %w(background_jobs logs health_check)) do
+    = nav_link(controller: %w(system_info background_jobs logs health_check)) do
       = link_to admin_background_jobs_path, title: 'Monitoring' do
         %span
           Monitoring
-- 
cgit v1.2.1


From 242aa5bd66038e5c7393f17be51a73deaedd7d06 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 08:52:19 -0400
Subject: Round figures for system info

---
 app/controllers/admin/system_info_controller.rb | 8 ++++----
 app/views/admin/system_info/show.html.haml      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index a548f941dc5..ab05ed2612a 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -3,10 +3,10 @@ class Admin::SystemInfoController < Admin::ApplicationController
     system_info = Vmstat.snapshot
     @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
 
-    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_s('GB')
-    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_s('GB')
+    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_f('GB').round
+    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_f('GB').round
 
-    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_s('GB')
-    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_s('GB')
+    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_f('GB').round
+    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_f('GB').round
   end
 end
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 2a1fac6e48b..316a94f4d41 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -14,9 +14,9 @@
       .light-well
         %h4 Memory
         .data
-          %h1= "#{@mem_used} / #{@mem_total}"
+          %h1= "#{@mem_used}GB / #{@mem_total}GB"
     .col-sm-4
       .light-well
         %h4 Disk
         .data
-          %h1= "#{@disk_used} / #{@disk_total}"
+          %h1= "#{@disk_used}GB / #{@disk_total}GB"
-- 
cgit v1.2.1


From 13ba3bd4fdaa59b2836efa907433d5e807ed5d5e Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 10:37:20 -0400
Subject: Use number_to_human_size for system info and remove dependency on
 Filesize gem.

---
 app/controllers/admin/system_info_controller.rb | 8 ++++----
 app/views/admin/system_info/show.html.haml      | 4 ++--
 app/views/layouts/nav/_admin.html.haml          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index ab05ed2612a..b7333139c57 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -3,10 +3,10 @@ class Admin::SystemInfoController < Admin::ApplicationController
     system_info = Vmstat.snapshot
     @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
 
-    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_f('GB').round
-    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_f('GB').round
+    @mem_used = system_info.memory.active_bytes
+    @mem_total = system_info.memory.total_bytes
 
-    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_f('GB').round
-    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_f('GB').round
+    @disk_used = system_info.disks[0].used_bytes
+    @disk_total = system_info.disks[0].total_bytes
   end
 end
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 316a94f4d41..542498cfb22 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -14,9 +14,9 @@
       .light-well
         %h4 Memory
         .data
-          %h1= "#{@mem_used}GB / #{@mem_total}GB"
+          %h1= "#{number_to_human_size(@mem_used)} / #{number_to_human_size(@mem_total)}"
     .col-sm-4
       .light-well
         %h4 Disk
         .data
-          %h1= "#{@disk_used}GB / #{@disk_total}GB"
+          %h1= "#{number_to_human_size(@disk_used)} / #{number_to_human_size(@disk_total)}"
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index e6c5ec06252..5ee8772882e 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -10,7 +10,7 @@
         %span
           Overview
     = nav_link(controller: %w(system_info background_jobs logs health_check)) do
-      = link_to admin_background_jobs_path, title: 'Monitoring' do
+      = link_to admin_system_info_path, title: 'Monitoring' do
         %span
           Monitoring
     = nav_link(controller: :broadcast_messages) do
-- 
cgit v1.2.1


From 0aa0ace9bcca80af45e1060d2bfb730d3ef95836 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 10:56:41 -0400
Subject: Change load average to cpu/cores on system info.

---
 app/controllers/admin/system_info_controller.rb | 3 ++-
 app/views/admin/system_info/show.html.haml      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index b7333139c57..3c67370b667 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -1,7 +1,8 @@
 class Admin::SystemInfoController < Admin::ApplicationController
   def show
     system_info = Vmstat.snapshot
-    @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
+
+    @cpus = system_info.cpus.length
 
     @mem_used = system_info.memory.active_bytes
     @mem_total = system_info.memory.total_bytes
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 542498cfb22..3ef2f20b589 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -7,9 +7,9 @@
   .row
     .col-sm-4
       .light-well
-        %h4 CPU Load
+        %h4 CPU
         .data
-          %h1= @load
+          %h1= "#{@cpus} cores"
     .col-sm-4
       .light-well
         %h4 Memory
-- 
cgit v1.2.1


From 4c89cd4b73f2c35644ec18cd285df1b04586a90d Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Wed, 29 Jun 2016 07:10:18 +0200
Subject: PipelinesFinder use git cached data

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

(limited to 'app')

diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
index c19a795d467..641fbf838f1 100644
--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -29,10 +29,10 @@ class PipelinesFinder
   end
 
   def branches
-    project.repository.branches.map(&:name)
+    project.repository.branch_names
   end
 
   def tags
-    project.repository.tags.map(&:name)
+    project.repository.tag_names
   end
 end
-- 
cgit v1.2.1


From bc313deaae2fae3e5532a28245fe72fcf9aef9a6 Mon Sep 17 00:00:00 2001
From: Tim <tgaudette88@gmail.com>
Date: Sun, 26 Jun 2016 13:36:43 -0400
Subject: Added Bugzilla as external issue tracker option

Requested in #14669

Added note to changelog
---
 app/models/project.rb                           |  1 +
 app/models/project_services/bugzilla_service.rb | 37 +++++++++++++++++++++++++
 app/models/service.rb                           |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 app/models/project_services/bugzilla_service.rb

(limited to 'app')

diff --git a/app/models/project.rb b/app/models/project.rb
index 96837364423..73ded09c162 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -81,6 +81,7 @@ class Project < ActiveRecord::Base
   has_one :jira_service, dependent: :destroy
   has_one :redmine_service, dependent: :destroy
   has_one :custom_issue_tracker_service, dependent: :destroy
+  has_one :bugzilla_service, dependent: :destroy
   has_one :gitlab_issue_tracker_service, dependent: :destroy, inverse_of: :project
   has_one :external_wiki_service, dependent: :destroy
 
diff --git a/app/models/project_services/bugzilla_service.rb b/app/models/project_services/bugzilla_service.rb
new file mode 100644
index 00000000000..b84f9ebe479
--- /dev/null
+++ b/app/models/project_services/bugzilla_service.rb
@@ -0,0 +1,37 @@
+class BugzillaService < IssueTrackerService
+
+  prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
+
+  def title
+    if self.properties && self.properties['title'].present?
+      self.properties['title']
+    else
+      'Bugzilla'
+    end
+  end
+
+  def description
+    if self.properties && self.properties['description'].present?
+      self.properties['description']
+    else
+      'Bugzilla issue tracker'
+    end
+  end
+
+  def to_param
+    'bugzilla'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'description', placeholder: description },
+      { type: 'text', name: 'project_url', placeholder: 'http://bugzilla.example.com/describecomponents.cgi?product=PRODUCT_NAME' },
+      { type: 'text', name: 'issues_url', placeholder: 'http://bugzilla.example.com/show_bug.cgi?id=:id' },
+      { type: 'text', name: 'new_issue_url', placeholder: 'http://bugzilla.example.com/enter_bug.cgi?product=PRODUCT_NAME' }
+    ]
+  end
+
+  def initialize_properties
+    self.properties = {} if properties.nil?
+  end
+end
diff --git a/app/models/service.rb b/app/models/service.rb
index 40d39933ad8..d7a32c28267 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -170,6 +170,7 @@ class Service < ActiveRecord::Base
       bamboo
       buildkite
       builds_email
+      bugzilla
       campfire
       custom_issue_tracker
       drone_ci
-- 
cgit v1.2.1


From 3d108760ea4c625587a1d29bb0e4ace77531f25d Mon Sep 17 00:00:00 2001
From: Tim <tgaudette88@gmail.com>
Date: Mon, 27 Jun 2016 18:42:50 -0400
Subject: Set field defaults to be the same as IssueTrackerService

Rebased to resolve merge conflicts
---
 app/models/project_services/bugzilla_service.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/models/project_services/bugzilla_service.rb b/app/models/project_services/bugzilla_service.rb
index b84f9ebe479..199cad0eb86 100644
--- a/app/models/project_services/bugzilla_service.rb
+++ b/app/models/project_services/bugzilla_service.rb
@@ -25,9 +25,9 @@ class BugzillaService < IssueTrackerService
   def fields
     [
       { type: 'text', name: 'description', placeholder: description },
-      { type: 'text', name: 'project_url', placeholder: 'http://bugzilla.example.com/describecomponents.cgi?product=PRODUCT_NAME' },
-      { type: 'text', name: 'issues_url', placeholder: 'http://bugzilla.example.com/show_bug.cgi?id=:id' },
-      { type: 'text', name: 'new_issue_url', placeholder: 'http://bugzilla.example.com/enter_bug.cgi?product=PRODUCT_NAME' }
+      { type: 'text', name: 'project_url', placeholder: 'Project url' },
+      { type: 'text', name: 'issues_url', placeholder: 'Issue url' },
+      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' }
     ]
   end
 
-- 
cgit v1.2.1


From 65a9d897361c510a42ae6e5d6f67e4a00ebe9015 Mon Sep 17 00:00:00 2001
From: Tim <tgaudette88@gmail.com>
Date: Tue, 28 Jun 2016 19:08:41 -0400
Subject: Removed redudant methods implemented by parent class

---
 app/models/project_services/bugzilla_service.rb             | 12 ------------
 app/models/project_services/custom_issue_tracker_service.rb |  3 ---
 2 files changed, 15 deletions(-)

(limited to 'app')

diff --git a/app/models/project_services/bugzilla_service.rb b/app/models/project_services/bugzilla_service.rb
index 199cad0eb86..260f6030957 100644
--- a/app/models/project_services/bugzilla_service.rb
+++ b/app/models/project_services/bugzilla_service.rb
@@ -22,16 +22,4 @@ class BugzillaService < IssueTrackerService
     'bugzilla'
   end
 
-  def fields
-    [
-      { type: 'text', name: 'description', placeholder: description },
-      { type: 'text', name: 'project_url', placeholder: 'Project url' },
-      { type: 'text', name: 'issues_url', placeholder: 'Issue url' },
-      { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' }
-    ]
-  end
-
-  def initialize_properties
-    self.properties = {} if properties.nil?
-  end
 end
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index 6b2b1daa724..8f2db46a7ba 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -32,7 +32,4 @@ class CustomIssueTrackerService < IssueTrackerService
     ]
   end
 
-  def initialize_properties
-    self.properties = {} if properties.nil?
-  end
 end
-- 
cgit v1.2.1


From e21c7d37c8cd21be1489f6dd445d5efa24e94456 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 28 Jun 2016 09:02:27 -0700
Subject: Reduce overhead and optimize ProjectTeam#max_member_access
 performance

The previous implementation would load the entire team member list and their
respective attributes. Now we only search for the user's specific
access level.

In gitlab-com/operations#42, this reduces the overall overhead of rendering
the issue from 28% to 20%.

First step of optimizing #19273
---
 app/models/member.rb       |  1 +
 app/models/project_team.rb | 14 ++------------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/models/member.rb b/app/models/member.rb
index c74a16367db..57161397e2b 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -32,6 +32,7 @@ class Member < ActiveRecord::Base
   scope :request, -> { where.not(requested_at: nil) }
   scope :non_request, -> { where(requested_at: nil) }
   scope :non_pending, -> { non_request.non_invite }
+  scope :has_access, -> { where('access_level > 0') }
 
   scope :guests, -> { where(access_level: GUEST) }
   scope :reporters, -> { where(access_level: REPORTER) }
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 73e736820af..0865b979ce0 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -137,20 +137,10 @@ class ProjectTeam
   def max_member_access(user_id)
     access = []
 
-    project.members.non_request.each do |member|
-      if member.user_id == user_id
-        access << member.access_field if member.access_field
-        break
-      end
-    end
+    access += project.members.non_request.where(user_id: user_id).has_access.pluck(:access_level)
 
     if group
-      group.members.non_request.each do |member|
-        if member.user_id == user_id
-          access << member.access_field if member.access_field
-          break
-        end
-      end
+      access += group.members.non_request.where(user_id: user_id).has_access.pluck(:access_level)
     end
 
     if project.invited_groups.any? && project.allowed_to_share_with_group?
-- 
cgit v1.2.1


From f525b535a531aeb5c8e5d0771e8a8603e7936e6c Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Fri, 24 Jun 2016 18:30:33 +0200
Subject: Use update_columns to by_pass all the dirty code on active_record
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We think this is valid because we’re just storing new data that always will be valid
---
 app/models/merge_request_diff.rb | 47 +++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index aca377cc600..86331a33c05 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -108,44 +108,46 @@ class MergeRequestDiff < ActiveRecord::Base
   # Reload all commits related to current merge request from repo
   # and save it as array of hashes in st_commits db field
   def reload_commits
+    new_attributes = {}
+
     commit_objects = unmerged_commits
 
     if commit_objects.present?
-      self.st_commits = dump_commits(commit_objects)
+      new_attributes[:st_commits] = dump_commits(commit_objects)
     end
 
-    save
+    update_columns_serialized(new_attributes)
   end
 
   # Reload diffs between branches related to current merge request from repo
   # and save it as array of hashes in st_diffs db field
   def reload_diffs
+    new_attributes = {}
     new_diffs = []
 
     if commits.size.zero?
-      self.state = :empty
+      new_attributes[:state] = :empty
     else
       diff_collection = unmerged_diffs
 
       if diff_collection.overflow?
         # Set our state to 'overflow' to make the #empty? and #collected?
         # methods (generated by StateMachine) return false.
-        self.state = :overflow
+        new_attributes[:state] = :overflow
       end
 
-      self.real_size = diff_collection.real_size
+      new_attributes[:real_size] = diff_collection.real_size
 
       if diff_collection.any?
         new_diffs = dump_diffs(diff_collection)
-        self.state = :collected
+        new_attributes[:state] = :collected
       end
     end
 
-    self.st_diffs = new_diffs
-
-    self.base_commit_sha = self.repository.merge_base(self.head, self.base)
+    new_attributes[:st_diffs] = new_diffs
+    new_attributes[:base_commit_sha] = self.repository.merge_base(self.head, self.base)
 
-    self.save
+    update_columns_serialized(new_attributes)
   end
 
   # Collect array of Git::Diff objects
@@ -190,4 +192,29 @@ class MergeRequestDiff < ActiveRecord::Base
         )
       end
   end
+
+  private
+
+  #
+  # #save or #update_attributes providing changes on serialized attributes do a lot of
+  # serialization and deserialization calls resulting in bad performance.
+  # Using #update_columns solves the problem with just one YAML.dump per serialized attribute that we provide.
+  # As a tradeoff we need to reload the current instance to properly manage time objects on those serialized
+  # attributes. So to keep the same behaviour as the attribute assignment we reload the instance.
+  # The difference is in the usage of
+  # #write_attribute= (#update_attributes) and #raw_write_attribute= (#update_columns)
+  #
+  # Ex:
+  #
+  #   new_attributes[:st_commits].first.slice(:committed_date)
+  #   => {:committed_date=>2014-02-27 11:01:38 +0200}
+  #   YAML.load(YAML.dump(new_attributes[:st_commits].first.slice(:committed_date)))
+  #   => {:committed_date=>2014-02-27 10:01:38 +0100}
+  #
+  def update_columns_serialized(new_attributes)
+    return unless new_attributes.any?
+
+    update_columns(new_attributes.merge(updated_at: current_time_from_proper_timezone))
+    reload
+  end
 end
-- 
cgit v1.2.1