From 84ee2857975ed2da991604d9f93a151b66032991 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 9 Aug 2016 13:24:16 -0500
Subject: [PATCH 01/64] Add delimiter to project stars and forks count

---
 CHANGELOG                                    | 1 +
 app/views/shared/projects/_project.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7bfeff2a4ec..eb43b656f11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.11.0 (unreleased)
   - Fix don't pass a local variable called `i` to a partial. !20510 (herminiotorres)
+  - Add delimiter to project stars and forks count (ClemMakesApps)
   - Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres)
   - Fix the title of the toggle dropdown button. !5515 (herminiotorres)
   - Improve diff performance by eliminating redundant checks for text blobs
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml
index b8b66d08db8..2cf958e9879 100644
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -18,11 +18,11 @@
       - if forks
         %span
           = icon('code-fork')
-          = project.forks_count
+          = number_with_delimiter(project.forks_count)
       - if stars
         %span
           = icon('star')
-          = project.star_count
+          = number_with_delimiter(project.star_count)
       %span.visibility-icon.has-tooltip{data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project)}
         = visibility_level_icon(project.visibility_level, fw: false)
 

From 3b4fb0bbdc13f5b52d1a4d30128d0d2d99b97e72 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 8 Aug 2016 16:26:33 -0500
Subject: [PATCH 02/64] Add build data to top of pipeline page

---
 app/assets/stylesheets/pages/pipelines.scss   |  6 ++++++
 app/views/projects/commit/_pipeline.html.haml | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 21919fe4d73..5bc8c3a7e6c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -229,3 +229,9 @@
     box-shadow: none;
   }
 }
+
+// Pipeline visualization
+.stage-column {
+  display: inline-block;
+  vertical-align: top;
+}
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 540689f4a61..a52bfa0ea55 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,4 +1,16 @@
 .row-content-block.build-content.middle-block
+  .pipeline-visualization
+    - pipeline.statuses.stages.each do |stage|
+      - statuses = pipeline.statuses.where(stage: stage)
+      .stage-column
+        %strong
+          %a{name: stage}
+          - if stage
+            = stage.titleize
+        - statuses.each do |status|
+          %div= status.name
+
+
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)

From dcb7d4148efe86ba07e9a00cb43818846d61f9d0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 8 Aug 2016 17:42:28 -0500
Subject: [PATCH 03/64] Connect top level tests to each other

---
 app/assets/stylesheets/pages/pipelines.scss   | 50 +++++++++++++++++++
 app/views/projects/commit/_pipeline.html.haml | 44 +++++++++-------
 2 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 5bc8c3a7e6c..e79c7e59720 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -231,7 +231,57 @@
 }
 
 // Pipeline visualization
+
+.pipeline-visualization {
+  position: relative;
+}
+
 .stage-column {
   display: inline-block;
   vertical-align: top;
+  margin-right: 40px;
+
+  .stage-name {
+    margin-bottom: 15px;
+    font-weight: bold;
+  }
+
+  .builds-container {
+
+  }
+
+  .build {
+    border: 1px solid $border-color;
+    position: relative;
+    padding: 6px 10px;
+    border-radius: 30px;
+    width: 150px;
+    // TODO truncate text within .build div; not on build div itself
+    // white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    margin-bottom: 10px;
+
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 5px;
+    }
+
+    &:first-child {
+      &::after, &::before {
+        content: '';
+        position: absolute;
+        top: 50%;
+        right: -44px;
+        border-top: 1px solid $border-color;
+        width: 44px;
+        height: 1px;
+      }
+    }
+    &:first-child::before, &:last-child::after{
+      border: 0 none;
+    }
+
+  }
 }
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index a52bfa0ea55..72259cd0756 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,16 +1,22 @@
-.row-content-block.build-content.middle-block
+.row-content-block.white
+
   .pipeline-visualization
     - pipeline.statuses.stages.each do |stage|
       - statuses = pipeline.statuses.where(stage: stage)
+      - status = statuses.latest.status
       .stage-column
-        %strong
+        .stage-name
           %a{name: stage}
           - if stage
             = stage.titleize
-        - statuses.each do |status|
-          %div= status.name
-
+        .builds-container
+          - statuses.each do |build|
+            .build
+              %span{class: "ci-status-link ci-status-icon-#{status}"}
+                = ci_icon_for_status(status)
+              = build.name
 
+.row-content-block.build-content.middle-block
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)
@@ -46,17 +52,17 @@
 - if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
-
-.table-holder.pipeline-holder
-  %table.table.builds.pipeline
-    %thead
-      %tr
-        %th Status
-        %th Build ID
-        %th Name
-        %th
-        - if pipeline.project.build_coverage_enabled?
-          %th Coverage
-        %th
-    - pipeline.statuses.stages.each do |stage|
-      = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)
+-#
+-# .table-holder.pipeline-holder
+-#   %table.table.builds.pipeline
+-#     %thead
+-#       %tr
+-#         %th Status
+-#         %th Build ID
+-#         %th Name
+-#         %th
+-#         - if pipeline.project.build_coverage_enabled?
+-#           %th Coverage
+-#         %th
+-#     - pipeline.statuses.stages.each do |stage|
+-#       = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)

From 83c1ce74e01dcf95ac8f545d7584259615e8834f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 14:26:25 -0500
Subject: [PATCH 04/64] Connect all builds in visual pipeline

---
 app/assets/stylesheets/pages/pipelines.scss   | 81 +++++++++++++++++--
 app/views/projects/commit/_pipeline.html.haml | 32 ++++----
 2 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e79c7e59720..fa422f4f3c5 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -234,6 +234,10 @@
 
 .pipeline-visualization {
   position: relative;
+
+  ul {
+    padding: 0;
+  }
 }
 
 .stage-column {
@@ -241,15 +245,15 @@
   vertical-align: top;
   margin-right: 40px;
 
+  li {
+    list-style: none;
+  }
+
   .stage-name {
     margin-bottom: 15px;
     font-weight: bold;
   }
 
-  .builds-container {
-
-  }
-
   .build {
     border: 1px solid $border-color;
     position: relative;
@@ -268,20 +272,81 @@
       margin-right: 5px;
     }
 
+    // Connect first build in each stage with right horizontal line
     &:first-child {
-      &::after, &::before {
+      &::after {
         content: '';
         position: absolute;
         top: 50%;
         right: -44px;
-        border-top: 1px solid $border-color;
+        border-top: 2px solid $border-color;
         width: 44px;
         height: 1px;
       }
     }
-    &:first-child::before, &:last-child::after{
-      border: 0 none;
+
+    // Connect each build (except for first) with curved lines
+    &:not(:first-child) {
+      &::after, &::before {
+        content: '';
+        top: -47px;
+        position: absolute;
+        border-bottom: 2px solid $border-color;
+        width: 20px;
+        height: 65px;
+      }
+
+      // Right connecting curves
+      &::after {
+        right: -21px;
+        border-right: 2px solid $border-color;
+        border-radius: 0 0 50px 0;
+        -webkit-border-radius: 0 0 50px 0;
+      }
+
+      // Left connecting curves
+      &::before {
+        left: -21px;
+        border-left: 2px solid $border-color;
+        border-radius: 0 0 0 50px;
+        -webkit-border-radius: 0 0 0 50px;
+      }
     }
 
+    // Connect second build to first build with smaller curved line
+    &:nth-child(2) {
+      &::after, &::before {
+        height: 40px;
+        top: -26px;
+      }
+    }
+  }
+
+  &:last-child {
+    .build {
+      // Remove right connecting horizontal line from first build in last stage
+      &:first-child {
+        &::after, &::before {
+          border: none;
+        }
+      }
+      // Remove right curved connectors from all builds in last stage
+      &:not(:first-child) {
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+
+  &:first-child {
+    .build {
+      // Remove left curved connectors from all builds in first stage
+      &:not(:first-child) {
+        &::before {
+          border: none;
+        }
+      }
+    }
   }
 }
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 72259cd0756..06a63839107 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,20 +1,22 @@
 .row-content-block.white
 
   .pipeline-visualization
-    - pipeline.statuses.stages.each do |stage|
-      - statuses = pipeline.statuses.where(stage: stage)
-      - status = statuses.latest.status
-      .stage-column
-        .stage-name
-          %a{name: stage}
-          - if stage
-            = stage.titleize
-        .builds-container
-          - statuses.each do |build|
-            .build
-              %span{class: "ci-status-link ci-status-icon-#{status}"}
-                = ci_icon_for_status(status)
-              = build.name
+    %ul.stage-column-list
+      - pipeline.statuses.stages.each do |stage|
+        - statuses = pipeline.statuses.where(stage: stage)
+        - status = statuses.latest.status
+        %li.stage-column
+          .stage-name
+            %a{name: stage}
+            - if stage
+              = stage.titleize
+          .builds-container
+            %ul
+              - statuses.each do |build|
+                %li.build
+                  %span{class: "ci-status-link ci-status-icon-#{status}"}
+                    = ci_icon_for_status(status)
+                  = build.name
 
 .row-content-block.build-content.middle-block
   .pull-right
@@ -52,7 +54,7 @@
 - if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
--#
+
 -# .table-holder.pipeline-holder
 -#   %table.table.builds.pipeline
 -#     %thead

From a76864cc92241ef9b759fbe63282a45dea7d5e03 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:00:09 -0500
Subject: [PATCH 05/64] Add min width and horizontally scroll pipeline graph
 when overflow

---
 app/assets/stylesheets/pages/pipelines.scss | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index fa422f4f3c5..a9ffda00278 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -234,16 +234,22 @@
 
 .pipeline-visualization {
   position: relative;
+  width: 100%;
+  overflow: auto;
 
   ul {
     padding: 0;
   }
 }
 
+.stage-column-list {
+  min-width: 1220px;
+}
+
 .stage-column {
   display: inline-block;
   vertical-align: top;
-  margin-right: 40px;
+  margin-right: 50px;
 
   li {
     list-style: none;
@@ -278,9 +284,9 @@
         content: '';
         position: absolute;
         top: 50%;
-        right: -44px;
+        right: -54px;
         border-top: 2px solid $border-color;
-        width: 44px;
+        width: 54px;
         height: 1px;
       }
     }
@@ -298,7 +304,7 @@
 
       // Right connecting curves
       &::after {
-        right: -21px;
+        right: -20px;
         border-right: 2px solid $border-color;
         border-radius: 0 0 50px 0;
         -webkit-border-radius: 0 0 50px 0;
@@ -306,7 +312,7 @@
 
       // Left connecting curves
       &::before {
-        left: -21px;
+        left: -20px;
         border-left: 2px solid $border-color;
         border-radius: 0 0 0 50px;
         -webkit-border-radius: 0 0 0 50px;
@@ -316,9 +322,14 @@
     // Connect second build to first build with smaller curved line
     &:nth-child(2) {
       &::after, &::before {
-        height: 40px;
+        height: 45px;
         top: -26px;
       }
+      &::after {
+        // border-left: 2px solid $border-color;
+        border-top-right-radius: -50px;
+        -webkit-border-top-right-radius: -50px;
+      }
     }
   }
 

From aeacadb3e32156a33060fea81243a4cef8fc1c3e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:08:04 -0500
Subject: [PATCH 06/64] Truncate build and stage names

---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/pages/pipelines.scss   | 15 ++++++---
 app/views/projects/commit/_pipeline.html.haml | 33 ++++++++++---------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 58751448d4a..31ed0e01095 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -81,6 +81,7 @@ v 8.11.0 (unreleased)
   - Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
   - Add unfold links for Side-by-Side view. !5415 (Tim Masliuchenko)
   - Adds support for pending invitation project members importing projects
+  - Add pipeline visualization/graph on pipeline page
   - Update devise initializer to turn on changed password notification emails. !5648 (tombell)
   - Avoid to show the original password field when password is automatically set. !5712 (duduribeiro)
   - Fix importing GitLab projects with an invalid MR source project
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index a9ffda00278..49225d7d0d4 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -258,6 +258,10 @@
   .stage-name {
     margin-bottom: 15px;
     font-weight: bold;
+    width: 150px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .build {
@@ -266,12 +270,15 @@
     padding: 6px 10px;
     border-radius: 30px;
     width: 150px;
-    // TODO truncate text within .build div; not on build div itself
-    // white-space: nowrap;
-    // overflow: hidden;
-    // text-overflow: ellipsis;
     margin-bottom: 10px;
 
+    .build-content {
+      width: 130px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
     svg {
       position: relative;
       top: 2px;
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 06a63839107..2edf660db71 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -14,9 +14,10 @@
             %ul
               - statuses.each do |build|
                 %li.build
-                  %span{class: "ci-status-link ci-status-icon-#{status}"}
-                    = ci_icon_for_status(status)
-                  = build.name
+                  .build-content
+                    %span{class: "ci-status-link ci-status-icon-#{status}"}
+                      = ci_icon_for_status(status)
+                    = build.name
 
 .row-content-block.build-content.middle-block
   .pull-right
@@ -55,16 +56,16 @@
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
 
--# .table-holder.pipeline-holder
--#   %table.table.builds.pipeline
--#     %thead
--#       %tr
--#         %th Status
--#         %th Build ID
--#         %th Name
--#         %th
--#         - if pipeline.project.build_coverage_enabled?
--#           %th Coverage
--#         %th
--#     - pipeline.statuses.stages.each do |stage|
--#       = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)
+.table-holder.pipeline-holder
+  %table.table.builds.pipeline
+    %thead
+      %tr
+        %th Status
+        %th Build ID
+        %th Name
+        %th
+        - if pipeline.project.build_coverage_enabled?
+          %th Coverage
+        %th
+    - pipeline.statuses.stages.each do |stage|
+      = render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)

From 94ca1e3edea8fa8e70e828cc4127e0cb8ec8a9d1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:39:01 -0500
Subject: [PATCH 07/64] Fix graph scrolling bug

---
 app/assets/stylesheets/pages/pipelines.scss   | 13 +++++++------
 app/views/projects/commit/_pipeline.html.haml |  5 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 49225d7d0d4..01bd131940a 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -232,20 +232,21 @@
 
 // Pipeline visualization
 
-.pipeline-visualization {
-  position: relative;
+.pipeline-graph {
   width: 100%;
   overflow: auto;
+  white-space: nowrap;
+}
+
+.pipeline-visualization {
+  position: relative;
+  min-width: 1220px;
 
   ul {
     padding: 0;
   }
 }
 
-.stage-column-list {
-  min-width: 1220px;
-}
-
 .stage-column {
   display: inline-block;
   vertical-align: top;
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 2edf660db71..0c006656d1d 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,5 +1,4 @@
-.row-content-block.white
-
+.row-content-block.build-content.middle-block.pipeline-graph
   .pipeline-visualization
     %ul.stage-column-list
       - pipeline.statuses.stages.each do |stage|
@@ -19,7 +18,7 @@
                       = ci_icon_for_status(status)
                     = build.name
 
-.row-content-block.build-content.middle-block
+.row-content-block.build-content.middle-block.pipeline-graph
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)

From ef767268645e8f60b7111eb9f6b6c3aa1b615661 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 16:15:09 -0500
Subject: [PATCH 08/64] Fix scss lint error

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

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 01bd131940a..ad256e2a728 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -314,8 +314,8 @@
       &::after {
         right: -20px;
         border-right: 2px solid $border-color;
-        border-radius: 0 0 50px 0;
-        -webkit-border-radius: 0 0 50px 0;
+        border-radius: 0 0 50px;
+        -webkit-border-radius: 0 0 50px;
       }
 
       // Left connecting curves

From bbb019094b4b5999f96407b20a3c9da469dcf985 Mon Sep 17 00:00:00 2001
From: Paco Guzman <pacoguzmanp@gmail.com>
Date: Thu, 11 Aug 2016 10:02:27 +0200
Subject: [PATCH 09/64] Fix merge request new view not changing code view
 rendering style

---
 CHANGELOG                                     |  1 +
 .../projects/merge_requests_controller.rb     |  2 ++
 .../merge_requests/create_new_mr_spec.rb      | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 56ab89abaf9..504e1421002 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -75,6 +75,7 @@ v 8.11.0 (unreleased)
   - Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
   - Add commit stats in commit api. !5517 (dixpac)
   - Add CI configuration button on project page
+  - Fix merge request new view not changing code view rendering style
   - Make error pages responsive (Takuya Noguchi)
   - Fix skip_repo parameter being ignored when destroying a namespace
   - Change requests_profiles resource constraint to catch virtually any file
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2cf6a2dd1b3..358c6ebe4ef 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -142,6 +142,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def new
+    apply_diff_view_cookie!
+
     build_merge_request
     @noteable = @merge_request
 
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index e296078bad8..a5a3f8b8239 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -8,10 +8,11 @@ feature 'Create New Merge Request', feature: true, js: true do
     project.team << [user, :master]
 
     login_as user
-    visit namespace_project_merge_requests_path(project.namespace, project)
   end
 
   it 'generates a diff for an orphaned branch' do
+    visit namespace_project_merge_requests_path(project.namespace, project)
+
     click_link 'New Merge Request'
 
     first('.js-source-branch').click
@@ -40,4 +41,20 @@ feature 'Create New Merge Request', feature: true, js: true do
       expect(page).not_to have_content private_project.to_reference
     end
   end
+
+  it 'allows to change the diff view' do
+    visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: 'fix' })
+
+    click_link 'Changes'
+
+    expect(page.find_link('Inline')[:class]).to match(/\bactive\b/)
+    expect(page.find_link('Side-by-side')[:class]).not_to match(/\bactive\b/)
+
+    click_link 'Side-by-side'
+
+    click_link 'Changes'
+
+    expect(page.find_link('Inline')[:class]).not_to match(/\bactive\b/)
+    expect(page.find_link('Side-by-side')[:class]).to match(/\bactive\b/)
+  end
 end

From 59bfa0809822c3dd257748197223809922ab5f80 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Fri, 12 Aug 2016 22:54:32 +0100
Subject: [PATCH 10/64] Send notification emails when users are newly mentioned
 in issue edits

---
 app/mailers/emails/issues.rb                  |  5 +++
 app/services/issuable_base_service.rb         |  3 +-
 app/services/issues/update_service.rb         |  7 +++-
 app/services/notification_service.rb          | 24 +++++++++++++-
 .../new_mention_in_issue_email.html.haml      |  9 +++++
 .../new_mention_in_issue_email.text.erb       |  7 ++++
 spec/services/issues/update_service_spec.rb   | 33 +++++++++++++++++++
 spec/services/notification_service_spec.rb    | 26 +++++++++++++++
 8 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 app/views/notify/new_mention_in_issue_email.html.haml
 create mode 100644 app/views/notify/new_mention_in_issue_email.text.erb

diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 6f54c42146c..d64e48f774b 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -6,6 +6,11 @@ module Emails
       mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id))
     end
 
+    def new_mention_in_issue_email(recipient_id, issue_id, updated_by_user_id)
+      setup_issue_mail(issue_id, recipient_id)
+      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
+    end
+
     def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
       setup_issue_mail(issue_id, recipient_id)
 
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index 2d96efe1042..b0ea7c905f8 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -104,11 +104,12 @@ class IssuableBaseService < BaseService
     change_subscription(issuable)
     filter_params
     old_labels = issuable.labels.to_a
+    old_mentioned_users = issuable.mentioned_users.to_a
 
     if params.present? && update_issuable(issuable, params)
       issuable.reset_events_cache
       handle_common_system_notes(issuable, old_labels: old_labels)
-      handle_changes(issuable, old_labels: old_labels)
+      handle_changes(issuable, old_labels: old_labels, old_mentioned_users: old_mentioned_users)
       issuable.create_new_cross_references!(current_user)
       execute_hooks(issuable, 'update')
     end
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index c7d406cc331..a2111b3806b 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -4,7 +4,7 @@ module Issues
       update(issue)
     end
 
-    def handle_changes(issue, old_labels: [])
+    def handle_changes(issue, old_labels: [], old_mentioned_users: [])
       if has_changes?(issue, old_labels: old_labels)
         todo_service.mark_pending_todos_as_done(issue, current_user)
       end
@@ -32,6 +32,11 @@ module Issues
       if added_labels.present?
         notification_service.relabeled_issue(issue, added_labels, current_user)
       end
+
+      added_mentions = issue.mentioned_users - old_mentioned_users
+      if added_mentions.present?
+        notification_service.new_mentions_in_issue(issue, added_mentions, current_user)
+      end
     end
 
     def reopen_service
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index ab6e51209ee..73df572514f 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -35,6 +35,20 @@ class NotificationService
     new_resource_email(issue, issue.project, :new_issue_email)
   end
 
+  # When issue text is updated, we should send an email to:
+  #
+  #  * newly mentioned project team members with notification level higher than Participating
+  #
+  def new_mentions_in_issue(issue, new_mentioned_users, current_user)
+    new_mentions_in_resource_email(
+      issue,
+      issue.project,
+      new_mentioned_users,
+      current_user,
+      :new_mention_in_issue_email
+    )
+  end
+
   # When we close an issue we should send an email to:
   #
   #  * issue author if their notification level is not Disabled
@@ -177,7 +191,7 @@ class NotificationService
 
     # build notify method like 'note_commit_email'
     notify_method = "note_#{note.noteable_type.underscore}_email".to_sym
-    
+
     recipients.each do |recipient|
       mailer.send(notify_method, recipient.id, note.id).deliver_later
     end
@@ -471,6 +485,14 @@ class NotificationService
     end
   end
 
+  def new_mentions_in_resource_email(target, project, new_mentioned_users, current_user, method)
+    recipients = build_recipients(target, project, current_user) & new_mentioned_users
+
+    recipients.each do |recipient|
+      mailer.send(method, recipient.id, target.id, current_user.id).deliver_later
+    end
+  end
+
   def close_resource_email(target, project, current_user, method)
     action = method == :merged_merge_request_email ? "merge" : "close"
     recipients = build_recipients(target, project, current_user, action: action)
diff --git a/app/views/notify/new_mention_in_issue_email.html.haml b/app/views/notify/new_mention_in_issue_email.html.haml
new file mode 100644
index 00000000000..f42b150c0d6
--- /dev/null
+++ b/app/views/notify/new_mention_in_issue_email.html.haml
@@ -0,0 +1,9 @@
+- if current_application_settings.email_author_in_body
+  %div
+    #{link_to @issue.author_name, user_url(@issue.author)} wrote:
+-if @issue.description
+  = markdown(@issue.description, pipeline: :email, author: @issue.author)
+
+- if @issue.assignee_id.present?
+  %p
+    Assignee: #{@issue.assignee_name}
diff --git a/app/views/notify/new_mention_in_issue_email.text.erb b/app/views/notify/new_mention_in_issue_email.text.erb
new file mode 100644
index 00000000000..457e94b4800
--- /dev/null
+++ b/app/views/notify/new_mention_in_issue_email.text.erb
@@ -0,0 +1,7 @@
+You have been mentioned in an issue.
+
+Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
+Author:    <%= @issue.author_name %>
+Assignee:  <%= @issue.assignee_name %>
+
+<%= @issue.description %>
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 088c3d48bf7..a5e375578ec 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -319,5 +319,38 @@ describe Issues::UpdateService, services: true do
         end
       end
     end
+
+    context 'updated user mentions' do
+      let(:user4) { create(:user) }
+      before do
+        project.team << [user4, :developer]
+      end
+
+      context "in title" do
+        before do
+          perform_enqueued_jobs { update_issue(title: user4.to_reference) }
+        end
+
+        it "should email only the newly-mentioned user" do
+          should_not_email(user)
+          should_not_email(user2)
+          should_not_email(user3)
+          should_email(user4)
+        end
+      end
+
+      context "in description" do
+        before do
+          perform_enqueued_jobs { update_issue(description: user4.to_reference) }
+        end
+
+        it "should email only the newly-mentioned user" do
+          should_not_email(user)
+          should_not_email(user2)
+          should_not_email(user3)
+          should_email(user4)
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 92b441c28ca..1935451ff12 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -399,6 +399,32 @@ describe NotificationService, services: true do
       end
     end
 
+    describe '#new_mentions_in_issue' do
+      def send_notifications(*new_mentions)
+        ActionMailer::Base.deliveries.clear
+        notification.new_mentions_in_issue(issue, new_mentions, @u_disabled)
+      end
+
+      it "should not email anyone unless they are newly mentioned" do
+        send_notifications()
+        expect(ActionMailer::Base.deliveries).to eq []
+      end
+
+      it "should email new mentions with a watch level higher than participant" do
+        send_notifications(@u_watcher, @u_participant_mentioned)
+
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+
+        expect(ActionMailer::Base.deliveries.count).to eq 2
+      end
+
+      it "should not email new mentions with a watch level equal to or less than participant" do
+        send_notifications(@u_participating, @u_mentioned)
+        expect(ActionMailer::Base.deliveries).to eq []
+      end
+    end
+
     describe '#reassigned_issue' do
       before do
         update_custom_notification(:reassign_issue, @u_guest_custom, project)

From e6f519c4a7efa6a865c7e8d2a62ed5c3db12b453 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 15 Aug 2016 12:05:08 +0100
Subject: [PATCH 11/64] Fix a 'missing keyword' error introduced in the last
 commit

---
 app/services/merge_requests/update_service.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 026a37997d4..0ad42b83fe2 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -16,7 +16,7 @@ module MergeRequests
       update(merge_request)
     end
 
-    def handle_changes(merge_request, old_labels: [])
+    def handle_changes(merge_request, old_labels: [], old_mentioned_users: [])
       if has_changes?(merge_request, old_labels: old_labels)
         todo_service.mark_pending_todos_as_done(merge_request, current_user)
       end
@@ -55,6 +55,8 @@ module MergeRequests
           current_user
         )
       end
+
+      # TODO(nick): use old_mentioned_users to send notify for changed mentions
     end
 
     def reopen_service

From b450aab8501076740cd7140b47488b9dfa5f58f9 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 15 Aug 2016 14:38:22 +0100
Subject: [PATCH 12/64] Remove superfluous parens on a method call

---
 spec/services/notification_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 1935451ff12..d61de6c15d1 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -406,7 +406,7 @@ describe NotificationService, services: true do
       end
 
       it "should not email anyone unless they are newly mentioned" do
-        send_notifications()
+        send_notifications
         expect(ActionMailer::Base.deliveries).to eq []
       end
 

From 6642ae4579d6ceed6b26014aee4a22adb39fc43c Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 15 Aug 2016 14:47:16 +0100
Subject: [PATCH 13/64] Add notifications for new user mentions in merge
 requests

---
 app/mailers/emails/merge_requests.rb          |  5 +++
 app/services/merge_requests/update_service.rb |  9 ++++-
 app/services/notification_service.rb          | 14 ++++++++
 ...w_mention_in_merge_request_email.html.haml | 12 +++++++
 ...ew_mention_in_merge_request_email.text.erb |  9 +++++
 .../merge_requests/update_service_spec.rb     | 33 +++++++++++++++++++
 spec/services/notification_service_spec.rb    | 26 +++++++++++++++
 7 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 app/views/notify/new_mention_in_merge_request_email.html.haml
 create mode 100644 app/views/notify/new_mention_in_merge_request_email.text.erb

diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 9dd11d20ea6..95810b0ac6e 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -6,6 +6,11 @@ module Emails
       mail_new_thread(@merge_request, merge_request_thread_options(@merge_request.author_id, recipient_id))
     end
 
+    def new_mention_in_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+      mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id))
+    end
+
     def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
       setup_merge_request_mail(merge_request_id, recipient_id)
 
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 0ad42b83fe2..30c5f24988c 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -56,7 +56,14 @@ module MergeRequests
         )
       end
 
-      # TODO(nick): use old_mentioned_users to send notify for changed mentions
+      added_mentions = merge_request.mentioned_users - old_mentioned_users
+      if added_mentions.present?
+        notification_service.new_mentions_in_merge_request(
+          merge_request,
+          added_mentions,
+          current_user
+        )
+      end
     end
 
     def reopen_service
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 73df572514f..01f95281170 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -89,6 +89,20 @@ class NotificationService
     new_resource_email(merge_request, merge_request.target_project, :new_merge_request_email)
   end
 
+  # When merge request text is updated, we should send an email to:
+  #
+  #  * newly mentioned project team members with notification level higher than Participating
+  #
+  def new_mentions_in_merge_request(merge_request, new_mentioned_users, current_user)
+    new_mentions_in_resource_email(
+      merge_request,
+      merge_request.target_project,
+      new_mentioned_users,
+      current_user,
+      :new_mention_in_merge_request_email
+    )
+  end
+
   # When we reassign a merge_request we should send an email to:
   #
   #  * merge_request old assignee if their notification level is not Disabled
diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml
new file mode 100644
index 00000000000..158404de396
--- /dev/null
+++ b/app/views/notify/new_mention_in_merge_request_email.html.haml
@@ -0,0 +1,12 @@
+- if current_application_settings.email_author_in_body
+  %div
+    #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote:
+%p.details
+  != merge_path_description(@merge_request, '&rarr;')
+
+- if @merge_request.assignee_id.present?
+  %p
+    Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
+
+-if @merge_request.description
+  = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author)
diff --git a/app/views/notify/new_mention_in_merge_request_email.text.erb b/app/views/notify/new_mention_in_merge_request_email.text.erb
new file mode 100644
index 00000000000..5bf0282e097
--- /dev/null
+++ b/app/views/notify/new_mention_in_merge_request_email.text.erb
@@ -0,0 +1,9 @@
+You have been mentioned in Merge Request <%= @merge_request.to_reference %>
+
+<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)) %>
+
+<%= merge_path_description(@merge_request, 'to') %>
+Author:    <%= @merge_request.author_name %>
+Assignee:  <%= @merge_request.assignee_name %>
+
+<%= @merge_request.description %>
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 283a336afd9..e26e925cd81 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -226,6 +226,39 @@ describe MergeRequests::UpdateService, services: true do
       end
     end
 
+    context 'updated user mentions' do
+      let(:user4) { create(:user) }
+      before do
+        project.team << [user4, :developer]
+      end
+
+      context "in title" do
+        before do
+          perform_enqueued_jobs { update_merge_request(title: user4.to_reference) }
+        end
+
+        it "should email only the newly-mentioned user" do
+          should_not_email(user)
+          should_not_email(user2)
+          should_not_email(user3)
+          should_email(user4)
+        end
+      end
+
+      context "in description" do
+        before do
+          perform_enqueued_jobs { update_merge_request(description: user4.to_reference) }
+        end
+
+        it "should email only the newly-mentioned user" do
+          should_not_email(user)
+          should_not_email(user2)
+          should_not_email(user3)
+          should_email(user4)
+        end
+      end
+    end
+
     context 'when MergeRequest has tasks' do
       before { update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" }) }
 
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index d61de6c15d1..2fa0d9f1ac2 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -789,6 +789,32 @@ describe NotificationService, services: true do
       end
     end
 
+    describe '#new_mentions_in_merge_request' do
+      def send_notifications(*new_mentions)
+        ActionMailer::Base.deliveries.clear
+        notification.new_mentions_in_merge_request(merge_request, new_mentions, @u_disabled)
+      end
+
+      it "should not email anyone unless they are newly mentioned" do
+        send_notifications
+        expect(ActionMailer::Base.deliveries).to eq []
+      end
+
+      it "should email new mentions with a watch level higher than participant" do
+        send_notifications(@u_watcher, @u_participant_mentioned)
+
+        should_email(@u_watcher)
+        should_email(@u_participant_mentioned)
+
+        expect(ActionMailer::Base.deliveries.count).to eq 2
+      end
+
+      it "should not email new mentions with a watch level equal to or less than participant" do
+        send_notifications(@u_participating, @u_mentioned)
+        expect(ActionMailer::Base.deliveries).to eq []
+      end
+    end
+
     describe '#reassigned_merge_request' do
       before do
         update_custom_notification(:reassign_merge_request, @u_guest_custom, project)

From 10af11f4fe71e46d4decd2ab428e9b2b38e2d463 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 15 Aug 2016 15:15:20 +0100
Subject: [PATCH 14/64] Allow people to subscribe to mentions in updated MRs
 and Issues

This slightly changes the semantics of the 'New Issue' and 'New MR' events to
include new mentions in edited Mentionables.

An alternative would be to introduce 'Issue updated' and 'MR updated' events,
but that would lead to questions about why those events were only available
to new mentions, and not existing mentions as well, so hold off for now.
---
 app/services/notification_service.rb       |  3 ++-
 doc/workflow/notifications.md              |  7 ++++++-
 spec/services/notification_service_spec.rb | 12 ++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 01f95281170..2291bc0f127 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -500,7 +500,8 @@ class NotificationService
   end
 
   def new_mentions_in_resource_email(target, project, new_mentioned_users, current_user, method)
-    recipients = build_recipients(target, project, current_user) & new_mentioned_users
+    recipients = build_recipients(target, project, current_user, action: "new")
+    recipients = recipients & new_mentioned_users
 
     recipients.each do |recipient|
       mailer.send(method, recipient.id, target.id, current_user.id).deliver_later
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index b4a9c2f3d3e..1b49a5c385f 100644
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -67,7 +67,7 @@ In all of the below cases, the notification will be sent to:
 - Participants:
   - the author and assignee of the issue/merge request
   - authors of comments on the issue/merge request
-  - anyone mentioned by `@username` in the issue/merge request description
+  - anyone mentioned by `@username` in the issue/merge request title or description
   - anyone mentioned by `@username` in any of the comments on the issue/merge request
 
     ...with notification level "Participating" or higher
@@ -89,6 +89,11 @@ In all of the below cases, the notification will be sent to:
 | Merge merge request    | |
 | New comment            | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
 
+
+In addition, if the title or description of an Issue or Merge Request is
+changed, notifications will be sent to any **new** mentions by `@username` as
+if they had been mentioned in the original text.
+
 You won't receive notifications for Issues, Merge Requests or Milestones
 created by yourself. You will only receive automatic notifications when
 somebody else comments or adds changes to the ones that you've created or
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 2fa0d9f1ac2..fbca28bbb17 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -411,12 +411,13 @@ describe NotificationService, services: true do
       end
 
       it "should email new mentions with a watch level higher than participant" do
-        send_notifications(@u_watcher, @u_participant_mentioned)
+        send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
 
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
+        should_email(@u_custom_global)
 
-        expect(ActionMailer::Base.deliveries.count).to eq 2
+        expect(ActionMailer::Base.deliveries.count).to eq 3
       end
 
       it "should not email new mentions with a watch level equal to or less than participant" do
@@ -726,6 +727,8 @@ describe NotificationService, services: true do
     before do
       build_team(merge_request.target_project)
       add_users_with_subscription(merge_request.target_project, merge_request)
+      update_custom_notification(:new_merge_request, @u_guest_custom, project)
+      update_custom_notification(:new_merge_request, @u_custom_global)
       ActionMailer::Base.deliveries.clear
     end
 
@@ -801,12 +804,13 @@ describe NotificationService, services: true do
       end
 
       it "should email new mentions with a watch level higher than participant" do
-        send_notifications(@u_watcher, @u_participant_mentioned)
+        send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
 
         should_email(@u_watcher)
         should_email(@u_participant_mentioned)
+        should_email(@u_custom_global)
 
-        expect(ActionMailer::Base.deliveries.count).to eq 2
+        expect(ActionMailer::Base.deliveries.count).to eq 3
       end
 
       it "should not email new mentions with a watch level equal to or less than participant" do

From 6bf7b627d11e4719f60b109a5379e7975411f611 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 15 Aug 2016 16:08:00 +0100
Subject: [PATCH 15/64] Add new mention notifications to changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 008c5c64284..836bb0b9fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.11.0 (unreleased)
   - Fix awardable button mutuality loading spinners (ClemMakesApps)
   - Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
   - Optimize maximum user access level lookup in loading of notes
+  - Send notification emails to users newly mentioned in issue and MR edits !5800
   - Add "No one can push" as an option for protected branches. !5081
   - Improve performance of AutolinkFilter#text_parse by using XPath
   - Add experimental Redis Sentinel support !1877

From 8a6e9b934e6e25023437ff8a2dd2271d67a12e40 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 16 Aug 2016 13:40:55 +0100
Subject: [PATCH 16/64] Address minor review comments for tests

---
 spec/services/issues/update_service_spec.rb   |  6 +++---
 .../merge_requests/update_service_spec.rb     |  8 ++++----
 spec/services/notification_service_spec.rb    | 20 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index a5e375578ec..60561cc64d0 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -331,7 +331,7 @@ describe Issues::UpdateService, services: true do
           perform_enqueued_jobs { update_issue(title: user4.to_reference) }
         end
 
-        it "should email only the newly-mentioned user" do
+        it 'emails only the newly-mentioned user' do
           should_not_email(user)
           should_not_email(user2)
           should_not_email(user3)
@@ -339,12 +339,12 @@ describe Issues::UpdateService, services: true do
         end
       end
 
-      context "in description" do
+      context 'in description' do
         before do
           perform_enqueued_jobs { update_issue(description: user4.to_reference) }
         end
 
-        it "should email only the newly-mentioned user" do
+        it 'emails only the newly-mentioned user' do
           should_not_email(user)
           should_not_email(user2)
           should_not_email(user3)
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index e26e925cd81..86d78f8c898 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -232,12 +232,12 @@ describe MergeRequests::UpdateService, services: true do
         project.team << [user4, :developer]
       end
 
-      context "in title" do
+      context 'in title' do
         before do
           perform_enqueued_jobs { update_merge_request(title: user4.to_reference) }
         end
 
-        it "should email only the newly-mentioned user" do
+        it 'emails only the newly-mentioned user' do
           should_not_email(user)
           should_not_email(user2)
           should_not_email(user3)
@@ -245,12 +245,12 @@ describe MergeRequests::UpdateService, services: true do
         end
       end
 
-      context "in description" do
+      context 'in description' do
         before do
           perform_enqueued_jobs { update_merge_request(description: user4.to_reference) }
         end
 
-        it "should email only the newly-mentioned user" do
+        it 'emails only the newly-mentioned user' do
           should_not_email(user)
           should_not_email(user2)
           should_not_email(user3)
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index fbca28bbb17..1cf644e1331 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -405,12 +405,12 @@ describe NotificationService, services: true do
         notification.new_mentions_in_issue(issue, new_mentions, @u_disabled)
       end
 
-      it "should not email anyone unless they are newly mentioned" do
+      it 'sends no emails when no new mentions are present' do
         send_notifications
-        expect(ActionMailer::Base.deliveries).to eq []
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
-      it "should email new mentions with a watch level higher than participant" do
+      it 'emails new mentions with a watch level higher than participant' do
         send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
 
         should_email(@u_watcher)
@@ -420,9 +420,9 @@ describe NotificationService, services: true do
         expect(ActionMailer::Base.deliveries.count).to eq 3
       end
 
-      it "should not email new mentions with a watch level equal to or less than participant" do
+      it 'does not email new mentions with a watch level equal to or less than participant' do
         send_notifications(@u_participating, @u_mentioned)
-        expect(ActionMailer::Base.deliveries).to eq []
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 
@@ -798,12 +798,12 @@ describe NotificationService, services: true do
         notification.new_mentions_in_merge_request(merge_request, new_mentions, @u_disabled)
       end
 
-      it "should not email anyone unless they are newly mentioned" do
+      it 'sends no emails when there are no new mentions' do
         send_notifications
-        expect(ActionMailer::Base.deliveries).to eq []
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
 
-      it "should email new mentions with a watch level higher than participant" do
+      it 'emails new mentions with a watch level higher than participant' do
         send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
 
         should_email(@u_watcher)
@@ -813,9 +813,9 @@ describe NotificationService, services: true do
         expect(ActionMailer::Base.deliveries.count).to eq 3
       end
 
-      it "should not email new mentions with a watch level equal to or less than participant" do
+      it 'does not email new mentions with a watch level equal to or less than participant' do
         send_notifications(@u_participating, @u_mentioned)
-        expect(ActionMailer::Base.deliveries).to eq []
+        expect(ActionMailer::Base.deliveries).to be_empty
       end
     end
 

From b62954db4c40df435363994ce4632632fde01455 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 16 Aug 2016 14:12:05 +0100
Subject: [PATCH 17/64] Include the reason for emailing in the new_mention
 emails

---
 app/views/notify/new_mention_in_issue_email.html.haml         | 3 +++
 app/views/notify/new_mention_in_merge_request_email.html.haml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/views/notify/new_mention_in_issue_email.html.haml b/app/views/notify/new_mention_in_issue_email.html.haml
index f42b150c0d6..4f3d36bd9ca 100644
--- a/app/views/notify/new_mention_in_issue_email.html.haml
+++ b/app/views/notify/new_mention_in_issue_email.html.haml
@@ -1,3 +1,6 @@
+%p
+  You have been mentioned in an issue.
+
 - if current_application_settings.email_author_in_body
   %div
     #{link_to @issue.author_name, user_url(@issue.author)} wrote:
diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml
index 158404de396..32aedb9e6b9 100644
--- a/app/views/notify/new_mention_in_merge_request_email.html.haml
+++ b/app/views/notify/new_mention_in_merge_request_email.html.haml
@@ -1,3 +1,6 @@
+%p
+  You have been mentioned in Merge Request #{@merge_request.to_reference}
+
 - if current_application_settings.email_author_in_body
   %div
     #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote:

From 0e9c4a902d7985d917fac1f833c9544133f83a95 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 16 Aug 2016 17:08:43 +0100
Subject: [PATCH 18/64] DRY up the added update service specs, add two email
 helpers

---
 spec/services/issues/update_service_spec.rb   | 35 +++----------------
 .../merge_requests/update_service_spec.rb     | 34 ++----------------
 spec/support/email_helpers.rb                 | 10 ++++++
 .../updating_mentions_shared_examples.rb      | 32 +++++++++++++++++
 4 files changed, 49 insertions(+), 62 deletions(-)
 create mode 100644 spec/support/updating_mentions_shared_examples.rb

diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 60561cc64d0..d36937b6c59 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -320,37 +320,10 @@ describe Issues::UpdateService, services: true do
       end
     end
 
-    context 'updated user mentions' do
-      let(:user4) { create(:user) }
-      before do
-        project.team << [user4, :developer]
-      end
-
-      context "in title" do
-        before do
-          perform_enqueued_jobs { update_issue(title: user4.to_reference) }
-        end
-
-        it 'emails only the newly-mentioned user' do
-          should_not_email(user)
-          should_not_email(user2)
-          should_not_email(user3)
-          should_email(user4)
-        end
-      end
-
-      context 'in description' do
-        before do
-          perform_enqueued_jobs { update_issue(description: user4.to_reference) }
-        end
-
-        it 'emails only the newly-mentioned user' do
-          should_not_email(user)
-          should_not_email(user2)
-          should_not_email(user3)
-          should_email(user4)
-        end
-      end
+    context 'updating mentions' do
+      let(:mentionable) { issue }
+      include_examples 'updating mentions', Issues::UpdateService
     end
+
   end
 end
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 86d78f8c898..6dfeb581975 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -226,37 +226,9 @@ describe MergeRequests::UpdateService, services: true do
       end
     end
 
-    context 'updated user mentions' do
-      let(:user4) { create(:user) }
-      before do
-        project.team << [user4, :developer]
-      end
-
-      context 'in title' do
-        before do
-          perform_enqueued_jobs { update_merge_request(title: user4.to_reference) }
-        end
-
-        it 'emails only the newly-mentioned user' do
-          should_not_email(user)
-          should_not_email(user2)
-          should_not_email(user3)
-          should_email(user4)
-        end
-      end
-
-      context 'in description' do
-        before do
-          perform_enqueued_jobs { update_merge_request(description: user4.to_reference) }
-        end
-
-        it 'emails only the newly-mentioned user' do
-          should_not_email(user)
-          should_not_email(user2)
-          should_not_email(user3)
-          should_email(user4)
-        end
-      end
+    context 'updating mentions' do
+      let(:mentionable) { merge_request }
+      include_examples 'updating mentions', MergeRequests::UpdateService
     end
 
     context 'when MergeRequest has tasks' do
diff --git a/spec/support/email_helpers.rb b/spec/support/email_helpers.rb
index a85ab22ce36..0bfc4685532 100644
--- a/spec/support/email_helpers.rb
+++ b/spec/support/email_helpers.rb
@@ -3,6 +3,16 @@ module EmailHelpers
     ActionMailer::Base.deliveries.map(&:to).flatten.count(user.email) == 1
   end
 
+  def reset_delivered_emails!
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def should_only_email(*users)
+    users.each {|user| should_email(user) }
+    recipients = ActionMailer::Base.deliveries.flat_map(&:to)
+    expect(recipients.count).to eq(users.count)
+  end
+
   def should_email(user)
     expect(sent_to_user?(user)).to be_truthy
   end
diff --git a/spec/support/updating_mentions_shared_examples.rb b/spec/support/updating_mentions_shared_examples.rb
new file mode 100644
index 00000000000..e0c59a5c280
--- /dev/null
+++ b/spec/support/updating_mentions_shared_examples.rb
@@ -0,0 +1,32 @@
+RSpec.shared_examples 'updating mentions' do |service_class|
+  let(:mentioned_user) { create(:user) }
+  let(:service_class) { service_class }
+
+  before { project.team << [mentioned_user, :developer] }
+
+  def update_mentionable(opts)
+    reset_delivered_emails!
+
+    perform_enqueued_jobs do
+      service_class.new(project, user, opts).execute(mentionable)
+    end
+
+    mentionable.reload
+  end
+
+  context 'in title' do
+    before { update_mentionable(title: mentioned_user.to_reference) }
+
+    it 'emails only the newly-mentioned user' do
+      should_only_email(mentioned_user)
+    end
+  end
+
+  context 'in description' do
+    before { update_mentionable(description: mentioned_user.to_reference) }
+
+    it 'emails only the newly-mentioned user' do
+      should_only_email(mentioned_user)
+    end
+  end
+end

From ffd7311d03485f146cef4b915d1f7d71f70d30bb Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 16 Aug 2016 17:40:04 +0100
Subject: [PATCH 19/64] DRY up the additions to notification_service_spec.rb

---
 spec/services/notification_service_spec.rb | 74 ++++++++--------------
 1 file changed, 28 insertions(+), 46 deletions(-)

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 1cf644e1331..62c97e09288 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -9,6 +9,28 @@ describe NotificationService, services: true do
     end
   end
 
+  shared_examples 'notifications for new mentions' do
+    def send_notifications(*new_mentions)
+      reset_delivered_emails!
+      notification.send(notification_method, mentionable, new_mentions, @u_disabled)
+    end
+
+    it 'sends no emails when no new mentions are present' do
+      send_notifications
+      expect(ActionMailer::Base.deliveries).to be_empty
+    end
+
+    it 'emails new mentions with a watch level higher than participant' do
+      send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
+      should_only_email(@u_watcher, @u_participant_mentioned, @u_custom_global)
+    end
+
+    it 'does not email new mentions with a watch level equal to or less than participant' do
+      send_notifications(@u_participating, @u_mentioned)
+      expect(ActionMailer::Base.deliveries).to be_empty
+    end
+  end
+
   describe 'Keys' do
     describe '#new_key' do
       let!(:key) { create(:personal_key) }
@@ -400,30 +422,10 @@ describe NotificationService, services: true do
     end
 
     describe '#new_mentions_in_issue' do
-      def send_notifications(*new_mentions)
-        ActionMailer::Base.deliveries.clear
-        notification.new_mentions_in_issue(issue, new_mentions, @u_disabled)
-      end
+      let(:notification_method) { :new_mentions_in_issue }
+      let(:mentionable) { issue }
 
-      it 'sends no emails when no new mentions are present' do
-        send_notifications
-        expect(ActionMailer::Base.deliveries).to be_empty
-      end
-
-      it 'emails new mentions with a watch level higher than participant' do
-        send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
-
-        should_email(@u_watcher)
-        should_email(@u_participant_mentioned)
-        should_email(@u_custom_global)
-
-        expect(ActionMailer::Base.deliveries.count).to eq 3
-      end
-
-      it 'does not email new mentions with a watch level equal to or less than participant' do
-        send_notifications(@u_participating, @u_mentioned)
-        expect(ActionMailer::Base.deliveries).to be_empty
-      end
+      include_examples 'notifications for new mentions'
     end
 
     describe '#reassigned_issue' do
@@ -793,30 +795,10 @@ describe NotificationService, services: true do
     end
 
     describe '#new_mentions_in_merge_request' do
-      def send_notifications(*new_mentions)
-        ActionMailer::Base.deliveries.clear
-        notification.new_mentions_in_merge_request(merge_request, new_mentions, @u_disabled)
-      end
+      let(:notification_method) { :new_mentions_in_merge_request }
+      let(:mentionable) { merge_request }
 
-      it 'sends no emails when there are no new mentions' do
-        send_notifications
-        expect(ActionMailer::Base.deliveries).to be_empty
-      end
-
-      it 'emails new mentions with a watch level higher than participant' do
-        send_notifications(@u_watcher, @u_participant_mentioned, @u_custom_global)
-
-        should_email(@u_watcher)
-        should_email(@u_participant_mentioned)
-        should_email(@u_custom_global)
-
-        expect(ActionMailer::Base.deliveries.count).to eq 3
-      end
-
-      it 'does not email new mentions with a watch level equal to or less than participant' do
-        send_notifications(@u_participating, @u_mentioned)
-        expect(ActionMailer::Base.deliveries).to be_empty
-      end
+      include_examples 'notifications for new mentions'
     end
 
     describe '#reassigned_merge_request' do

From bdbc3d355a86bf03e7a7a00fc2d867fa043c0bdd Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 8 Aug 2016 16:26:33 -0500
Subject: [PATCH 20/64] Add build data to top of pipeline page

---
 app/assets/stylesheets/pages/pipelines.scss   |  6 ++++++
 app/views/projects/commit/_pipeline.html.haml | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 21919fe4d73..5bc8c3a7e6c 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -229,3 +229,9 @@
     box-shadow: none;
   }
 }
+
+// Pipeline visualization
+.stage-column {
+  display: inline-block;
+  vertical-align: top;
+}
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 640abdb993f..2452326fc04 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,4 +1,16 @@
 .row-content-block.build-content.middle-block
+  .pipeline-visualization
+    - pipeline.statuses.stages.each do |stage|
+      - statuses = pipeline.statuses.where(stage: stage)
+      .stage-column
+        %strong
+          %a{name: stage}
+          - if stage
+            = stage.titleize
+        - statuses.each do |status|
+          %div= status.name
+
+
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)

From dfe94da0fb4da1a84bfd6324f7b2291067582af0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 8 Aug 2016 17:42:28 -0500
Subject: [PATCH 21/64] Connect top level tests to each other

---
 app/assets/stylesheets/pages/pipelines.scss   | 50 +++++++++++++++++++
 app/views/projects/commit/_pipeline.html.haml | 16 ++++--
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 5bc8c3a7e6c..e79c7e59720 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -231,7 +231,57 @@
 }
 
 // Pipeline visualization
+
+.pipeline-visualization {
+  position: relative;
+}
+
 .stage-column {
   display: inline-block;
   vertical-align: top;
+  margin-right: 40px;
+
+  .stage-name {
+    margin-bottom: 15px;
+    font-weight: bold;
+  }
+
+  .builds-container {
+
+  }
+
+  .build {
+    border: 1px solid $border-color;
+    position: relative;
+    padding: 6px 10px;
+    border-radius: 30px;
+    width: 150px;
+    // TODO truncate text within .build div; not on build div itself
+    // white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    margin-bottom: 10px;
+
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 5px;
+    }
+
+    &:first-child {
+      &::after, &::before {
+        content: '';
+        position: absolute;
+        top: 50%;
+        right: -44px;
+        border-top: 1px solid $border-color;
+        width: 44px;
+        height: 1px;
+      }
+    }
+    &:first-child::before, &:last-child::after{
+      border: 0 none;
+    }
+
+  }
 }
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 2452326fc04..b993ad5ce50 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,16 +1,22 @@
-.row-content-block.build-content.middle-block
+.row-content-block.white
+
   .pipeline-visualization
     - pipeline.statuses.stages.each do |stage|
       - statuses = pipeline.statuses.where(stage: stage)
+      - status = statuses.latest.status
       .stage-column
-        %strong
+        .stage-name
           %a{name: stage}
           - if stage
             = stage.titleize
-        - statuses.each do |status|
-          %div= status.name
-
+        .builds-container
+          - statuses.each do |build|
+            .build
+              %span{class: "ci-status-link ci-status-icon-#{status}"}
+                = ci_icon_for_status(status)
+              = build.name
 
+.row-content-block.build-content.middle-block
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)

From ca9bba29fea30fd4cdb223273fca007c9abf12b0 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 14:26:25 -0500
Subject: [PATCH 22/64] Connect all builds in visual pipeline

---
 app/assets/stylesheets/pages/pipelines.scss | 81 +++++++++++++++++++--
 1 file changed, 73 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e79c7e59720..fa422f4f3c5 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -234,6 +234,10 @@
 
 .pipeline-visualization {
   position: relative;
+
+  ul {
+    padding: 0;
+  }
 }
 
 .stage-column {
@@ -241,15 +245,15 @@
   vertical-align: top;
   margin-right: 40px;
 
+  li {
+    list-style: none;
+  }
+
   .stage-name {
     margin-bottom: 15px;
     font-weight: bold;
   }
 
-  .builds-container {
-
-  }
-
   .build {
     border: 1px solid $border-color;
     position: relative;
@@ -268,20 +272,81 @@
       margin-right: 5px;
     }
 
+    // Connect first build in each stage with right horizontal line
     &:first-child {
-      &::after, &::before {
+      &::after {
         content: '';
         position: absolute;
         top: 50%;
         right: -44px;
-        border-top: 1px solid $border-color;
+        border-top: 2px solid $border-color;
         width: 44px;
         height: 1px;
       }
     }
-    &:first-child::before, &:last-child::after{
-      border: 0 none;
+
+    // Connect each build (except for first) with curved lines
+    &:not(:first-child) {
+      &::after, &::before {
+        content: '';
+        top: -47px;
+        position: absolute;
+        border-bottom: 2px solid $border-color;
+        width: 20px;
+        height: 65px;
+      }
+
+      // Right connecting curves
+      &::after {
+        right: -21px;
+        border-right: 2px solid $border-color;
+        border-radius: 0 0 50px 0;
+        -webkit-border-radius: 0 0 50px 0;
+      }
+
+      // Left connecting curves
+      &::before {
+        left: -21px;
+        border-left: 2px solid $border-color;
+        border-radius: 0 0 0 50px;
+        -webkit-border-radius: 0 0 0 50px;
+      }
     }
 
+    // Connect second build to first build with smaller curved line
+    &:nth-child(2) {
+      &::after, &::before {
+        height: 40px;
+        top: -26px;
+      }
+    }
+  }
+
+  &:last-child {
+    .build {
+      // Remove right connecting horizontal line from first build in last stage
+      &:first-child {
+        &::after, &::before {
+          border: none;
+        }
+      }
+      // Remove right curved connectors from all builds in last stage
+      &:not(:first-child) {
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+
+  &:first-child {
+    .build {
+      // Remove left curved connectors from all builds in first stage
+      &:not(:first-child) {
+        &::before {
+          border: none;
+        }
+      }
+    }
   }
 }

From 1b583583a9a93c2ba8e00982c33fca904e219fca Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:00:09 -0500
Subject: [PATCH 23/64] Add min width and horizontally scroll pipeline graph
 when overflow

---
 app/assets/stylesheets/pages/pipelines.scss | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index fa422f4f3c5..a9ffda00278 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -234,16 +234,22 @@
 
 .pipeline-visualization {
   position: relative;
+  width: 100%;
+  overflow: auto;
 
   ul {
     padding: 0;
   }
 }
 
+.stage-column-list {
+  min-width: 1220px;
+}
+
 .stage-column {
   display: inline-block;
   vertical-align: top;
-  margin-right: 40px;
+  margin-right: 50px;
 
   li {
     list-style: none;
@@ -278,9 +284,9 @@
         content: '';
         position: absolute;
         top: 50%;
-        right: -44px;
+        right: -54px;
         border-top: 2px solid $border-color;
-        width: 44px;
+        width: 54px;
         height: 1px;
       }
     }
@@ -298,7 +304,7 @@
 
       // Right connecting curves
       &::after {
-        right: -21px;
+        right: -20px;
         border-right: 2px solid $border-color;
         border-radius: 0 0 50px 0;
         -webkit-border-radius: 0 0 50px 0;
@@ -306,7 +312,7 @@
 
       // Left connecting curves
       &::before {
-        left: -21px;
+        left: -20px;
         border-left: 2px solid $border-color;
         border-radius: 0 0 0 50px;
         -webkit-border-radius: 0 0 0 50px;
@@ -316,9 +322,14 @@
     // Connect second build to first build with smaller curved line
     &:nth-child(2) {
       &::after, &::before {
-        height: 40px;
+        height: 45px;
         top: -26px;
       }
+      &::after {
+        // border-left: 2px solid $border-color;
+        border-top-right-radius: -50px;
+        -webkit-border-top-right-radius: -50px;
+      }
     }
   }
 

From d7b3b15f60e25e1b11b6fcc22f96c63bffa137a8 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:08:04 -0500
Subject: [PATCH 24/64] Truncate build and stage names

---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/pages/pipelines.scss   | 15 ++++++---
 app/views/projects/commit/_pipeline.html.haml | 31 ++++++++++---------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aececed9add..a3e824dcac6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -108,6 +108,7 @@ v 8.11.0 (unreleased)
   - Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
   - Add unfold links for Side-by-Side view. !5415 (Tim Masliuchenko)
   - Adds support for pending invitation project members importing projects
+  - Add pipeline visualization/graph on pipeline page
   - Update devise initializer to turn on changed password notification emails. !5648 (tombell)
   - Avoid to show the original password field when password is automatically set. !5712 (duduribeiro)
   - Fix importing GitLab projects with an invalid MR source project
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index a9ffda00278..49225d7d0d4 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -258,6 +258,10 @@
   .stage-name {
     margin-bottom: 15px;
     font-weight: bold;
+    width: 150px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .build {
@@ -266,12 +270,15 @@
     padding: 6px 10px;
     border-radius: 30px;
     width: 150px;
-    // TODO truncate text within .build div; not on build div itself
-    // white-space: nowrap;
-    // overflow: hidden;
-    // text-overflow: ellipsis;
     margin-bottom: 10px;
 
+    .build-content {
+      width: 130px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
     svg {
       position: relative;
       top: 2px;
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index b993ad5ce50..4dacff8f6eb 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,20 +1,23 @@
 .row-content-block.white
 
   .pipeline-visualization
-    - pipeline.statuses.stages.each do |stage|
-      - statuses = pipeline.statuses.where(stage: stage)
-      - status = statuses.latest.status
-      .stage-column
-        .stage-name
-          %a{name: stage}
-          - if stage
-            = stage.titleize
-        .builds-container
-          - statuses.each do |build|
-            .build
-              %span{class: "ci-status-link ci-status-icon-#{status}"}
-                = ci_icon_for_status(status)
-              = build.name
+    %ul.stage-column-list
+      - pipeline.statuses.stages.each do |stage|
+        - statuses = pipeline.statuses.where(stage: stage)
+        - status = statuses.latest.status
+        %li.stage-column
+          .stage-name
+            %a{name: stage}
+            - if stage
+              = stage.titleize
+          .builds-container
+            %ul
+              - statuses.each do |build|
+                %li.build
+                  .build-content
+                    %span{class: "ci-status-link ci-status-icon-#{status}"}
+                      = ci_icon_for_status(status)
+                    = build.name
 
 .row-content-block.build-content.middle-block
   .pull-right

From e573cdfb91308759923fbd0aacb12f801dfb561f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 15:39:01 -0500
Subject: [PATCH 25/64] Fix graph scrolling bug

---
 app/assets/stylesheets/pages/pipelines.scss   | 13 +++++++------
 app/views/projects/commit/_pipeline.html.haml |  5 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 49225d7d0d4..01bd131940a 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -232,20 +232,21 @@
 
 // Pipeline visualization
 
-.pipeline-visualization {
-  position: relative;
+.pipeline-graph {
   width: 100%;
   overflow: auto;
+  white-space: nowrap;
+}
+
+.pipeline-visualization {
+  position: relative;
+  min-width: 1220px;
 
   ul {
     padding: 0;
   }
 }
 
-.stage-column-list {
-  min-width: 1220px;
-}
-
 .stage-column {
   display: inline-block;
   vertical-align: top;
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 4dacff8f6eb..e2187673da7 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,5 +1,4 @@
-.row-content-block.white
-
+.row-content-block.build-content.middle-block.pipeline-graph
   .pipeline-visualization
     %ul.stage-column-list
       - pipeline.statuses.stages.each do |stage|
@@ -19,7 +18,7 @@
                       = ci_icon_for_status(status)
                     = build.name
 
-.row-content-block.build-content.middle-block
+.row-content-block.build-content.middle-block.pipeline-graph
   .pull-right
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)

From 0ff0acc89c80b9ef4a473e4be1549ef4a21a8b8a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 16:15:09 -0500
Subject: [PATCH 26/64] Fix scss lint error

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

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 01bd131940a..ad256e2a728 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -314,8 +314,8 @@
       &::after {
         right: -20px;
         border-right: 2px solid $border-color;
-        border-radius: 0 0 50px 0;
-        -webkit-border-radius: 0 0 50px 0;
+        border-radius: 0 0 50px;
+        -webkit-border-radius: 0 0 50px;
       }
 
       // Left connecting curves

From a3ef844c0a59dd94bf8b8a962a92b6610758d5af Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Sun, 24 Jul 2016 01:13:13 +0200
Subject: [PATCH 27/64] fix star button icon alignment

---
 app/views/projects/buttons/_star.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml
index 71cf5582a4c..311583037e5 100644
--- a/app/views/projects/buttons/_star.html.haml
+++ b/app/views/projects/buttons/_star.html.haml
@@ -1,10 +1,10 @@
 - if current_user
   = link_to toggle_star_namespace_project_path(@project.namespace, @project), { class: 'btn star-btn toggle-star has-tooltip', method: :post, remote: true, title: current_user.starred?(@project) ? 'Unstar project' : 'Star project' } do
     - if current_user.starred?(@project)
-      = icon('star fw')
+      = icon('star')
       %span.starred Unstar
     - else
-      = icon('star-o fw')
+      = icon('star-o')
       %span Star
   %div.count-with-arrow
     %span.arrow
@@ -13,7 +13,7 @@
 
 - else
   = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: 'You must sign in to star a project' do
-    = icon('star fw')
+    = icon('star')
     Star
   %div.count-with-arrow
     %span.arrow

From c4141bac76d4d869054a2c2979af7cf59ed9411f Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Sun, 24 Jul 2016 01:14:44 +0200
Subject: [PATCH 28/64] fix fork button icon alignment

---
 CHANGELOG                             | 1 +
 app/views/shared/icons/_icon_fork.svg | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2a7109b3c2b..4289aded1ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,7 @@ v 8.11.0 (unreleased)
   - Remove unused images (ClemMakesApps)
   - Get issue and merge request description templates from repositories
   - Add hover state to todos !5361 (winniehell)
+  - Fix icon alignment of star and fork buttons !5451 (winniehell)
   - Limit git rev-list output count to one in forced push check
   - Show deployment status on merge requests with external URLs
   - Clean up unused routes (Josef Strzibny)
diff --git a/app/views/shared/icons/_icon_fork.svg b/app/views/shared/icons/_icon_fork.svg
index a21f8f3a951..fc970e4ce50 100644
--- a/app/views/shared/icons/_icon_fork.svg
+++ b/app/views/shared/icons/_icon_fork.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+<svg xmlns="http://www.w3.org/2000/svg" width="30" height="40" viewBox="5 0 30 40">
   <path fill="#7E7E7E" fill-rule="evenodd" d="M22,29.5351288 L22,22.7193602 C26.1888699,21.5098039 29.3985457,16.802989 29.3985457,16.802989 C29.740988,16.3567547 30,15.5559546 30,15.0081969 L30,10.4648712 C31.1956027,9.77325238 32,8.48056471 32,7 C32,4.790861 30.209139,3 28,3 C25.790861,3 24,4.790861 24,7 C24,8.48056471 24.8043973,9.77325238 26,10.4648712 L26,14.7083871 C26,14.8784435 25.9055559,15.0987329 25.7890533,15.2104147 C25.7890533,15.2104147 24.5373893,16.4126202 23.9488702,16.9515733 C22.5015398,18.2770075 21.1191354,19 20.090554,19 C19.0477772,19 17.6172728,18.2608988 16.1128852,16.9142923 C15.5030182,16.3683886 14.3672121,15.3403307 14.3672121,15.3403307 C14.1659605,15.1583364 14.0000086,14.7846305 14.0000192,14.5088473 C14.0000192,14.5088473 14.0000932,12.7539451 14.0001308,10.4647956 C15.1956614,9.77315812 16,8.48051074 16,7 C16,4.790861 14.209139,3 12,3 C9.790861,3 8,4.790861 8,7 C8,8.48056471 8.80439726,9.77325238 10,10.4648712 L10,15.0081969 C10,15.5446944 10.2736352,16.3534183 10.6111812,16.7893819 C10.6111812,16.7893819 13.8599776,21.3779363 18,22.6668724 L18,29.5351288 C16.8043973,30.2267476 16,31.5194353 16,33 C16,35.209139 17.790861,37 20,37 C22.209139,37 24,35.209139 24,33 C24,31.5194353 23.1956027,30.2267476 22,29.5351288 Z M14,7 C14,5.8954305 13.1045695,5 12,5 C10.8954305,5 10,5.8954305 10,7 C10,8.1045695 10.8954305,9 12,9 C13.1045695,9 14,8.1045695 14,7 Z M30,7 C30,5.8954305 29.1045695,5 28,5 C26.8954305,5 26,5.8954305 26,7 C26,8.1045695 26.8954305,9 28,9 C29.1045695,9 30,8.1045695 30,7 Z M22,33 C22,31.8954305 21.1045695,31 20,31 C18.8954305,31 18,31.8954305 18,33 C18,34.1045695 18.8954305,35 20,35 C21.1045695,35 22,34.1045695 22,33 Z"/>
 </svg>

From 9810c71d9b61983840df61aa662041cffb9c9541 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Fri, 5 Aug 2016 00:37:32 +0200
Subject: [PATCH 29/64] add space between icon and button text

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

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index f1fe1697d30..6c3786b49bb 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -204,6 +204,10 @@
     position: relative;
     top: 2px;
   }
+
+  svg, .fa {
+    margin-right: 3px;
+  }
 }
 
 .btn-lg {

From 8d5dc4fa6b0f01dbe46e89105aed5072c60cc102 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 16 Aug 2016 19:42:05 -0500
Subject: [PATCH 30/64] Add toggle button to hide graph; set max-height

---
 app/assets/javascripts/pipeline.js.es6        | 10 ++++
 app/assets/stylesheets/pages/pipelines.scss   | 43 ++++++++++++++---
 app/views/projects/commit/_pipeline.html.haml | 46 ++++++++++---------
 3 files changed, 71 insertions(+), 28 deletions(-)
 create mode 100644 app/assets/javascripts/pipeline.js.es6

diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipeline.js.es6
new file mode 100644
index 00000000000..7054199ac89
--- /dev/null
+++ b/app/assets/javascripts/pipeline.js.es6
@@ -0,0 +1,10 @@
+function toggleGraph() {
+  $('.pipeline-graph, .toggle-pipeline-btn').toggleClass('graph-collapsed');
+
+  const $btnText = $('.toggle-pipeline-btn .btn-text');
+  const graphCollapsed = $('.pipeline-graph').hasClass('graph-collapsed');
+
+  graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
+}
+
+$(document).on('click', '.toggle-pipeline-btn', toggleGraph);
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ad256e2a728..f35aca193e9 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -232,10 +232,35 @@
 
 // Pipeline visualization
 
+.toggle-pipeline-btn {
+  background-color: $gray-dark;
+
+  .caret {
+    border-top: none;
+    border-bottom: 4px solid;
+  }
+
+  &.graph-collapsed {
+    background-color: $white-light;
+
+    .caret {
+      border-bottom: none;
+      border-top: 4px solid;
+    }
+  }
+}
+
 .pipeline-graph {
   width: 100%;
   overflow: auto;
   white-space: nowrap;
+  max-height: 500px;
+  transition: max-height 0.3s, padding 0.3s;
+
+  &.graph-collapsed {
+    max-height: 0;
+    padding: 0 16px;
+  }
 }
 
 .pipeline-visualization {
@@ -315,7 +340,6 @@
         right: -20px;
         border-right: 2px solid $border-color;
         border-radius: 0 0 50px;
-        -webkit-border-radius: 0 0 50px;
       }
 
       // Left connecting curves
@@ -323,7 +347,6 @@
         left: -20px;
         border-left: 2px solid $border-color;
         border-radius: 0 0 0 50px;
-        -webkit-border-radius: 0 0 0 50px;
       }
     }
 
@@ -333,11 +356,6 @@
         height: 45px;
         top: -26px;
       }
-      &::after {
-        // border-left: 2px solid $border-color;
-        border-top-right-radius: -50px;
-        -webkit-border-top-right-radius: -50px;
-      }
     }
   }
 
@@ -369,3 +387,14 @@
     }
   }
 }
+
+.pipeline-actions {
+  border-bottom: none;
+}
+
+.toggle-pipeline-btn {
+
+  .fa {
+    color: $dropdown-header-color;
+  }
+}
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index e2187673da7..eb80aadd524 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,25 +1,9 @@
-.row-content-block.build-content.middle-block.pipeline-graph
-  .pipeline-visualization
-    %ul.stage-column-list
-      - pipeline.statuses.stages.each do |stage|
-        - statuses = pipeline.statuses.where(stage: stage)
-        - status = statuses.latest.status
-        %li.stage-column
-          .stage-name
-            %a{name: stage}
-            - if stage
-              = stage.titleize
-          .builds-container
-            %ul
-              - statuses.each do |build|
-                %li.build
-                  .build-content
-                    %span{class: "ci-status-link ci-status-icon-#{status}"}
-                      = ci_icon_for_status(status)
-                    = build.name
-
-.row-content-block.build-content.middle-block.pipeline-graph
+.row-content-block.build-content.middle-block.pipeline-actions
   .pull-right
+    .btn.btn-grouped.btn-white.toggle-pipeline-btn
+      %span.btn-text Hide
+      %span pipeline graph
+      %span.caret
     - if can?(current_user, :update_pipeline, pipeline.project)
       - if pipeline.builds.latest.failed.any?(&:retryable?)
         = link_to "Retry failed", retry_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: 'btn btn-grouped btn-primary', method: :post
@@ -43,6 +27,26 @@
         in
         = time_interval_in_words pipeline.duration
 
+.row-content-block.build-content.middle-block.pipeline-graph
+  .pipeline-visualization
+    %ul.stage-column-list
+      - pipeline.statuses.stages.each do |stage|
+        - statuses = pipeline.statuses.where(stage: stage)
+        - status = statuses.latest.status
+        %li.stage-column
+          .stage-name
+            %a{name: stage}
+            - if stage
+              = stage.titleize
+          .builds-container
+            %ul
+              - statuses.each do |build|
+                %li.build
+                  .build-content
+                    %span{class: "ci-status-link ci-status-icon-#{status}"}
+                      = ci_icon_for_status(status)
+                    = build.name
+
 - if pipeline.yaml_errors.present?
   .bs-callout.bs-callout-danger
     %h4 Found errors in your .gitlab-ci.yml:

From b631985ad7a8a85d1350425e6d1cf1cb90c93b5f Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 16 Aug 2016 19:52:34 -0500
Subject: [PATCH 31/64] Add links to pipeline graph

---
 app/assets/stylesheets/pages/pipelines.scss   | 4 ++++
 app/views/projects/commit/_pipeline.html.haml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index f35aca193e9..ce9e3e95d3d 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -303,6 +303,10 @@
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
+
+      a {
+        color: $layout-link-gray;
+      }
     }
 
     svg {
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index eb80aadd524..44250860020 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -45,7 +45,7 @@
                   .build-content
                     %span{class: "ci-status-link ci-status-icon-#{status}"}
                       = ci_icon_for_status(status)
-                    = build.name
+                    = link_to build.name, namespace_project_build_url(build.project.namespace, build.project, build)
 
 - if pipeline.yaml_errors.present?
   .bs-callout.bs-callout-danger

From 2797cfbf604be698f5b0aaf7178a9aad78d2805b Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 17 Aug 2016 09:46:13 +0100
Subject: [PATCH 32/64] Fix a rubocop violation

---
 spec/services/issues/update_service_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index d36937b6c59..0313f424463 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -324,6 +324,5 @@ describe Issues::UpdateService, services: true do
       let(:mentionable) { issue }
       include_examples 'updating mentions', Issues::UpdateService
     end
-
   end
 end

From fee7992c08c434940f0722886dc96f249a8e7fbf Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 17 Aug 2016 09:46:34 +0100
Subject: [PATCH 33/64] Fix pipelines visualisation rendering

---
 app/models/ci/build.rb                        |  2 +-
 app/models/ci/pipeline.rb                     |  4 ++++
 app/views/projects/commit/_pipeline.html.haml | 16 ++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 08f396210c9..b42977f9ebd 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -102,7 +102,7 @@ module Ci
     end
 
     def playable?
-      project.builds_enabled? && commands.present? && manual?
+      project.builds_enabled? && commands.present? && manual? && skipped?
     end
 
     def play(current_user = nil)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index bce6a992af6..caf4d25029f 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -34,6 +34,10 @@ module Ci
       CommitStatus.where(pipeline: pluck(:id)).stages
     end
 
+    def stages
+      statuses.order(:stage_idx).latest.group_by(&:stage)
+    end
+
     def project_id
       project.id
     end
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 0c006656d1d..27501d89dc5 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,9 +1,8 @@
 .row-content-block.build-content.middle-block.pipeline-graph
   .pipeline-visualization
     %ul.stage-column-list
-      - pipeline.statuses.stages.each do |stage|
-        - statuses = pipeline.statuses.where(stage: stage)
-        - status = statuses.latest.status
+      - stages = pipeline.statuses.latest.order(:stage_idx).group_by(&:stage)
+      - stages.each do |stage, builds|
         %li.stage-column
           .stage-name
             %a{name: stage}
@@ -11,11 +10,16 @@
               = stage.titleize
           .builds-container
             %ul
-              - statuses.each do |build|
+              - builds.each do |build|
                 %li.build
                   .build-content
-                    %span{class: "ci-status-link ci-status-icon-#{status}"}
-                      = ci_icon_for_status(status)
+                    %span{class: "ci-status-link ci-status-icon-#{build.status}"}
+                      - if build.try(:playable?)
+                        = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play' do
+                          = icon('play')
+                      - else
+                        = link_to namespace_project_build_url(build.project.namespace, build.project, build) do
+                          = ci_icon_for_status(build.status)
                     = build.name
 
 .row-content-block.build-content.middle-block.pipeline-graph

From f52f62d7aec168b3b8c291cdb81f64501bd80e5a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 16 Aug 2016 16:18:44 +0200
Subject: [PATCH 34/64] Update fixtures to make development testing easier

---
 db/fixtures/development/14_builds.rb | 32 ++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index e65abe4ef77..3734c861078 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -28,24 +28,44 @@ class Gitlab::Seeder::Builds
         build_create!(pipeline, name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :success)
 
         commit_status_create!(pipeline, name: 'jenkins', status: :success)
-
         print '.'
       rescue ActiveRecord::RecordInvalid
         print 'F'
+      ensure
+        pipeline.build_updated
       end
     end
   end
 
   def pipelines
-    commits = @project.repository.commits('master', limit: 5)
-    commits_sha = commits.map { |commit| commit.raw.id }
-    commits_sha.map do |sha|
-      @project.ensure_pipeline(sha, 'master')
-    end
+    master_pipelines + merge_request_pipelines
+  end
+
+  def master_pipelines
+    create_pipelines_for(@project, 'master')
   rescue
     []
   end
 
+  def merge_request_pipelines
+    @project.merge_requests.last(5).map do |merge_request|
+      create_pipelines(merge_request.source_project, merge_request.source_branch, merge_request.commits.last(5))
+    end.flatten
+  rescue
+    []
+  end
+
+  def create_pipelines_for(project, ref)
+    commits = project.repository.commits(ref, limit: 5)
+    create_pipelines(project, ref, commits)
+  end
+
+  def create_pipelines(project, ref, commits)
+    commits.map do |commit|
+      project.pipelines.create(sha: commit.id, ref: ref)
+    end
+  end
+
   def build_create!(pipeline, opts = {})
     attributes = build_attributes_for(pipeline, opts)
     build = Ci::Build.create!(attributes)

From fd09311da93070546c52e65c0c2af9b8566c56b5 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 17 Aug 2016 11:18:57 +0100
Subject: [PATCH 35/64] Update fixtures to add a created status to pipeline

---
 db/fixtures/development/14_builds.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index 0d493fa1c3c..069d9dd6226 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -1,9 +1,8 @@
 class Gitlab::Seeder::Builds
-  STAGES = %w[build notify_build test notify_test deploy notify_deploy]
+  STAGES = %w[build test deploy notify]
   BUILDS = [
     { name: 'build:linux', stage: 'build', status: :success },
     { name: 'build:osx', stage: 'build', status: :success },
-    { name: 'slack post build', stage: 'notify_build', status: :success },
     { name: 'rspec:linux', stage: 'test', status: :success },
     { name: 'rspec:windows', stage: 'test', status: :success },
     { name: 'rspec:windows', stage: 'test', status: :success },
@@ -12,9 +11,9 @@ class Gitlab::Seeder::Builds
     { name: 'spinach:osx', stage: 'test', status: :canceled },
     { name: 'cucumber:linux', stage: 'test', status: :running },
     { name: 'cucumber:osx', stage: 'test', status: :failed },
-    { name: 'slack post test', stage: 'notify_test', status: :success },
     { name: 'staging', stage: 'deploy', environment: 'staging', status: :success },
-    { name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :success },
+    { name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :skipped },
+    { name: 'slack', stage: 'notify', when: 'manual', status: :created },
   ]
 
   def initialize(project)
@@ -25,7 +24,7 @@ class Gitlab::Seeder::Builds
     pipelines.each do |pipeline|
       begin
         BUILDS.each { |opts| build_create!(pipeline, opts) }
-        commit_status_create!(pipeline, name: 'jenkins', status: :success)
+        commit_status_create!(pipeline, name: 'jenkins', stage: 'test', status: :success)
         print '.'
       rescue ActiveRecord::RecordInvalid
         print 'F'

From 1cd9b3b8a0b1024d043b9344869aceeadb9c84f1 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 17 Aug 2016 11:21:00 +0100
Subject: [PATCH 36/64] Split pipeline status item for Commit Status and Build

---
 app/models/ci/pipeline.rb                       |  4 ++--
 .../ci/builds/_build_pipeline.html.haml         | 12 ++++++++++++
 app/views/projects/commit/_pipeline.html.haml   | 17 ++++-------------
 .../_generic_commit_status_pipeline.html.haml   |  9 +++++++++
 4 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 app/views/projects/ci/builds/_build_pipeline.html.haml
 create mode 100644 app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index d3fc5191721..c360a6ff729 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -78,8 +78,8 @@ module Ci
       CommitStatus.where(pipeline: pluck(:id)).stages
     end
 
-    def stages
-      statuses.order(:stage_idx).latest.group_by(&:stage)
+    def stages_with_latest_statuses
+      statuses.latest.order(:stage_idx).group_by(&:stage)
     end
 
     def project_id
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
new file mode 100644
index 00000000000..5149d75e5a2
--- /dev/null
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -0,0 +1,12 @@
+%li.build
+  .build-content
+    %span{class: "ci-status-link ci-status-icon-#{subject.status}"}
+      - if subject.playable? && can?(current_user, :update_build, @project)
+        = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
+          = icon('play')
+      - elsif can?(current_user, :read_build, @project) && subject.started?
+        = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do
+          = ci_icon_for_status(subject.status)
+      - else
+        = ci_icon_for_status(subject.status)
+    = subject.name
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 5c8f40acfe3..7a7f61e9705 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,8 +1,8 @@
 .row-content-block.build-content.middle-block.pipeline-graph
   .pipeline-visualization
     %ul.stage-column-list
-      - stages = pipeline.statuses.latest.order(:stage_idx).group_by(&:stage)
-      - stages.each do |stage, builds|
+      - stages = pipeline.stages_with_latest_statuses
+      - stages.each do |stage, statuses|
         %li.stage-column
           .stage-name
             %a{name: stage}
@@ -10,17 +10,8 @@
               = stage.titleize
           .builds-container
             %ul
-              - builds.each do |build|
-                %li.build
-                  .build-content
-                    %span{class: "ci-status-link ci-status-icon-#{build.status}"}
-                      - if build.try(:playable?)
-                        = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play' do
-                          = icon('play')
-                      - else
-                        = link_to namespace_project_build_url(build.project.namespace, build.project, build) do
-                          = ci_icon_for_status(build.status)
-                    = build.name
+              - statuses.each do |status|
+                = render "projects/#{status.to_partial_path}_pipeline", subject: status
 
 .row-content-block.build-content.middle-block.pipeline-graph
   .pull-right
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
new file mode 100644
index 00000000000..760918b18a3
--- /dev/null
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
@@ -0,0 +1,9 @@
+%li.build
+  .build-content
+    %span{class: "ci-status-link ci-status-icon-#{subject.status}"}
+      - if subject.target_url
+        - link_to subject.target_url do
+          = ci_icon_for_status(subject.status)
+      - else
+        = ci_icon_for_status(subject.status)
+    = subject.name

From 49e7070adfcb281938a43aceeb52cc0257601e1d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 17 Aug 2016 12:08:45 +0100
Subject: [PATCH 37/64] Add support for Play and Created jobs

---
 app/helpers/ci_status_helper.rb               | 26 ++++++++++++-------
 .../ci/builds/_build_pipeline.html.haml       | 22 +++++++++-------
 app/views/projects/commit/_pipeline.html.haml | 14 ++++------
 .../_generic_commit_status_pipeline.html.haml | 14 +++++-----
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index ea2f5f9281a..573cdef767e 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -38,6 +38,10 @@ module CiStatusHelper
         'icon_status_pending'
       when 'running'
         'icon_status_running'
+      when 'play'
+        'icon_status_warning'
+      when 'created'
+        'icon_status_pending'
       else
         'icon_status_cancel'
       end
@@ -48,13 +52,13 @@ module CiStatusHelper
   def render_commit_status(commit, tooltip_placement: 'auto left')
     project = commit.project
     path = builds_namespace_project_commit_path(project.namespace, project, commit)
-    render_status_with_link('commit', commit.status, path, tooltip_placement)
+    render_status_with_link('commit', commit.status, path, tooltip_placement: tooltip_placement)
   end
 
   def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
     project = pipeline.project
     path = namespace_project_pipeline_path(project.namespace, project, pipeline)
-    render_status_with_link('pipeline', pipeline.status, path, tooltip_placement)
+    render_status_with_link('pipeline', pipeline.status, path, tooltip_placement: tooltip_placement)
   end
 
   def no_runners_for_project?(project)
@@ -62,13 +66,17 @@ module CiStatusHelper
       Ci::Runner.shared.blank?
   end
 
-  private
+  def render_status_with_link(type, status, path = nil, tooltip_placement: 'auto left', cssclass: '')
+    klass = "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}"
+    title = "#{type.titleize}: #{ci_label_for_status(status)}"
+    data = { toggle: 'tooltip', placement: tooltip_placement }
 
-  def render_status_with_link(type, status, path, tooltip_placement, cssclass: '')
-    link_to ci_icon_for_status(status),
-            path,
-            class: "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}",
-            title: "#{type.titleize}: #{ci_label_for_status(status)}",
-            data: { toggle: 'tooltip', placement: tooltip_placement }
+    if path
+      link_to ci_icon_for_status(status), path,
+              class: klass, title: title, data: data
+    else
+      content_tag :span, ci_icon_for_status(status),
+              class: klass, title: title, data: data
+    end
   end
 end
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
index 5149d75e5a2..8c8e0efc60f 100644
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -1,12 +1,14 @@
 %li.build
   .build-content
-    %span{class: "ci-status-link ci-status-icon-#{subject.status}"}
-      - if subject.playable? && can?(current_user, :update_build, @project)
-        = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
-          = icon('play')
-      - elsif can?(current_user, :read_build, @project) && subject.started?
-        = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do
-          = ci_icon_for_status(subject.status)
-      - else
-        = ci_icon_for_status(subject.status)
-    = subject.name
+    - if subject.playable? && can?(current_user, :update_build, @project)
+      = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
+        = render_status_with_link('build', 'play')
+        = subject.name
+    - elsif can?(current_user, :read_build, @project)
+      = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do
+        = render_status_with_link('build', subject.status)
+        = subject.name
+    - else
+      = render_status_with_link('build', subject.status)
+      = ci_icon_for_status(subject.status)
+
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 44250860020..9fa54057823 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -30,9 +30,8 @@
 .row-content-block.build-content.middle-block.pipeline-graph
   .pipeline-visualization
     %ul.stage-column-list
-      - pipeline.statuses.stages.each do |stage|
-        - statuses = pipeline.statuses.where(stage: stage)
-        - status = statuses.latest.status
+      - stages = pipeline.stages_with_latest_statuses
+      - stages.each do |stage, statuses|
         %li.stage-column
           .stage-name
             %a{name: stage}
@@ -40,12 +39,9 @@
               = stage.titleize
           .builds-container
             %ul
-              - statuses.each do |build|
-                %li.build
-                  .build-content
-                    %span{class: "ci-status-link ci-status-icon-#{status}"}
-                      = ci_icon_for_status(status)
-                    = link_to build.name, namespace_project_build_url(build.project.namespace, build.project, build)
+              - statuses.each do |status|
+                = render "projects/#{status.to_partial_path}_pipeline", subject: status
+
 
 - if pipeline.yaml_errors.present?
   .bs-callout.bs-callout-danger
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
index 760918b18a3..584c0fa18ae 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
@@ -1,9 +1,9 @@
 %li.build
   .build-content
-    %span{class: "ci-status-link ci-status-icon-#{subject.status}"}
-      - if subject.target_url
-        - link_to subject.target_url do
-          = ci_icon_for_status(subject.status)
-      - else
-        = ci_icon_for_status(subject.status)
-    = subject.name
+    - if subject.target_url
+      - link_to subject.target_url do
+        = render_status_with_link('commit status', subject.status)
+        = subject.name
+    - else
+      = render_status_with_link('commit status', subject.status)
+      = subject.name

From c0a722a223e50efeab5ed3f10523d83806a09215 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Mon, 15 Aug 2016 16:10:22 +0100
Subject: [PATCH 38/64] Removed sleep calls introduced in !5740

---
 features/steps/project/issues/issues.rb  | 2 --
 features/steps/project/merge_requests.rb | 1 -
 2 files changed, 3 deletions(-)

diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index daee90b3767..35f166c7c08 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -354,8 +354,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   def filter_issue(text)
-    sleep 1
     fill_in 'issue_search', with: text
-    sleep 1
   end
 end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 53d1aedf27f..f3d78780da3 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -489,7 +489,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I fill in merge request search with "Fe"' do
-    sleep 1
     fill_in 'issue_search', with: "Fe"
   end
 

From 8691561016338a58e314cdaa69911523b35c6df4 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Wed, 17 Aug 2016 13:33:44 +0100
Subject: [PATCH 39/64] Now waits for All issuables to load when clicked

---
 features/steps/project/issues/issues.rb  | 2 ++
 features/steps/project/merge_requests.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 35f166c7c08..056462a7152 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -45,6 +45,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
   step 'I click link "All"' do
     click_link "All"
+    # Waits for load
+    expect(find('.issues-state-filters > .active')).to have_content 'All'
   end
 
   step 'I click link "Release 0.4"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index f3d78780da3..9778ff4a6c7 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -22,6 +22,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I click link "All"' do
     click_link "All"
+    # Waits for load
+    expect(find('.issues-state-filters > .active')).to have_content 'All'
   end
 
   step 'I click link "Merged"' do

From 4e66551a6614283f5b085a523bdbfbc552edb976 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 10:06:10 -0500
Subject: [PATCH 40/64] Add deploy btn in graph; fix JS to toggle one graph at
 a time if multiple pipelines

---
 app/assets/javascripts/pipeline.js.es6                 | 9 ++++++---
 app/assets/stylesheets/pages/pipelines.scss            | 8 ++++++++
 app/helpers/ci_status_helper.rb                        | 4 ++--
 app/views/projects/ci/builds/_build_pipeline.html.haml | 3 +--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipeline.js.es6
index 7054199ac89..ae7369004de 100644
--- a/app/assets/javascripts/pipeline.js.es6
+++ b/app/assets/javascripts/pipeline.js.es6
@@ -1,8 +1,11 @@
 function toggleGraph() {
-  $('.pipeline-graph, .toggle-pipeline-btn').toggleClass('graph-collapsed');
+  const indexOfBtn = $('.toggle-pipeline-btn').index($(this));
 
-  const $btnText = $('.toggle-pipeline-btn .btn-text');
-  const graphCollapsed = $('.pipeline-graph').hasClass('graph-collapsed');
+  $($('.pipeline-graph')[indexOfBtn]).toggleClass('graph-collapsed');
+  $($('.toggle-pipeline-btn')[indexOfBtn]).toggleClass('graph-collapsed');
+
+  const $btnText = $($('.toggle-pipeline-btn .btn-text')[indexOfBtn]);
+  const graphCollapsed = $($('.pipeline-graph')[indexOfBtn]).hasClass('graph-collapsed');
 
   graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
 }
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ce9e3e95d3d..e49543d661f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -298,6 +298,10 @@
     width: 150px;
     margin-bottom: 10px;
 
+    &.deployable {
+      background-color: $gray-light;
+    }
+
     .build-content {
       width: 130px;
       white-space: nowrap;
@@ -315,6 +319,10 @@
       margin-right: 5px;
     }
 
+    .fa {
+      font-size: 13px;
+    }
+
     // Connect first build in each stage with right horizontal line
     &:first-child {
       &::after {
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 573cdef767e..eb385d58e3b 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -39,14 +39,14 @@ module CiStatusHelper
       when 'running'
         'icon_status_running'
       when 'play'
-        'icon_status_warning'
+        'play'
       when 'created'
         'icon_status_pending'
       else
         'icon_status_cancel'
       end
 
-    custom_icon(icon_name)
+    status == 'play' ? icon(icon_name + ' fw') : custom_icon(icon_name)
   end
 
   def render_commit_status(commit, tooltip_placement: 'auto left')
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
index 8c8e0efc60f..6be75860db2 100644
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -1,4 +1,4 @@
-%li.build
+%li.build{class: ("deployable" if subject.playable? && can?(current_user, :update_build, @project))}
   .build-content
     - if subject.playable? && can?(current_user, :update_build, @project)
       = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
@@ -11,4 +11,3 @@
     - else
       = render_status_with_link('build', subject.status)
       = ci_icon_for_status(subject.status)
-

From bfe2259bb76b320bd148de4fbdcebfd1b70a59ba Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 10:20:46 -0500
Subject: [PATCH 41/64] Update CSS selector and play icon

---
 app/assets/stylesheets/pages/pipelines.scss            | 2 +-
 app/helpers/ci_status_helper.rb                        | 4 ++--
 app/views/projects/ci/builds/_build_pipeline.html.haml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e49543d661f..30239d609bc 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -298,7 +298,7 @@
     width: 150px;
     margin-bottom: 10px;
 
-    &.deployable {
+    &.playable {
       background-color: $gray-light;
     }
 
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index eb385d58e3b..94df7d131ca 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -39,14 +39,14 @@ module CiStatusHelper
       when 'running'
         'icon_status_running'
       when 'play'
-        'play'
+        return icon('play fw')
       when 'created'
         'icon_status_pending'
       else
         'icon_status_cancel'
       end
 
-    status == 'play' ? icon(icon_name + ' fw') : custom_icon(icon_name)
+    custom_icon(icon_name)
   end
 
   def render_commit_status(commit, tooltip_placement: 'auto left')
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
index 6be75860db2..13088ef64d9 100644
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -1,4 +1,4 @@
-%li.build{class: ("deployable" if subject.playable? && can?(current_user, :update_build, @project))}
+%li.build{class: ("playable" if subject.playable? && can?(current_user, :update_build, @project))}
   .build-content
     - if subject.playable? && can?(current_user, :update_build, @project)
       = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do

From 2c23465d05fa1efa4213bd5d7b0e86b1cd521212 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 10:48:49 -0500
Subject: [PATCH 42/64] Move deployable conditional to variable; fix
 pipelines_spec

---
 app/views/projects/ci/builds/_build_pipeline.html.haml | 5 +++--
 spec/features/projects/pipelines_spec.rb               | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
index 13088ef64d9..04cbd0c3591 100644
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -1,6 +1,7 @@
-%li.build{class: ("playable" if subject.playable? && can?(current_user, :update_build, @project))}
+- is_playable = subject.playable? && can?(current_user, :update_build, @project)
+%li.build{class: ("playable" if is_playable)}
   .build-content
-    - if subject.playable? && can?(current_user, :update_build, @project)
+    - if is_playable
       = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
         = render_status_with_link('build', 'play')
         = subject.name
diff --git a/spec/features/projects/pipelines_spec.rb b/spec/features/projects/pipelines_spec.rb
index 29d150bc597..47482bc3cc9 100644
--- a/spec/features/projects/pipelines_spec.rb
+++ b/spec/features/projects/pipelines_spec.rb
@@ -193,7 +193,11 @@ describe "Pipelines" do
     end
 
     context 'playing manual build' do
-      before { click_link('Play') }
+      before do
+        within '.pipeline-holder' do
+          click_link('Play')
+        end
+      end
 
       it { expect(@manual.reload).to be_pending }
     end

From 8e4ec561dc6771d13fee289e1c8247b71b289d08 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Fri, 29 Jul 2016 11:23:05 -0500
Subject: [PATCH 43/64] Order by build status

---
 app/views/projects/builds/show.html.haml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 4421f3b9562..ce9522b9929 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -8,7 +8,19 @@
   - builds = @build.pipeline.builds.latest.to_a
   - if builds.size > 1
     %ul.nav-links.no-top.no-bottom
-      - builds.each do |build|
+      - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
+      - statuses.each do |build_status|
+        - builds.select{|build| build.status == build_status}.each do |build|
+          %li{class: ('active' if build == @build) }
+            = link_to namespace_project_build_path(@project.namespace, @project, build) do
+              = ci_icon_for_status(build.status)
+              %span
+                - if build.name
+                  = build.name
+                - else
+                  = build.id
+
+      - builds.select{|build| build.status == "success"}.each do |build|
         %li{class: ('active' if build == @build) }
           = link_to namespace_project_build_path(@project.namespace, @project, build) do
             = ci_icon_for_status(build.status)

From 283c1dc3301a8583f21feac71aed2c4d6773ccd8 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 1 Aug 2016 15:46:50 -0500
Subject: [PATCH 44/64] Add overflow tests to dropdown

---
 app/assets/javascripts/build.js          | 11 +++++++++++
 app/views/projects/builds/show.html.haml | 18 +++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 3d9b824d406..3468c87f5df 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -20,6 +20,7 @@
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
       $(window).off('resize.build').on('resize.build', this.hideSidebar);
       this.updateArtifactRemoveDate();
+      this.displayTestStatuses();
       if ($('#build-trace').length) {
         this.getInitialBuildTrace();
         this.initScrollButtonAffix();
@@ -132,6 +133,16 @@
       }
     };
 
+    Build.prototype.displayTestStatuses = function() {
+      $jobTopPosition = $('.build-job').first().offset().top;
+
+      $('.build-job').each(function() {
+        if ($(this).offset().top > $jobTopPosition) {
+          $('.overflow-jobs > li').append($(this));
+        }
+      })
+    };
+
     return Build;
 
   })();
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index ce9522b9929..8101d7a13da 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -12,23 +12,19 @@
       - statuses.each do |build_status|
         - builds.select{|build| build.status == build_status}.each do |build|
           %li{class: ('active' if build == @build) }
-            = link_to namespace_project_build_path(@project.namespace, @project, build) do
+            = link_to namespace_project_build_path(@project.namespace, @project, build), class: 'build-job' do
               = ci_icon_for_status(build.status)
               %span
                 - if build.name
                   = build.name
                 - else
                   = build.id
-
-      - builds.select{|build| build.status == "success"}.each do |build|
-        %li{class: ('active' if build == @build) }
-          = link_to namespace_project_build_path(@project.namespace, @project, build) do
-            = ci_icon_for_status(build.status)
-            %span
-              - if build.name
-                = build.name
-              - else
-                = build.id
+    .dropdown
+      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
+        %span Test Name
+        = icon('chevron-down')
+      %ul.dropdown-menu.overflow-jobs
+        %li
 
       - if @build.retried?
         %li.active

From d3cd603b46f55c0048445578fbb6d4819bff8cd1 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 1 Aug 2016 17:51:23 -0500
Subject: [PATCH 45/64] Hide dropdown if all tests fit on one line; add counter
 to dropdown

---
 app/assets/javascripts/build.js          | 10 +++++++++-
 app/assets/stylesheets/pages/builds.scss | 10 ++++++++++
 app/views/projects/builds/show.html.haml | 16 ++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 3468c87f5df..4b28436b524 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -135,12 +135,20 @@
 
     Build.prototype.displayTestStatuses = function() {
       $jobTopPosition = $('.build-job').first().offset().top;
+      $dropdownCounter = [];
 
-      $('.build-job').each(function() {
+      $('.build-job a').each(function() {
         if ($(this).offset().top > $jobTopPosition) {
+          $dropdownCounter.push($(this));
           $('.overflow-jobs > li').append($(this));
         }
       })
+
+      $('.more-tests').text('More (' + $dropdownCounter.length + ')');
+
+      if ($('.overflow-jobs > li > a').length == 0) {
+        $('.overflow-jobs-dropdown').hide();
+      }
     };
 
     return Build;
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index e26f8f7080d..9e79ad0db89 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -61,6 +61,16 @@
       margin-right: 3px;
     }
   }
+
+  .overflow-jobs-dropdown {
+    float: right;
+    padding: 7px 0 7px 5px;
+
+    .dropdown-menu-toggle {
+      width: auto;
+      border: none;
+    }
+  }
 }
 
 .build-header {
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 8101d7a13da..f3718b3cb49 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -7,24 +7,24 @@
 
   - builds = @build.pipeline.builds.latest.to_a
   - if builds.size > 1
+    .dropdown.overflow-jobs-dropdown
+      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
+        %span.more-tests More
+        = icon('caret-down')
+      %ul.dropdown-menu.dropdown-menu-align-right.overflow-jobs
+        %li
     %ul.nav-links.no-top.no-bottom
       - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
       - statuses.each do |build_status|
         - builds.select{|build| build.status == build_status}.each do |build|
-          %li{class: ('active' if build == @build) }
-            = link_to namespace_project_build_path(@project.namespace, @project, build), class: 'build-job' do
+          %li.build-job{class: ('active' if build == @build) }
+            = link_to namespace_project_build_path(@project.namespace, @project, build) do
               = ci_icon_for_status(build.status)
               %span
                 - if build.name
                   = build.name
                 - else
                   = build.id
-    .dropdown
-      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span Test Name
-        = icon('chevron-down')
-      %ul.dropdown-menu.overflow-jobs
-        %li
 
       - if @build.retried?
         %li.active

From 4d32a8b7e9a07f82b6c12bbed4e772da68da4707 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 1 Aug 2016 17:57:50 -0500
Subject: [PATCH 46/64] Change active state of list items; style dropdown items

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

diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 9e79ad0db89..3039475695c 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -60,6 +60,18 @@
       top: 2px;
       margin-right: 3px;
     }
+
+    .build-job {
+      a {
+        color: $gl-text-color;
+      }
+
+      &.active {
+        a {
+          font-weight: bold;
+        }
+      }
+    }
   }
 
   .overflow-jobs-dropdown {
@@ -70,6 +82,12 @@
       width: auto;
       border: none;
     }
+
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 3px;
+    }
   }
 }
 

From 5bfca3b16d12e63675233f1d91e74db35c2545e3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 3 Aug 2016 13:52:06 -0500
Subject: [PATCH 47/64] Add data attributes to builds

---
 app/assets/javascripts/build.js          | 22 ++++----------
 app/assets/stylesheets/pages/builds.scss |  9 +-----
 app/views/projects/builds/show.html.haml | 37 ++++++++++++++----------
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 4b28436b524..3482c580edb 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -16,11 +16,11 @@
       clearInterval(Build.interval);
       this.bp = Breakpoints.get();
       this.hideSidebar();
+      this.displayTestStatuses();
       $('.js-build-sidebar').niceScroll();
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
       $(window).off('resize.build').on('resize.build', this.hideSidebar);
       this.updateArtifactRemoveDate();
-      this.displayTestStatuses();
       if ($('#build-trace').length) {
         this.getInitialBuildTrace();
         this.initScrollButtonAffix();
@@ -134,21 +134,11 @@
     };
 
     Build.prototype.displayTestStatuses = function() {
-      $jobTopPosition = $('.build-job').first().offset().top;
-      $dropdownCounter = [];
-
-      $('.build-job a').each(function() {
-        if ($(this).offset().top > $jobTopPosition) {
-          $dropdownCounter.push($(this));
-          $('.overflow-jobs > li').append($(this));
-        }
-      })
-
-      $('.more-tests').text('More (' + $dropdownCounter.length + ')');
-
-      if ($('.overflow-jobs > li > a').length == 0) {
-        $('.overflow-jobs-dropdown').hide();
-      }
+      $jobs = $('.build-job');
+      jobjects = $jobs.map(function () {
+        return $(this).data();
+      });
+      console.log(jobjects);
     };
 
     return Build;
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 3039475695c..5a6a35f42d1 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -74,14 +74,7 @@
     }
   }
 
-  .overflow-jobs-dropdown {
-    float: right;
-    padding: 7px 0 7px 5px;
-
-    .dropdown-menu-toggle {
-      width: auto;
-      border: none;
-    }
+  .jobs-dropdown {
 
     svg {
       position: relative;
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index f3718b3cb49..3fedba488c8 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -7,24 +7,31 @@
 
   - builds = @build.pipeline.builds.latest.to_a
   - if builds.size > 1
-    .dropdown.overflow-jobs-dropdown
+    .dropdown.stage
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
         %span.more-tests More
         = icon('caret-down')
-      %ul.dropdown-menu.dropdown-menu-align-right.overflow-jobs
-        %li
-    %ul.nav-links.no-top.no-bottom
-      - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
-      - statuses.each do |build_status|
-        - builds.select{|build| build.status == build_status}.each do |build|
-          %li.build-job{class: ('active' if build == @build) }
-            = link_to namespace_project_build_path(@project.namespace, @project, build) do
-              = ci_icon_for_status(build.status)
-              %span
-                - if build.name
-                  = build.name
-                - else
-                  = build.id
+      %ul.dropdown-menu.overflow-jobs
+        - builds.each do |build|
+          %li
+            %a= build.stage
+
+    - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
+    .dropdown.jobs-dropdown
+      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
+        %span.more-tests More
+        = icon('caret-down')
+      %ul.dropdown-menu.overflow-jobs
+        - statuses.each do |build_status|
+          - builds.select{|build| build.status == build_status}.each do |build|
+            %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, status: build.status}}
+              = link_to namespace_project_build_path(@project.namespace, @project, build) do
+                = ci_icon_for_status(build.status)
+                %span
+                  - if build.name
+                    = build.name
+                  - else
+                    = build.id
 
       - if @build.retried?
         %li.active

From f97939a791ae1e71f8e9d366cdfe106decb9545e Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 3 Aug 2016 15:04:40 -0500
Subject: [PATCH 48/64] Selecting stage updates builds dropdown

---
 app/assets/javascripts/build.js          | 21 +++++++++++++--------
 app/views/projects/builds/show.html.haml | 12 ++++++------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 3482c580edb..baa91e221e8 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -13,13 +13,14 @@
       this.state = state1;
       this.hideSidebar = bind(this.hideSidebar, this);
       this.toggleSidebar = bind(this.toggleSidebar, this);
+      this.updateDropdown = bind(this.updateDropdown, this);
       clearInterval(Build.interval);
       this.bp = Breakpoints.get();
-      this.hideSidebar();
-      this.displayTestStatuses();
       $('.js-build-sidebar').niceScroll();
+      this.hideSidebar();
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
       $(window).off('resize.build').on('resize.build', this.hideSidebar);
+      $(document).on('click', '.stage-item', this.updateDropdown);
       this.updateArtifactRemoveDate();
       if ($('#build-trace').length) {
         this.getInitialBuildTrace();
@@ -133,12 +134,16 @@
       }
     };
 
-    Build.prototype.displayTestStatuses = function() {
-      $jobs = $('.build-job');
-      jobjects = $jobs.map(function () {
-        return $(this).data();
-      });
-      console.log(jobjects);
+    Build.prototype.populateJobDropdown = function(stage) {
+      $('.build-job').hide();
+      $('.build-job[data-stage="' + stage + '"]').show();
+    };
+
+    Build.prototype.updateDropdown = function(e) {
+      e.preventDefault();
+      var stage = e.target.text;
+      $('.stage-selection').text(stage);
+      this.populateJobDropdown(stage);
     };
 
     return Build;
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 3fedba488c8..2302aa2d1e7 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -6,25 +6,25 @@
   = render "header"
 
   - builds = @build.pipeline.builds.latest.to_a
+  - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
   - if builds.size > 1
     .dropdown.stage
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.more-tests More
+        %span.stage-selection More
         = icon('caret-down')
       %ul.dropdown-menu.overflow-jobs
-        - builds.each do |build|
+        - builds.map(&:stage).uniq.each do |stage|
           %li
-            %a= build.stage
+            %a.stage-item= stage
 
-    - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
     .dropdown.jobs-dropdown
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.more-tests More
+        %span.build-selection More
         = icon('caret-down')
       %ul.dropdown-menu.overflow-jobs
         - statuses.each do |build_status|
           - builds.select{|build| build.status == build_status}.each do |build|
-            %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, status: build.status}}
+            %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, stage: build.stage}}
               = link_to namespace_project_build_path(@project.namespace, @project, build) do
                 = ci_icon_for_status(build.status)
                 %span

From 0b9cd0a1f635d1e3751aa1279d52292d23a0a9dc Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 3 Aug 2016 15:40:10 -0500
Subject: [PATCH 49/64] Populate dropdowns with current build on pageload

---
 app/assets/javascripts/build.js          | 18 ++++++++++++++++--
 app/views/projects/builds/show.html.haml |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index baa91e221e8..2725ddcf465 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -6,7 +6,7 @@
 
     Build.state = null;
 
-    function Build(page_url, build_url, build_status, state1) {
+    function Build(page_url, build_url, build_status, build_stage, build_name, state1) {
       this.page_url = page_url;
       this.build_url = build_url;
       this.build_status = build_status;
@@ -17,7 +17,12 @@
       clearInterval(Build.interval);
       this.bp = Breakpoints.get();
       $('.js-build-sidebar').niceScroll();
+
+      this.populateJobDropdown(build_stage);
+      this.updateStageDropdownText(build_stage);
+      this.updateJobDropdownText(build_name);
       this.hideSidebar();
+
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
       $(window).off('resize.build').on('resize.build', this.hideSidebar);
       $(document).on('click', '.stage-item', this.updateDropdown);
@@ -139,10 +144,19 @@
       $('.build-job[data-stage="' + stage + '"]').show();
     };
 
+    Build.prototype.updateStageDropdownText = function(stage) {
+      $('.stage-selection').text(stage);
+      this.updateJobDropdownText('-');
+    };
+
+    Build.prototype.updateJobDropdownText = function(name) {
+      $('.build-selection').text(name);
+    };
+
     Build.prototype.updateDropdown = function(e) {
       e.preventDefault();
       var stage = e.target.text;
-      $('.stage-selection').text(stage);
+      this.updateStageDropdownText(stage);
       this.populateJobDropdown(stage);
     };
 
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 2302aa2d1e7..5f7c66e4dd2 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -82,4 +82,4 @@
 = render "sidebar"
 
 :javascript
-  new Build("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")
+  new Build("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{@build.stage}", "#{@build.name}", "#{trace_with_state[:state]}")

From 3693495e6136a9dc1266fc25a1b6ff9a764de005 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 4 Aug 2016 15:33:41 -0500
Subject: [PATCH 50/64] Style build dropdowns

---
 app/assets/stylesheets/pages/builds.scss | 29 +++++++-----------------
 app/views/projects/builds/show.html.haml |  8 +++----
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 5a6a35f42d1..5ecbe038612 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -54,32 +54,19 @@
     }
   }
 
-  .nav-links {
-    svg {
-      position: relative;
-      top: 2px;
-      margin-right: 3px;
-    }
-
-    .build-job {
-      a {
-        color: $gl-text-color;
-      }
-
-      &.active {
-        a {
-          font-weight: bold;
-        }
-      }
-    }
-  }
-
-  .jobs-dropdown {
+  .build-dropdown {
+    display: inline-block;
+    margin-top: 16px;
 
     svg {
       position: relative;
       top: 2px;
       margin-right: 3px;
+      height: 13px;
+    }
+
+    .stage-item {
+      cursor: pointer;
     }
   }
 }
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 5f7c66e4dd2..b4834ae42a2 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -8,20 +8,20 @@
   - builds = @build.pipeline.builds.latest.to_a
   - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
   - if builds.size > 1
-    .dropdown.stage
+    .dropdown.build-dropdown
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
         %span.stage-selection More
         = icon('caret-down')
-      %ul.dropdown-menu.overflow-jobs
+      %ul.dropdown-menu
         - builds.map(&:stage).uniq.each do |stage|
           %li
             %a.stage-item= stage
 
-    .dropdown.jobs-dropdown
+    .dropdown.build-dropdown
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
         %span.build-selection More
         = icon('caret-down')
-      %ul.dropdown-menu.overflow-jobs
+      %ul.dropdown-menu
         - statuses.each do |build_status|
           - builds.select{|build| build.status == build_status}.each do |build|
             %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, stage: build.stage}}

From 6357c75c5784479a71a5b50204aa8633a3650756 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 4 Aug 2016 15:39:02 -0500
Subject: [PATCH 51/64] Update changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 837e9e27aba..2c00255f6d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -99,6 +99,7 @@ v 8.11.0 (unreleased)
   - Make error pages responsive (Takuya Noguchi)
   - The performance of the project dropdown used for moving issues has been improved
   - Fix skip_repo parameter being ignored when destroying a namespace
+  - Add all builds into stage/job dropdowns on builds page
   - Change requests_profiles resource constraint to catch virtually any file
   - Bump gitlab_git to lazy load compare commits
   - Reduce number of queries made for merge_requests/:id/diffs

From 1b98f15444449b075ea52346d6368c7e2de8f2b6 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 4 Aug 2016 15:54:07 -0500
Subject: [PATCH 52/64] Remove unused data attributes

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

diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index b4834ae42a2..956851c651f 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -24,7 +24,7 @@
       %ul.dropdown-menu
         - statuses.each do |build_status|
           - builds.select{|build| build.status == build_status}.each do |build|
-            %li.build-job{class: ('active' if build == @build), data: {id: build.id, name: build.name, stage: build.stage}}
+            %li.build-job{class: ('active' if build == @build), data: {stage: build.stage}}
               = link_to namespace_project_build_path(@project.namespace, @project, build) do
                 = ci_icon_for_status(build.status)
                 %span

From f80aa9026f6ce7ebfb88c437163868a596b492c4 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 9 Aug 2016 10:20:21 -0500
Subject: [PATCH 53/64] Move skipped tests to end of array

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

diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 956851c651f..dba0a0a9f4e 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -6,7 +6,7 @@
   = render "header"
 
   - builds = @build.pipeline.builds.latest.to_a
-  - statuses = ["failed", "pending", "running", "canceled", "skipped", "success"]
+  - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"]
   - if builds.size > 1
     .dropdown.build-dropdown
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}

From 8dbb1b2fbeff6caf1ad91173d707b5f55469cb40 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 11:46:41 -0500
Subject: [PATCH 54/64] Move stages and jobs to build sidebar

---
 app/assets/javascripts/build.js              |  6 ++--
 app/views/projects/builds/_sidebar.html.haml | 36 ++++++++++++++++++++
 app/views/projects/builds/show.html.haml     | 35 -------------------
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 2725ddcf465..1ee4ee5f10e 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -18,7 +18,7 @@
       this.bp = Breakpoints.get();
       $('.js-build-sidebar').niceScroll();
 
-      this.populateJobDropdown(build_stage);
+      this.populateJobs(build_stage);
       this.updateStageDropdownText(build_stage);
       this.updateJobDropdownText(build_name);
       this.hideSidebar();
@@ -139,7 +139,7 @@
       }
     };
 
-    Build.prototype.populateJobDropdown = function(stage) {
+    Build.prototype.populateJobs = function(stage) {
       $('.build-job').hide();
       $('.build-job[data-stage="' + stage + '"]').show();
     };
@@ -157,7 +157,7 @@
       e.preventDefault();
       var stage = e.target.text;
       this.updateStageDropdownText(stage);
-      this.populateJobDropdown(stage);
+      this.populateJobs(stage);
     };
 
     return Build;
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index a8bc53c2849..47d0c93b0ba 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -11,6 +11,42 @@
       %p.build-detail-row
         #{@build.coverage}%
 
+  - builds = @build.pipeline.builds.latest.to_a
+  - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"]
+  - if builds.size > 1
+    .dropdown.build-dropdown
+      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
+        %span.stage-selection More
+        = icon('caret-down')
+      %ul.dropdown-menu
+        - builds.map(&:stage).uniq.each do |stage|
+          %li
+            %a.stage-item= stage
+
+    .dropdown.build-dropdown
+      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
+        %span.build-selection More
+        = icon('caret-down')
+      %ul.dropdown-menu
+        - statuses.each do |build_status|
+          - builds.select{|build| build.status == build_status}.each do |build|
+            %li.build-job{class: ('active' if build == @build), data: {stage: build.stage}}
+              = link_to namespace_project_build_path(@project.namespace, @project, build) do
+                = ci_icon_for_status(build.status)
+                %span
+                  - if build.name
+                    = build.name
+                  - else
+                    = build.id
+
+      - if @build.retried?
+        %li.active
+          %a
+            Build ##{@build.id}
+            &middot;
+            %i.fa.fa-warning
+            This build was retried.
+
   - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
     .block{ class: ("block-first" if !@build.coverage) }
       .title
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index dba0a0a9f4e..70e02cb2d13 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -5,41 +5,6 @@
 .build-page
   = render "header"
 
-  - builds = @build.pipeline.builds.latest.to_a
-  - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"]
-  - if builds.size > 1
-    .dropdown.build-dropdown
-      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.stage-selection More
-        = icon('caret-down')
-      %ul.dropdown-menu
-        - builds.map(&:stage).uniq.each do |stage|
-          %li
-            %a.stage-item= stage
-
-    .dropdown.build-dropdown
-      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.build-selection More
-        = icon('caret-down')
-      %ul.dropdown-menu
-        - statuses.each do |build_status|
-          - builds.select{|build| build.status == build_status}.each do |build|
-            %li.build-job{class: ('active' if build == @build), data: {stage: build.stage}}
-              = link_to namespace_project_build_path(@project.namespace, @project, build) do
-                = ci_icon_for_status(build.status)
-                %span
-                  - if build.name
-                    = build.name
-                  - else
-                    = build.id
-
-      - if @build.retried?
-        %li.active
-          %a
-            Build ##{@build.id}
-            &middot;
-            %i.fa.fa-warning
-            This build was retried.
   - if @build.stuck?
     - unless @build.any_runners_online?
       .bs-callout.bs-callout-warning

From 162ef4b07262fdc0ad75564225f311a67c11833b Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 12:15:36 -0500
Subject: [PATCH 55/64] Display jobs as scrolling list in sidebar

---
 app/assets/javascripts/build.js              |   6 -
 app/assets/stylesheets/pages/builds.scss     |  68 ++++--
 app/views/projects/builds/_sidebar.html.haml | 207 +++++++++----------
 3 files changed, 151 insertions(+), 130 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 1ee4ee5f10e..c54d8fc2267 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -20,7 +20,6 @@
 
       this.populateJobs(build_stage);
       this.updateStageDropdownText(build_stage);
-      this.updateJobDropdownText(build_name);
       this.hideSidebar();
 
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
@@ -146,11 +145,6 @@
 
     Build.prototype.updateStageDropdownText = function(stage) {
       $('.stage-selection').text(stage);
-      this.updateJobDropdownText('-');
-    };
-
-    Build.prototype.updateJobDropdownText = function(name) {
-      $('.build-selection').text(name);
     };
 
     Build.prototype.updateDropdown = function(e) {
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 5ecbe038612..f22b5fb84f8 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -53,22 +53,6 @@
       left: 70px;
     }
   }
-
-  .build-dropdown {
-    display: inline-block;
-    margin-top: 16px;
-
-    svg {
-      position: relative;
-      top: 2px;
-      margin-right: 3px;
-      height: 13px;
-    }
-
-    .stage-item {
-      cursor: pointer;
-    }
-  }
 }
 
 .build-header {
@@ -116,24 +100,70 @@
 }
 
 .right-sidebar.build-sidebar {
-  padding-top: $gl-padding;
-  padding-bottom: $gl-padding;
+  padding: $gl-padding 0;
+  border-left: 1px solid $border-color;
 
   &.right-sidebar-collapsed {
     display: none;
   }
 
+  .blocks-container {
+    padding: $gl-padding;
+  }
+
   .block {
     width: 100%;
   }
 
   .build-sidebar-header {
-    padding-top: 0;
+    padding: 0 $gl-padding $gl-padding;
 
     .gutter-toggle {
       margin-top: 0;
     }
   }
+
+  .stage-item {
+    cursor: pointer;
+
+    &:hover {
+      color: $gl-text-color;
+    }
+  }
+
+  .build-dropdown {
+    padding: 0 $gl-padding;
+  }
+
+  .builds-container {
+    margin: $gl-padding 0;
+    background-color: $white-light;
+    border-top: 1px solid $border-color;
+    border-bottom: 1px solid $border-color;
+
+    svg {
+      position: relative;
+      top: 2px;
+      margin-right: 3px;
+      height: 13px;
+    }
+
+    a {
+      display: block;
+      padding: $gl-padding 10px;
+
+      &:hover {
+        background-color: $row-hover;
+        color: $gl-text-color;
+      }
+    }
+
+    .build-job {
+      &.active {
+        font-weight: bold;
+      }
+    }
+  }
 }
 
 .build-detail-row {
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 47d0c93b0ba..726c816716c 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -23,122 +23,119 @@
           %li
             %a.stage-item= stage
 
-    .dropdown.build-dropdown
-      %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
-        %span.build-selection More
-        = icon('caret-down')
-      %ul.dropdown-menu
-        - statuses.each do |build_status|
-          - builds.select{|build| build.status == build_status}.each do |build|
-            %li.build-job{class: ('active' if build == @build), data: {stage: build.stage}}
-              = link_to namespace_project_build_path(@project.namespace, @project, build) do
-                = ci_icon_for_status(build.status)
-                %span
-                  - if build.name
-                    = build.name
-                  - else
-                    = build.id
+    .builds-container
+      - statuses.each do |build_status|
+        - builds.select{|build| build.status == build_status}.each do |build|
+          .build-job{class: ('active' if build == @build), data: {stage: build.stage}}
+            = link_to namespace_project_build_path(@project.namespace, @project, build) do
+              = ci_icon_for_status(build.status)
+              %span
+                - if build.name
+                  = build.name
+                - else
+                  = build.id
 
-      - if @build.retried?
-        %li.active
-          %a
-            Build ##{@build.id}
-            &middot;
-            %i.fa.fa-warning
-            This build was retried.
+        - if @build.retried?
+          %li.active
+            %a
+              Build ##{@build.id}
+              &middot;
+              %i.fa.fa-warning
+              This build was retried.
 
-  - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
-    .block{ class: ("block-first" if !@build.coverage) }
+  .blocks-container
+    - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
+      .block{ class: ("block-first" if !@build.coverage) }
+        .title
+          Build artifacts
+        - if @build.artifacts_expired?
+          %p.build-detail-row
+            The artifacts were removed
+            #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+        - elsif @build.artifacts_expire_at
+          %p.build-detail-row
+            The artifacts will be removed in
+            %span.js-artifacts-remove= @build.artifacts_expire_at
+
+        - if @build.artifacts?
+          .btn-group.btn-group-justified{ role: :group }
+            - if @build.artifacts_expire_at
+              = link_to keep_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post do
+                Keep
+
+            = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
+              Download
+
+            - if @build.artifacts_metadata?
+              = link_to browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
+                Browse
+
+    .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) }
       .title
-        Build artifacts
-      - if @build.artifacts_expired?
+        Build details
+        - if can?(current_user, :update_build, @build) && @build.retryable?
+          = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right', method: :post
+      - if @build.merge_request
         %p.build-detail-row
-          The artifacts were removed
-          #{time_ago_with_tooltip(@build.artifacts_expire_at)}
-      - elsif @build.artifacts_expire_at
+          %span.build-light-text Merge Request:
+          = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request)
+      - if @build.duration
         %p.build-detail-row
-          The artifacts will be removed in
-          %span.js-artifacts-remove= @build.artifacts_expire_at
-
-      - if @build.artifacts?
-        .btn-group.btn-group-justified{ role: :group }
-          - if @build.artifacts_expire_at
-            = link_to keep_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post do
-              Keep
-
-          = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
-            Download
-
-          - if @build.artifacts_metadata?
-            = link_to browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default' do
-              Browse
-
-  .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) }
-    .title
-      Build details
-      - if can?(current_user, :update_build, @build) && @build.retryable?
-        = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right', method: :post
-    - if @build.merge_request
+          %span.build-light-text Duration:
+          = time_interval_in_words(@build.duration)
+      - if @build.finished_at
+        %p.build-detail-row
+          %span.build-light-text Finished:
+          #{time_ago_with_tooltip(@build.finished_at)}
+      - if @build.erased_at
+        %p.build-detail-row
+          %span.build-light-text Erased:
+          #{time_ago_with_tooltip(@build.erased_at)}
       %p.build-detail-row
-        %span.build-light-text Merge Request:
-        = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request)
-    - if @build.duration
-      %p.build-detail-row
-        %span.build-light-text Duration:
-        = time_interval_in_words(@build.duration)
-    - if @build.finished_at
-      %p.build-detail-row
-        %span.build-light-text Finished:
-        #{time_ago_with_tooltip(@build.finished_at)}
-    - if @build.erased_at
-      %p.build-detail-row
-        %span.build-light-text Erased:
-        #{time_ago_with_tooltip(@build.erased_at)}
-    %p.build-detail-row
-      %span.build-light-text Runner:
-      - if @build.runner && current_user && current_user.admin
-        = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
-      - elsif @build.runner
-        \##{@build.runner.id}
-    .btn-group.btn-group-justified{ role: :group }
-      - if @build.has_trace?
-        = link_to 'Raw', raw_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default'
-      - if @build.active?
-        = link_to "Cancel", cancel_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
-      - if can?(current_user, :update_build, @project) && @build.erasable?
-        = link_to erase_namespace_project_build_path(@project.namespace, @project, @build),
-                  class: "btn btn-sm btn-default", method: :post,
-                  data: { confirm: "Are you sure you want to erase this build?" } do
-          Erase
+        %span.build-light-text Runner:
+        - if @build.runner && current_user && current_user.admin
+          = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
+        - elsif @build.runner
+          \##{@build.runner.id}
+      .btn-group.btn-group-justified{ role: :group }
+        - if @build.has_trace?
+          = link_to 'Raw', raw_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default'
+        - if @build.active?
+          = link_to "Cancel", cancel_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post
+        - if can?(current_user, :update_build, @project) && @build.erasable?
+          = link_to erase_namespace_project_build_path(@project.namespace, @project, @build),
+                    class: "btn btn-sm btn-default", method: :post,
+                    data: { confirm: "Are you sure you want to erase this build?" } do
+            Erase
 
-  - if @build.trigger_request
-    .build-widget
-      %h4.title
-        Trigger
+    - if @build.trigger_request
+      .build-widget
+        %h4.title
+          Trigger
 
-      %p
-        %span.build-light-text Token:
-        #{@build.trigger_request.trigger.short_token}
-
-      - if @build.trigger_request.variables
         %p
-          %span.build-light-text Variables:
+          %span.build-light-text Token:
+          #{@build.trigger_request.trigger.short_token}
+
+        - if @build.trigger_request.variables
+          %p
+            %span.build-light-text Variables:
 
 
-        - @build.trigger_request.variables.each do |key, value|
-          %code
-            #{key}=#{value}
+          - @build.trigger_request.variables.each do |key, value|
+            %code
+              #{key}=#{value}
 
-  .block
-    .title
-      Commit title
-    %p.build-light-text.append-bottom-0
-      #{@build.pipeline.git_commit_title}
-
-  - if @build.tags.any?
     .block
       .title
-        Tags
-      - @build.tag_list.each do |tag|
-        %span.label.label-primary
-          = tag
+        Commit title
+      %p.build-light-text.append-bottom-0
+        #{@build.pipeline.git_commit_title}
+
+    - if @build.tags.any?
+      .block
+        .title
+          Tags
+        - @build.tag_list.each do |tag|
+          %span.label.label-primary
+            = tag

From b6c670cf9c1e86748aa0a97decdd5ed9014f4f97 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 13:08:44 -0500
Subject: [PATCH 56/64] Style build container box; add check mark to active
 build

---
 app/assets/stylesheets/framework/sidebar.scss |  4 +++
 app/assets/stylesheets/pages/builds.scss      | 28 +++++++++++++++++--
 app/views/projects/builds/_sidebar.html.haml  |  2 ++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 3fa4a22258d..015fe3debf9 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -222,3 +222,7 @@ header.header-pinned-nav {
     padding-right: $sidebar_collapsed_width;
   }
 }
+
+.right-sidebar {
+  border-left: 1px solid $border-color;
+}
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index f22b5fb84f8..d910ec0ccc9 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -101,7 +101,6 @@
 
 .right-sidebar.build-sidebar {
   padding: $gl-padding 0;
-  border-left: 1px solid $border-color;
 
   &.right-sidebar-collapsed {
     display: none;
@@ -133,13 +132,19 @@
 
   .build-dropdown {
     padding: 0 $gl-padding;
+
+    .dropdown-menu-toggle {
+      margin-top: 8px;
+    }
   }
 
   .builds-container {
-    margin: $gl-padding 0;
+    margin-top: $gl-padding;
     background-color: $white-light;
     border-top: 1px solid $border-color;
     border-bottom: 1px solid $border-color;
+    max-height: 300px;
+    overflow: scroll;
 
     svg {
       position: relative;
@@ -150,7 +155,11 @@
 
     a {
       display: block;
-      padding: $gl-padding 10px;
+      padding: $gl-padding 10px $gl-padding 40px;
+      width: 270px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
 
       &:hover {
         background-color: $row-hover;
@@ -159,8 +168,21 @@
     }
 
     .build-job {
+      position: relative;
+
+      .fa {
+        position: absolute;
+        left: 15px;
+        top: 20px;
+        display: none;
+      }
+
       &.active {
         font-weight: bold;
+
+        .fa {
+          display: block;
+        }
       }
     }
   }
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 726c816716c..5b0b58e087b 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -15,6 +15,7 @@
   - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"]
   - if builds.size > 1
     .dropdown.build-dropdown
+      .build-light-text Stage
       %button.dropdown-menu-toggle{type: 'button', 'data-toggle' => 'dropdown'}
         %span.stage-selection More
         = icon('caret-down')
@@ -28,6 +29,7 @@
         - builds.select{|build| build.status == build_status}.each do |build|
           .build-job{class: ('active' if build == @build), data: {stage: build.stage}}
             = link_to namespace_project_build_path(@project.namespace, @project, build) do
+              = icon('check')
               = ci_icon_for_status(build.status)
               %span
                 - if build.name

From cc7b3db5a2d9a04d976c3db95059e3163a01ec70 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 13:43:28 -0500
Subject: [PATCH 57/64] Remove params from build; general refactor

---
 app/assets/javascripts/build.js          | 19 ++++++++++---------
 app/assets/stylesheets/pages/builds.scss |  6 ++++++
 app/views/projects/builds/show.html.haml |  8 +++++++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index c54d8fc2267..0d7d29bb0d0 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -6,11 +6,12 @@
 
     Build.state = null;
 
-    function Build(page_url, build_url, build_status, build_stage, build_name, state1) {
-      this.page_url = page_url;
-      this.build_url = build_url;
-      this.build_status = build_status;
-      this.state = state1;
+    function Build(options) {
+      this.page_url = options.page_url;
+      this.build_url = options.build_url;
+      this.build_status = options.build_status;
+      this.state = options.state1;
+      this.build_stage = options.build_stage;
       this.hideSidebar = bind(this.hideSidebar, this);
       this.toggleSidebar = bind(this.toggleSidebar, this);
       this.updateDropdown = bind(this.updateDropdown, this);
@@ -18,13 +19,13 @@
       this.bp = Breakpoints.get();
       $('.js-build-sidebar').niceScroll();
 
-      this.populateJobs(build_stage);
-      this.updateStageDropdownText(build_stage);
+      this.populateJobs(this.build_stage);
+      this.updateStageDropdownText(this.build_stage);
       this.hideSidebar();
 
       $(document).off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
       $(window).off('resize.build').on('resize.build', this.hideSidebar);
-      $(document).on('click', '.stage-item', this.updateDropdown);
+      $(document).off('click', '.stage-item').on('click', '.stage-item', this.updateDropdown);
       this.updateArtifactRemoveDate();
       if ($('#build-trace').length) {
         this.getInitialBuildTrace();
@@ -149,7 +150,7 @@
 
     Build.prototype.updateDropdown = function(e) {
       e.preventDefault();
-      var stage = e.target.text;
+      var stage = e.currentTarget.text;
       this.updateStageDropdownText(stage);
       this.populateJobs(stage);
     };
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index d910ec0ccc9..81fce55853c 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -136,6 +136,12 @@
     .dropdown-menu-toggle {
       margin-top: 8px;
     }
+
+    .dropdown-menu {
+      right: $gl-padding;
+      left: $gl-padding;
+      width: auto;
+    }
   }
 
   .builds-container {
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 70e02cb2d13..e4d41288aa6 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -47,4 +47,10 @@
 = render "sidebar"
 
 :javascript
-  new Build("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{@build.stage}", "#{@build.name}", "#{trace_with_state[:state]}")
+  new Build({
+    page_url: "#{namespace_project_build_url(@project.namespace, @project, @build)}",
+    build_url: "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}",
+    build_status: "#{@build.status}",
+    build_stage: "#{@build.stage}",
+    state1: "#{trace_with_state[:state]}"
+  })

From 5f6c6d6a0d8feee9b17d309e4da180dce7ca8ce0 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 17 Aug 2016 16:04:08 -0300
Subject: [PATCH 58/64] Hide `Create new list button` on Issues and MRs pages

---
 app/views/shared/issuable/_filter.html.haml   |  6 +++---
 spec/features/projects/issues/list_spec.rb    | 20 +++++++++++++++++++
 .../projects/merge_requests/list_spec.rb      | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 spec/features/projects/issues/list_spec.rb
 create mode 100644 spec/features/projects/merge_requests/list_spec.rb

diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index ffe8d4fbdbf..4f8ea7e7cef 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -27,9 +27,7 @@
           = render "shared/issuable/label_dropdown"
 
         .pull-right
-          - if controller.controller_name != 'boards'
-            = render 'shared/sort_dropdown'
-          - if can?(current_user, :admin_list, @project)
+          - if controller.controller_name == 'boards' && can?(current_user, :admin_list, @project)
             .dropdown
               %button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, project_id: @project.try(:id) } }
                 Create new list
@@ -38,6 +36,8 @@
                 - if can?(current_user, :admin_label, @project)
                   = render partial: "shared/issuable/label_page_create"
                 = dropdown_loading
+          - else
+            = render 'shared/sort_dropdown'
 
     - if controller.controller_name == 'issues'
       .issues_bulk_update.hide
diff --git a/spec/features/projects/issues/list_spec.rb b/spec/features/projects/issues/list_spec.rb
new file mode 100644
index 00000000000..3137af074ca
--- /dev/null
+++ b/spec/features/projects/issues/list_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+feature 'Issues List' do
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project) }
+
+  background do
+    project.team << [user, :developer]
+
+    login_as(user)
+  end
+
+  scenario 'user does not see create new list button' do
+    create(:issue, project: project)
+
+    visit namespace_project_issues_path(project.namespace, project)
+
+    expect(page).not_to have_selector('.js-new-board-list')
+  end
+end
diff --git a/spec/features/projects/merge_requests/list_spec.rb b/spec/features/projects/merge_requests/list_spec.rb
new file mode 100644
index 00000000000..5dd58ad66a7
--- /dev/null
+++ b/spec/features/projects/merge_requests/list_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+feature 'Merge Requests List' do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+
+  background do
+    project.team << [user, :developer]
+
+    login_as(user)
+  end
+
+  scenario 'user does not see create new list button' do
+    create(:merge_request, source_project: project)
+
+    visit namespace_project_merge_requests_path(project.namespace, project)
+
+    expect(page).not_to have_selector('.js-new-board-list')
+  end
+end

From 74f80465f6078b4a78ae2ebe4e367d4f1d7c890a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 17 Aug 2016 16:41:24 -0500
Subject: [PATCH 59/64] Remove index from pipeline toggles

---
 app/assets/javascripts/pipeline.js.es6        | 20 ++++++++++---------
 app/views/projects/commit/_pipeline.html.haml |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipeline.js.es6
index ae7369004de..bf33eb10100 100644
--- a/app/assets/javascripts/pipeline.js.es6
+++ b/app/assets/javascripts/pipeline.js.es6
@@ -1,13 +1,15 @@
-function toggleGraph() {
-  const indexOfBtn = $('.toggle-pipeline-btn').index($(this));
+(function() {
+  function toggleGraph() {
+    const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
+    const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
+    const $btnText = $(this).find('.toggle-btn-text');
 
-  $($('.pipeline-graph')[indexOfBtn]).toggleClass('graph-collapsed');
-  $($('.toggle-pipeline-btn')[indexOfBtn]).toggleClass('graph-collapsed');
+    $($pipelineBtn).add($pipelineGraph).toggleClass('graph-collapsed');
 
-  const $btnText = $($('.toggle-pipeline-btn .btn-text')[indexOfBtn]);
-  const graphCollapsed = $($('.pipeline-graph')[indexOfBtn]).hasClass('graph-collapsed');
+    const graphCollapsed = $pipelineGraph.hasClass('graph-collapsed');
 
-  graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
-}
+    graphCollapsed ? $btnText.text('Expand') : $btnText.text('Hide')
+  }
 
-$(document).on('click', '.toggle-pipeline-btn', toggleGraph);
+  $(document).on('click', '.toggle-pipeline-btn', toggleGraph);
+})();
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml
index 9fa54057823..20a85148ab5 100644
--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -1,7 +1,7 @@
 .row-content-block.build-content.middle-block.pipeline-actions
   .pull-right
     .btn.btn-grouped.btn-white.toggle-pipeline-btn
-      %span.btn-text Hide
+      %span.toggle-btn-text Hide
       %span pipeline graph
       %span.caret
     - if can?(current_user, :update_pipeline, pipeline.project)

From 43252ccbee64333634f13dd59509a1d19eef5c6e Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 17 Aug 2016 22:51:49 -0500
Subject: [PATCH 60/64] Fix tabs navigation and do not update URL via pushstate

---
 app/assets/javascripts/merge_request_tabs.js          |  5 ++++-
 app/controllers/projects/merge_requests_controller.rb |  8 +++++++-
 .../projects/merge_requests/_new_submit.html.haml     | 11 ++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 1bba69a255a..4e2273f5aa8 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -15,6 +15,7 @@
 
     function MergeRequestTabs(opts) {
       this.opts = opts != null ? opts : {};
+      this.opts.setUrl = this.opts.setUrl !== undefined ? this.opts.setUrl : true;
       this.setCurrentAction = bind(this.setCurrentAction, this);
       this.tabShown = bind(this.tabShown, this);
       this.showTab = bind(this.showTab, this);
@@ -58,7 +59,9 @@
       } else {
         this.expandView();
       }
-      return this.setCurrentAction(action);
+      if (this.opts.setUrl) {
+        this.setCurrentAction(action);
+      }
     };
 
     MergeRequestTabs.prototype.scrollToElement = function(container) {
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 00a3022cbf7..696f7192131 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -216,7 +216,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @base_commit = @merge_request.diff_base_commit
     @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
     @diff_notes_disabled = true
-
+    @show_diff_tab = check_diff_tab
     @pipeline = @merge_request.pipeline
     @statuses = @pipeline.statuses.relevant if @pipeline
 
@@ -520,4 +520,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
     @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
   end
+
+  private
+
+  def check_diff_tab
+    request.query_parameters[:view].present?
+  end
 end
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 598bd743676..0b05a2693a6 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -20,7 +20,7 @@
 .mr-compare.merge-request
   %ul.merge-request-tabs.nav-links.no-top.no-bottom
     %li.commits-tab
-      = link_to url_for(params), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
+      = link_to url_for(params), data: {target: 'div#commits', action: 'new', toggle: 'tab'} do
         Commits
         %span.badge= @commits.size
     - if @pipeline
@@ -52,11 +52,8 @@
     $('#merge_request_assignee_id').val("#{current_user.id}").trigger("change");
     e.preventDefault();
   });
-
 :javascript
-  var merge_request
-  merge_request = new MergeRequest({
-    action: 'new',
-    diffs_loaded: true,
-    commits_loaded: true
+  var merge_request = new MergeRequest({
+    action: "#{(@show_diff_tab ? 'diffs' : 'new')}",
+    setUrl: false 
   });

From bac19f4c5c62218f7c59894957548a25b03f69d5 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 17 Aug 2016 22:55:24 -0500
Subject: [PATCH 61/64] Fix failing test

Test was not waiting for the page to be fully loaded
---
 spec/features/merge_requests/create_new_mr_spec.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index b63931d9d35..775b38814eb 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 feature 'Create New Merge Request', feature: true, js: true do
+  include WaitForAjax
+
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -53,10 +55,11 @@ feature 'Create New Merge Request', feature: true, js: true do
     expect(page.find_link('Side-by-side')[:class]).not_to match(/\bactive\b/)
 
     click_link 'Side-by-side'
+    wait_for_ajax
 
-    click_link 'Changes'
-
-    expect(page.find_link('Inline')[:class]).not_to match(/\bactive\b/)
-    expect(page.find_link('Side-by-side')[:class]).to match(/\bactive\b/)
+    within '.merge-request' do
+      expect(page).not_to have_css('a.btn.active', text: 'Inline')
+      expect(page).to have_css('a.btn.active', text: 'Side-by-side')
+    end
   end
 end

From 163c4f5658d0b58dd5925936b3b5498adcf60fb7 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 17 Aug 2016 13:27:14 +0300
Subject: [PATCH 62/64] Refactor description templates documentation

---
 app/views/shared/issuable/_form.html.haml     |   2 +-
 doc/user/project/description_templates.md     |  41 ++++++++++++++++++
 .../project}/img/description_templates.png    | Bin
 doc/workflow/README.md                        |   2 +-
 doc/workflow/description_templates.md         |  12 -----
 5 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 doc/user/project/description_templates.md
 rename doc/{workflow => user/project}/img/description_templates.png (100%)
 delete mode 100644 doc/workflow/description_templates.md

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 210b43c7e0b..9e2e096d5f9 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -42,7 +42,7 @@
     - if can_add_template?(issuable)
       %p.help-block
         Add
-        = link_to "issuable templates", help_page_path('workflow/description_templates')
+        = link_to "description templates", help_page_path('user/project/description_templates')
         to help your contributors communicate effectively!
 
 .form-group.detail-page-description
diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md
new file mode 100644
index 00000000000..5f1cd126425
--- /dev/null
+++ b/doc/user/project/description_templates.md
@@ -0,0 +1,41 @@
+# Description templates
+
+>**Note:** [Introduced][ce-4981] in GitLab 8.11.
+
+Description templates allow you to define context-specific templates for issue
+and merge request description fields for your project.
+
+## Overview
+
+By using the description templates, users that create a new issue or merge
+request can select a description template to help them communicate with other
+contributors effectively.
+
+Every GitLab project can define its own set of description templates as they
+are added to the root directory of a GitLab project's repository.
+
+Description templates must be written in [Markdown](../markdown.md) and stored
+in your project's repository under a directory named `.gitlab`. Only the
+templates of the default branch will be taken into account.
+
+## Creating issue templates
+
+Create a new Markdown (`.md`) file inside the `.gitlab/issue_templates/`
+directory in your repository. Commit and push to your default branch.
+
+## Creating merge request templates
+
+Similarly to issue templates, create a new Markdown (`.md`) file inside the
+`.gitlab/merge_request_templates/` directory in your repository. Commit and
+push to your default branch.
+
+## Using the templates
+
+Let's take for example that you have created the file `.gitlab/issue_templates/bug.md`.
+This will enable the `bug` dropdown option when creating or editing issues. When
+`bug` is selected, the content from the `bug.md` template file will be copied
+to the issue description field.
+
+![Description templates](img/description_templates.png)
+
+[ce-4981]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4981
diff --git a/doc/workflow/img/description_templates.png b/doc/user/project/img/description_templates.png
similarity index 100%
rename from doc/workflow/img/description_templates.png
rename to doc/user/project/img/description_templates.png
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 993349e5b46..3055411c484 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -2,6 +2,7 @@
 
 - [Authorization for merge requests](authorization_for_merge_requests.md)
 - [Change your time zone](timezone.md)
+- [Description templates](../user/project/description_templates.md)
 - [Feature branch workflow](workflow.md)
 - [GitLab Flow](gitlab_flow.md)
 - [Groups](groups.md)
@@ -17,7 +18,6 @@
 - [Share projects with other groups](share_projects_with_other_groups.md)
 - [Web Editor](web_editor.md)
 - [Releases](releases.md)
-- [Issuable Templates](issuable_templates.md)
 - [Milestones](milestones.md)
 - [Merge Requests](merge_requests.md)
 - [Revert changes](revert_changes.md)
diff --git a/doc/workflow/description_templates.md b/doc/workflow/description_templates.md
deleted file mode 100644
index 9514564af02..00000000000
--- a/doc/workflow/description_templates.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Description templates
-
-Description templates allow you to define context-specific templates for issue and merge request description fields for your project. When in use, users that create a new issue or merge request can select a description template to help them communicate with other contributors effectively.
-
-Every GitLab project can define its own set of description templates as they are added to the root directory of a GitLab project's repository.
-
-Description templates are written in markdown _(`.md`)_ and stored in your projects repository under the `/.gitlab/issue_templates/` and `/.gitlab/merge_request_templates/` directories.
-
-![Description templates](img/description_templates.png)
-
-_Example:_
-`/.gitlab/issue_templates/bug.md` will enable the `bug` dropdown option for new issues. When `bug` is selected, the content from the `bug.md` template file will be copied to the issue description field.

From a6985c77e03daea9af0077eb219cdb58724e29d2 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 17 Aug 2016 15:27:18 +0300
Subject: [PATCH 63/64] Add new image to show the 'Reset template' button

---
 doc/user/project/description_templates.md     |  11 ++++++-----
 .../project/img/description_templates.png     | Bin 57670 -> 20444 bytes
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md
index 5f1cd126425..ea7496af089 100644
--- a/doc/user/project/description_templates.md
+++ b/doc/user/project/description_templates.md
@@ -1,6 +1,6 @@
 # Description templates
 
->**Note:** [Introduced][ce-4981] in GitLab 8.11.
+>[Introduced][ce-4981] in GitLab 8.11.
 
 Description templates allow you to define context-specific templates for issue
 and merge request description fields for your project.
@@ -31,10 +31,11 @@ push to your default branch.
 
 ## Using the templates
 
-Let's take for example that you have created the file `.gitlab/issue_templates/bug.md`.
-This will enable the `bug` dropdown option when creating or editing issues. When
-`bug` is selected, the content from the `bug.md` template file will be copied
-to the issue description field.
+Let's take for example that you've created the file `.gitlab/issue_templates/Bug.md`.
+This will enable the `Bug` dropdown option when creating or editing issues. When
+`Bug` is selected, the content from the `Bug.md` template file will be copied
+to the issue description field. The 'Reset template' button will discard any
+changes you made after picking the template and return it to its initial status.
 
 ![Description templates](img/description_templates.png)
 
diff --git a/doc/user/project/img/description_templates.png b/doc/user/project/img/description_templates.png
index af2e9403826121a061c882ff509c8ba5653673b7..c41cc77a94c0e888f97e376603f45e6c3feb24ad 100644
GIT binary patch
literal 20444
zcmd431z42rwm<v~-HkLz2q@Cs2uP`fQX-N{cjqulBOxV7hYCnbcY{bODFX~Wba#Hw
zyzk!U?6dcKzVDp>|D5ak<^rynXP#%>xz_sq)>=2=n(E4gc(ix`01&FGC_V)MNGteT
zfP)2Ip`Bfs2Y}mvs^SA}ue8mXGd*(8xt*IK#F*@Y?@k>emD)@sjzr`&xwD>Pr%f!2
zK~clQPRy>)wL132IXNs<w+v&YNsdXr@gCI6Vkn?7-|vXSE$tECaZPzFaKKJ@AQZ29
z%0xm+TKwRqVv77W3yT3E!ENxP>i^W=8$k&PJR;O9x=Q2}?|oR<I2+dg-e0~4xNl*D
zgX)dm2UvuJg!J@rjE=L74=gP?FdpcSAqw{Pob~VDN*=I?#-JuJdAq*3*%?aAH0M&M
z>w8Zzr_PY4vbs8_qQZ4-g-=E%IyRQ{^y*qC6`h+Ki|;`b^orJ@#<wc(LFKDy2T`LI
zXp;@RM*n`K@mo`XTw6h*!$#wcRd4ai!IYgy=~T6~Hy;c)0`f_*6ZrMi3?QdKR|yY;
zeEQr8uybO)CnH5yc@z$LtVwYD4hz=%4`k@cS=4fBiUha0?|_Z*!xF-%<qXuoPMQIC
zN%>)w3Dm6^UBFWoGr;;T|DS@{J_8~<-{roo0n;PREtLWtu*|8VN8(j9YOYTvopaou
z*TmwC8v?S7aEwGXN_V^I8^+el45_N$cPB5zpf?X|lNo}CW`n1m$(oOJyCwe;&8l4x
z^<y{*`Y^F<nX{ydc&hF?uwY&%_7p!$x3p^>>rv+s7inu~i_XH2XMNM6hKrzd|7tA)
zLPAq3E1aQsqAd1(@x#lcg;cHm978I74?a;ghUshMVDioJFUon)iZDpTh!z|FJlZ0M
z%DxP;=eWV0VUP8g$}J9!t;%&Ct8N+Yaj8Pm@qW71x+OX&m-G}TG+<q4P7UMzisb+%
zpJ89N-K$Njj02A*VtjHL*iHI$NaW>+6DAAsL~RET$5UV+=G`62*0GG8U%0KmX7C*o
zT5OhRc9a7qNkgqbp);QK&d%|;*zL!ZBj}ts4pOyF7<5m1hx6>@exLd7;-F2H+J)ZT
zIT_xvo5{<1TCh8~P54sJ?pO8?yUg;fwTryt7Mrp=T$Bds5J@8Xo(70s|Hh-oy<&&X
zLT&-RH+QY#U6E-OqkJ$eH0tXmZ@pw1=j6kStvuPbg)Q9jEQa7YW$0JZmdfbv#^*1g
z>}nbA3-iIO-_=B!1wA>o{Ua_PLcI#e&gg!b{`ju6Rv;01igsW$dv-#(Ib8`+dM1JQ
zNMrsg%XS?q++y;~;@&R-S1srH2ctb6ITs92NgtBmAFcU5TP~^`A+!Rb1Kzo2Pi!c#
z=Izd;!3+9^ItvDQYu)T*zx{gh{T^rc#sdx+*}90AsV?tRKE4w?kx`b?RZhuRbbC(f
z;wlhZRYy{T&}aD&ip@7ZO(lr%dVMt&84`lkcz!}BW%}$$-}mQfBZP2>jx~dPM3oyR
zX(MT3+k%$vjNQ#)jHym+GE%_(ou~ML?+vG2$IIF>4)ljDo*n#7n6xh~R-MmXz5sMJ
zc?)>~p%6d@NtHiVpC6-ldfmHo9`dS+_C)r$!<tU%pyQEMwU0#;W3nWyV&J(Ab*nfU
z=c%8SbVf|&z|h>0&-?+dpaXg*g4~Q*60h`%;m}9=+TF{1wuDEP+`8_0zRxbLw7+z%
zubbenZ_&XYTBIA$Y0i{)hma13H36-T7vEx^xwsnjU2S`Oq9yP;?L|X&;>=!oQ|_<_
z(4-D+DMHUE-SoRn=+=}5n(66l;ezJSOxr%^<+ex3*vi8fYc$`UM%Mn4<X`l7I}}Qs
zS8cj@j3m9$Ft^VGJ5caka&NPb1fwlVvP)cL;9hG?(oG2KZIk?E0fG?i!`ds;7#&<%
zc%WqL_7?-{NSf2R-Qa(p?&Xun`In3DdU2}TScAGsvmrap$32ZLqiD5N^@M;Ezbxg&
zHr5Gtk6<3!>dB#esjykABqe|7XWH&49g<6OKI<_rKHAIBIY+uEuj3(&?-C@_me1kQ
zZMEh1)~h>CG#KHw`D3(|(GQ#JGq!wgdjRHtn_wIuQ)8(|3WGLABP@86b9%gIc;jgG
zp#PfJ@pkP9PmwM0OAjIhtjz?*di(a=+JmocFvJBz_OeV5HZ>vErM3G|-L&9OjKH?A
znDOt%-LRg>%7n=8Jsxuc0wQDmXRgvS)uauj9*QrIm;0;36e3*zn5-`1ybN;In-A>?
z<(@Xd@_;oKdI^EJLQN(#?7&UkXSKeL=#6^jg*=jOsGW84bSTujhxok%z~SQ{U&z}U
z#tW;Ui_8Wjuz2K($C)`eENxyn%2_z<GJOzrdBS<#zyv{XMt+grow|AWtpEeqUGtK`
z8}tjW2X(qEuZ1B<Hz|6*Vq%YZ)6=PX!yMD8MEnshdMySdvWKJdtr0~161~ZYX>V3u
zXvA|WV~+})5$b)+IqIS}ZSTpP_3;5U(N8&th*<F?^wxv*4i)~_i~3_v{Jvo*EYO4Z
zn6$49q~<9>d0g<JQ348(^cxxFfsbmN@FqfWcGl{QQ~G5O!9altk1scy)!VFmuRkaj
zRoos6tGJ~+3P+b)jJ|JIa4FQcKj~_`>bLmP3j;|fD_0M}fNj8kX}Q(V>3w_Fj;4=U
zB|_NzJlfE6d`oeq1X*^X$6Ud8dJ_<%6{;Ib++r`Zpk2egewCA+YqDYgaOO;4wMt35
zi8j*v>P<2vQrhyaDUiel+dB!;pY(;vETu%AE_X=HqDSJ)^_c)o5HYN`Z&I(R>1W?Z
zWX=)})m=)ap0PT-6pN@#a2su;d22q$LU5N3c{C{_T}4NO`Pu98D<-Q4?=|;e*SIl~
zs<p1Vf&$`K>yBRi<occe`F`C>^YEEk+X>E~C=^zSzFIaNI9N+A>hkzmsN742;jd%)
zTN&Q@j6j;gL~NQ5z)&Trd1(d!yEZ#m3023e4+|f*aGV?G$GFECDPK8!dSx8$eHH5_
z9brrq^a0%HPZ-eB%?F>h1B0wE<3Wns+&4SV9m!F9dYf~Wkz3B9t&WC6D|ujWIG_hF
z3o(Nk-v*QXP^OSJsKE!?0<o10*E6^DlVfJV8`{fl^-t6U`5WO^lUPz$eAEP11d{Lg
zbb*!(#G5F1MljD%6+=0M;&PEwMR;LyDO_p34=H#OJg9dMBVe;aCNJIvfMh{6*bi;o
zJ5~93?;T`o@OBptSv;QX9zMSm**?L{RF-cI7b?ce6QSKZS%RaZm#V#QM)DDS<glFa
zIK8%R++vT=m{A&9#qis9p62R%pxfK`yc8RTd`S1cd4qlWEiAnGWHPgfe}OGo-}M6-
zmJ=g{-b)K*j;FAde<H}GmTP4ug6xxK7cY8zQO;->^!;Pe?T^Xveti9Tx%Oh$6^4w6
z{oqP~K)jBilmoon&FBR1qURB%(q(SY_TVe=@3SxH>ivtB7ZK2&whGT-Nt@6i>1b@q
z)bh1FJpk5C4uAi_pTx2G*wm~&A|}dnw@h}woYK!+MU>X5hKoAr4RL^(vd@nq2)&gQ
z#xoygiI8rSHTV9y^ezlO*S;aI-&1ei%sSTU)DafYK|4E_$X6WNur^EVAIK#mrl}+l
zig%8H`jDHqJ_bNA44?RG3=78qPVr#a)}5Z=N#P^n)bl6opaWL8ppDrQ*S<$7q61BH
zhtFT|W#-aVaXgAmw1Mebb`A#S4X^DF_(%h_%7`2<S9Z4$Av;MYGGpviR#`0mp0v+z
zA!*70db24#?~hRRLWKvt41nBFdS-0V&xHZSUE|k#$3go2(e36}5$nc8EF6M_Uk;-<
z3r-1*yDe_mlh+^=XzEh6UIeKk7#hpG((c@qb|uR)mc;9WAIwKW+^C<>Ouq0SdKupm
zDc>5boD`FLn~MQ-?Z@=zl%)-p(Bn0D?mN!!z4C3x>725jbWwU91GKF$M~ployTD$n
z_GpC@<n*8!TJ6QTd76ZF7{Rl9)myS50ij=v){bXoBeZi#9XT>(T?hQL51wd0#k<|r
zBFxaL*u8`H@@4qpXUJaA-!Z6@J3p*1@UK7ppW{=50i=6Cfb8Y<DxyjC7YKIqCrXVw
z7N1X^+$ZZ2tbs>?A4{i>dwP2K1q9l0*hxUN>+a#P&=E=;dHW7VOi$qWxUQRrN68dD
z#)H<=Q?c`l3saF)aWWGSPOFh%fM4a5my-@<NH5O4KeV#5Q&d*QMtcKbJeX5?Up@t*
zWT7k7TR0eE;A_FAQ-Oe{6+=+k2in2}{>Ws;1O^7O@^qhE{W_#B5yIko6Vx+=JZQ72
zYBwt{I(PO!F_pCrv+`E(3i6=X00VrSlp88#9u>Bbh}h}*{{8z`rT37>B#1@i$;JGU
zk7>C+wJb}7EhzogJ4~ZeQ8$$Y$R|wvfFq<wgQ>{D3$8HE>yHB#wKLmcdT+RbA&&tB
zF`XaywM!kf97`NV#czV7K1v_T+PKgMU}GfE(~-r!)-^W)m?9glMFov|9yw!-WfyUv
z01VgUd|o58qYWU7Wdli!7=5&kIKdBq9kvFkgl~bIP4(?>yO0?NOTgM0CHo%Mdqq<q
zT;(gZ99b}gjita0P^G})yWSF7H~B7AH8r9l=4Y5>Wb#2adu0#f!)srH+u`j%iOi4}
z9S_3|?(em`!|Zt`FM9bK*HUn}H7Xg7G!G#8+V|Y*bx+_Sx6W(3`x+M$ZEMMgGNjs4
zW15oH-os{N9Cw#`1>J}mKKP~nDUYYLm=gZfO|x)pQfpsOoxZfyBA)2WrC@gYclBJN
z?*5TNiJ{M<S`Dl`^52F5l+0KXr@7zp9H$$lExQxO0Z)|ps9Sa>q`mhEqFaA;_u7dp
zZcLP}uCB`I=~4Ok_zc704J^jr2LN^e%gKG_cRD0dEqGn;Sxg;bET*I^eG}D8)R@;z
z7GA30lVO@)T3T>=10IYtFQ+|fmysy&il(76gn<arnB*zl5V0k`Hf(eB9qvv-oH7u9
z;yP!fBmV8N&uZkF*sd*iQS+)~**q_=^H)12fv1PVYtOX&Ht*S8f2_HZlqI~Ecu#25
zV5G6SY9znoi}AIBg8dzllsHqBzP8`k_GML~S+8twxfw`%B#tR=nt0N>f0sA~^fWGm
z8XvPpu6c_+yOA;T_5#eW2;QZi7?=^gn=uZ!3Qlq~Rx*ShIIo>>`C+Q$@WBducD6&5
zibL)qZTjKhdS>ZvWDiZhd1k3@T497=Wf15|ZUnR%E4ySrEzs0HqvO%hVR={>!oOiD
z#$irkTQ{^v+G`{H%QL-|iFjwOf8L(6X#xUxxv&w_+S95V*1wSywJp=idoauEm^-+)
zcOCV8(gQ%++BjDi0rwK|8cI9|YhNPz^29P<2dRB-AG;vlI~{64Ru#{gXLW_-s7=>-
z;$!-7kJ3s%CH$S=>`Y9hR)OluxdrEf3@88|ZP*%*)NuaFcN!Dbw^cp7zYBDq)7+BW
zsk*aIY5eN4o%kIO!yo%sFUGc(2z&%Hucfnb23$&sMaDzlx21RkF?cAEv#$d^7nt(L
zY+h~GG1dD|G|la^-bD4+O$+Z!f^NWLv|7<_#5Mps${@-=KwX+@ipMTkH;KVrdBu}>
z{=%B*?VQpV^}vM9Ra3{=SW;(BXBqgE^(eFW(QU(ctsDJ1T(E6R*%uIi5$+0Z{v~>c
zD6i?mwVp4~FX1(s1=^GPhwPP7QZQF=$v&Q>uwv{s&+mktUd`+>_POE_psTR(gUcoE
zCQaQcXly>~a31Z`c)$ntjL4t9%gdJrd>4`VLcVXtJO-qk?>!F})B2cCHFYXU!G?b~
z5G}04pX}n}%xDz<lsoXx9|N1r#tA0J5WV((8uQ~DncWYyP=n$SnJcT&OiLe?m5SoE
zm<PzCxeI4e4vnJS1_@AVS@!NsQ4HN}xl-MZ+H#5Y{W@q!SHG|QJeOP?HI~!Ssi84A
zl_ozLXbwC^JV&cb3IGE*u`=%TqRHGnnZY`G;P&b8{v{*P4qgaf%Yy1E^dh4=Cohjf
z$j3KVS`@>Ovp>in_3dKP`p@ZeO36rx)sYy*EAKC%uVmmUq^<R9kWFx#$Xi4Lcn~Tf
z8{wzlY;*5tURdh)H%^c>W2?k<03{`Tsn4=?Z8cAz>rGrOmVgF=IFtv(W}Z2By}~MX
zV}|#)FMPpX?jE#sxbk4bOpzz#4j7}zJo)1B4#7Qkua>5hl}j3_#kP)^7lnC7z1ylE
zrC~Sf%?o~(#Lc1NnfBZwu=B_t!>>1xUrpv>0@BI{&n{7GW<Yv$U(@vUAlhrd`X_bk
z*fOnO`2F--HdVKRWp(B{_i`uWG6?Klh_IU4Jk`xGNdQJhq72~M&4kV9cp6N#Fod~+
zBDz<Q+MJuoL58?kh6-6S-I+<eQ9h6r%v>R`0EPb;S{%IcNs}}PLXWYK5%nA71p%%K
zVvlaNMrd(mjU`|E>vMD~Xrtr)RsBJ&j;Fm5+`tadxkrgdq`UC+i00KsrKar@FLQjT
zeuLCYVtW@6#;VAHjX&pa!b!P*2;u=EI0{Fw_elCvVr1W=vbI++-ORW47cq0oOCKXz
zr$K-!atYnGT(bQ9AoD}8|7**=u@%A@nQ<3{B1cIE=R=PaQrcq17ZE>xO3kG-A~3df
z^ltM?V@jAycu+8O2d=!ymsQx<BA-moQE>Tzm5^TA6Zn#*0!wrEx%2iM(Q1`JvcSRc
z;@(hQ@xvCh$Fd>y#*f~cjxr0jkPx>UJ@=FqBZ^mlcey|A{fD9$bU40cRy76gYN6cG
zw37uGS?ddfuxWu|FzxVTN*5t=bd;q_$fs`YOd^3?LVe1?ZQhm;J%fF3x6<8eTau^z
zmm#@FnpOHmNMB=gVkhVqweLIzDu|mx#w0?nw|Q%gpAkhFgmUdDC)to6?C;j78G74%
zya<U`G9Y3po(s-*FA@R6k)Q6Fq9tFrE){<H@JKT2(eHPO=SIJ~?7p0s&PM`jgy>*c
zHn9wH*dURuTd0sHj{la9n1{Yi>6yUcT{=yVYeuPfS*r_U;mNo}yy8I^19tS{%#!sq
zN#p6p4`;g{LJtZ>vrkt)4_g-6R6KL~T0=MXS~7bge{U#=>W^5QmkrW5HT`WzY34#_
z+sp6$Di3@HiKe~AhygD!g0#1_OCy=0aDr<bdb@Tns~+ul0T$?qPWQaHL;T-_*{7{;
zcOLy9`;@m9`^^-8T{e<?OhJ<4&rzY{0Ks=9F2&C5DWBw3-)^YH+PcauBlMha&mf?<
znk8)6po<%`nZB7M&a<Z;Am+{fO?!D??cle)iaM8kM~g9^&~TKm4w8Q%70+b-m@waW
z1d=&~3lUt@Nli!dUomPty(L8fKRPEHrDZjsm%))?GKfL4+8+pdH5r|<8-G<d?n#Zu
z<g;MvhR3{Iy%>+E@ck8AcjD725;wBHm;adw23tw7AI?kS{kJ}6qwB|(DE}ORo=P_j
z+eT6EsyDf~=zlex*2j$55+1c7H0WWGg{`4N9=f^go9JEh;H18Pac$A<K7vjSr2*7m
z(aKNw%f!kql31PkUuHP46^_;ZM&fXvh#O>S74BK}Gt^&Y_%>xPm&77a3yN4MpGKjj
zuR%m}pm)K3p)^Nb3sf0|rlqA7#5O@b*0ssH?;q9#4zK^xf*woA9AcZ3H^$uBe$E(a
z<(#Sk7*l*=E?q!})uEsI6J=OG6MLT$iGD+%Jkx!$!$!Z)J;6j0{^#Db1N;XyK>J-Q
zy8hNY3(v;hpr72#uBkX*(ip30JnXApVB3Xa_>kv2!nrFc@_h|IEWS(t3(4m{i~TI#
zIm?@KU8EV?X}Av{BkhVSgV@QmV4hb7;@m#1X|A*pwrSv4G1U8$48K7f5gJs{PWa>?
zEcrpr*Ii<>)tVJR15UxnoAp`1P(4vg1Gz*MZOugo@f&E6ZgF>@mfom6A52m4Af69G
z;7?SB<l5F@3NbM6Ean{_wl~sVQOGok)XN-5E{n=OI<ueNaW(l1Uit`Vjn8z=8j^zP
z6(jhhCf~`HYR`2!9quYNl!!=T-u0H9_kJXKU)oqpFE(ar)NGO+kxBOtRMkADJ~}D!
zjBh1jaVE*((9^H;to`w)oqC}Sk<Yi}Dt`C3wY8OhGH1TX48oZ^i6LKo_N(lo$K31s
z&VDWcQY!2*<=A+OAdu=E$C+Dgroe`NMoq<k{;no0S14$PY<srqcJ}sU559X*C-5q7
zJzMb0qTDj&q53s{-x-z@d`#A<@fCJt{i`La4~sLyqnU>|ry<UboJ<nMM3{Fxb4nC&
z#GFdM(m(&wD^A}+Mk-o>{XWd9icJw%)TvZqr$s4V1jJAYMB`duydnvV^D9!cfB^jU
zU35+-@O9tiJ{D-$?u)<>nUxS`vG$u(kdv5aD<oITlCG5BfEYaiWW<-@>r{X-u&YiK
zV+`vdM)4AFBIe4QUCg%^3A-fS?LZtSKH=QS=^1((M==K==8r}%1My(un<wR)U!I$r
zOGfTuoG=h&0(lxROM#GU7@s8u4cHB4NMvLtki?X{i&y4@5m}2y?SV_}hDYs$#WzQR
zVofX55CREIf(DGp`oN1gTt_Fw0wInoNP5_`ZjsA50@<fg;6qLr!;++ON!+mLy*Vo+
zsy%Z*gt6Q2w-@gr$^dJLoIZv*6W(iZFu@qR7rxMpR_#khci+7mMAdw#0T(tlc4+=y
zz|PceZ4X^U7RRP^n-yx3vLT00nvs@AIA8<2EjyFLQmZfKpOb5`*wF6I-%OXAwvxie
z$o({isZ0RtkM|Er@<mDfDttOArC#kR6brB0hlkx-1m*j1pi#SHYm^*ddEq2{==DRV
zzP`?!!3Ia=_8U}o0|VJngP*VQGqf#Fx}Z#djEz<<M%HU;KkJ!Xj~KXUk2XLt65WB8
zq3T{3UY8Y_xIa)+PHeJ^kqohfLD+KcoJhma2Ybm)FF{P+_i7J9F+2#6{Up1{9*;QQ
zo3jk3ku%T*_dypq)_YwL2P&etH)RJvrX}^<3TS~|MMOsvxw*S%=jCBHH8t_24)n=@
z{I!e>vRU`+9X=ILKQ$C`deBWdDq9oea8a_2w;e!Z{DUbrOjoW|GGanwd%?w>vSfU0
z(f{Im&Ul9&tkO*P9?U&P(xe8?iUs&VXJ9Li)x-9A*uy_hsP!D(!>+}{t<EAFTi(&9
zlL>shFSO($Ud>cT)DU3$08A`(6=?&GQfrwLeqXSiHV>q=Ach}}F>|W=q>st4x+IF8
zeOXwzLauJ|FWUCmUK%72eS93UnL9*PDFY6$-v-;sXSbdAWVYd!^Y_YQ^`WIS|I^bI
zN5dAwz!a{D-HAftT@9Hv#MsNWM;p{B*Y$xZ>o$k=SNQ%aVOEfgP5uWwNsHY{))#1P
zfv$DE@B1jNs(q17DA|vtur+Z`O}(MydXD~qh@H@YeLCj`<Ll^pS%lf-N)TKoLe$gN
zx#hKx+YQ&z#IEB6&Lx!C7(&Kf5w$_7NfYz%rN!00;41-|h!m_pMfR&<merrL*x1;}
zFYaiG!Y09RY8#a(E72P~D3=Y7Q3&^@KW0oZZc=Fr?#xX$;w8R6b(mGG_Quk%#puJA
zD`l5h;ONt1ast|*LIk&qlN0ggj+7B#-jI=&=w_6;FBnviJ*=@Y;aca#?$P{)5L?j<
zr6yTY?$X7(_rR$%Yo$vr-+VU4{{59e+V;oflXEcP$G_)?Ly=4)7qdn9mDec!XeW>#
zrpVQ|Uqm7Bk-)l(il6>g+xCR}a8bNM0UZAXEeA|4MucAg&5gl@qHy^n^k!1SqLOae
z_)txx0TU^=D5R#(g*m=AOY>t{VHpnm;Fmm8sD9q#t_~6Sbm7N8o~{9^XKUY{*I4)k
z5WyuF7ZyHCQfD}|i>yEZH>rm3l)`{4+g7|9c=&bnEkF7b#g|N^#TbwqsrtzF0lF;R
zds!MYumy9fy>lIg!+56HWJl1<fCIVJT0YK^Ur?envD8C_(ZVpagXrv9r=9khln}S%
zl@XDCI5YMrzoahcJXGVSc%Q1UVr9LO>}aSA$E0{n%pEZ0X?FTDOR;jgTV_^yZ77d*
za5e*kVq77h=6SV)!v-T8oEd!JZJ<6!aDYod4cguXT<{i)JqSToAWB1z6^bbt79j*;
z=wM>CG#Fd6HAuNN>zN4<Zq@5gJeMU{Te^3O3FcpW<k43N0nmJIk`2E$2fwzy(zJaD
znm5xVpn<n`$P}=CexD77_EtkFRHHSF3pR@jw)SD1xJvg>9fNNHuXUb$j<Ekav>0V$
zn;{r)Z}1K<QMPxC)uffQ_2z5MJc1d4H<S`a_ET0t=5j|;gg^`pw7{U@_KPnCa!paD
z5^I<j$dKDrOeWO>V(ObtZ`SQkv&VmcE{}OR-eddkwE#Akr9O0wCtmyuDN+!2l4&G3
z4fk)6weFrk(q)(_+91liPF6|WUKUn8UceST_;QWhxp>F(!ih;>4ku^<x!(i5AvOV2
zKXqXYGm*>@;$-6(NVky?HN3S9B@zqFoSz3RdYJTEOJDHP1xcYY&bv$?z~op^4gzv=
z0~O%S8YuxIk^4D@m|vS<H9LD|E2@<P+Kjp8j(Pm++$nOL=KWMIC;-x5ZXsB!HbzSe
z$7-ryyAOKX5U$T9C?51sB=Q%;#*@BK*RH>Hh9vo1U-6V&`1T*3(gA1Wn4?|l*cgl>
zeVYUZ^@&k#BdnYn^;sJXXc<`l5n%#hKR=8O4~5gaKpTw;gi-#%9TeGg{zq>3mIkq#
zvI~059ti#zW-A&T>!y_kG_Y;3gZX&Xgk>U=?l<g{TON}|tf#~JF$tgCPnTzQ<BBrF
z#zB6e_<S3%V6+KuEa9WH_C;{_o`+l6n}g3K5}7O#k$<}<6U4JKcDKC6UC8bCtR8N#
zfS}uN@zYzc8xFFc-3cbj`|(QP(!%+EFMYU5J<3UbMx)*p|9O1O6Zw@wD6(Fm<|7v@
zH0qvR%OSl(3v8ZO!&H-I?{blf-~#QDfHF%Q52_CZ@g|`CTiSO&Eng?KyDs3cDgyAJ
zlHfJkZt3i0<WphJt!nPx%P^IxKiV*Y;6Y@&?{C$5u+g1g#-CnOq;F8pbrmbwm0AZG
z19s`W*%}5hdLlb<{V`#mqCj+@doC^4(nG)ZwZtkKi1wF4w;#Oq>XYSd&qvJbMu$AT
z(_t#0jRU)nzUp2n#~weQ$W7h)v<c6b_I~#Ac&V&1#%_>mRH*3=4H>C_54ezAN8)l9
zonrMZmx1IBPqX?Y7$q>y?ecI#xF_asVLVPoWb<(gv%r>>D1T&Dnz`8#=oV6XBn7Ch
zC@KE><N4z!eEaUhw1Ru)%dZcE9`;M0V>MJnsXV=7{!HtR46)EdjIx7cb+$F3_kGLR
z?ynuV9+rkOvl(oFy}Xmrf<J2Os1yMeRq}hLVKw2!RBaRIl<)6HX{n^R2l{`l1##G5
z8!cPG!Ovf!q>b{sxm!o}R*6cDH3yG1bE=~MyaNUcDeQ?&{i6Jh8Iv81)hB7sJ*1Px
zRskzL!YL5o9!_ESAKj|$C=&c%(S{!`SY_4~qyiu9x_3+Z58}hf=uxoL6Bvo0;}a93
z=I^A18WZ@dcaZgikTwz=%?C-?$54Y0uU^jkY&%jh$Tj2Ki37c};`3qv?=79@P$G*?
zVW&?NF1E%*hxA!zmAlCNQnoao)wn`|$Xt(LjQol1YzCRL*jQ~HE>NbI*Lgkub9igh
zKT(rYP$7vo&(^820Ut?x%j8Nzd{*7deDF=!0u$J$B3;0kY3Skkn|qZ<QD%Pm<j888
z@(l|PU{1ju_v?CQPLDw3HW<U!D^k#@;TAK_q`F}kkasyI2U)0>e;dbzA6kB&=)8@&
zWTO#Bkobz6;$F<3!*TH@OHg}lmEbWo=jo~NdAN0fFv!7nN0#`>`tSS=@3h3oOMLt6
zKBj=)6lWYa8A$)-n$GIJJQ9=;ijr`}mYl<}y0t|ZMd}C;^@)F9R(tj8)#E5P@}~lQ
zEkk%)0~$`-Ndk5=37EMq3?d%_aEd+4A=78dj;s6AuD5f%P`k9y8E4c%9KVi*rulhB
zUJTcMcJFlP#Sp^Os{P%{)?HVuGOIU`G+QD?iW`*n2&1ifRw*ziEk4b&UlE9*ajByx
z)b(5iLu{9awnT9i*O9fx1xCTrgde~_*F>f{7T-91m<lcG(JJ+~)?#tNM<LQ)X9ZLu
za884anO24hhPRFsU)^1%?TABq_Yvqz`4ps(N+Ajs)g~Hy^xV~rYIGoDOQ@}ESpv*6
z;vPs+eEHl>U{WMb5-Y?9WBc*dpMYhqbLQan_u;~9&9AY>`q5PB<N%D<bBJXmU)jQg
zM=jb|K|#kz5kQ|crJqR*W(y`053Yd#+doAo)9n@G?$M-1+}rccvK|DwQ_xAfWWh}}
z@A>AxxRL)C?f$<gQy)$1mjR{kufEZAGzbh0-9eTM%d^L4&nz2n6_AjEb8KCQo~%0!
z108l)xnT%`N+ENk%x=RH2w%YeQ@aF-tNI-oAC)y_T)>mWVWre^IbtX-S4i2~w?<39
zv)z6ch^gPA9$iCjgoDy5CZ!a0%+K90e`Q|NNxHDwq4E+U!-7eCg?%5Z$91)10(gKG
zO0AMXwX)tvx-M?lJ^f^ps9(xIKey&n%MtLvte6-Gf}x9QB(!F!zZJQIt>ftk!b;~L
za0}}S!s`9VOGK(WHr(ZbVf~NjPtIe!4zkHts&AZJQX$>xdMw+yqn7h+7cu}^%2$yG
zpLq$d>1BAYB~yZzHaT{Ens(3MwqTUTAX%>DD5uVq_+>`JUEz_F?iH?sM-aKiay!m=
z&m1t1yn1yE8IxTG^ICtj3|f<aS3dw_G5&0%aM=E8n}>7R#ZVBgFyXzmQ?Aa_6R736
zDg)nWQ0PnV5M@s4Gd;o1+yyl<LJVX5Po*V0zV~Z3fH7sX!nI^*XRYhp-6ieHhL9WS
z3sc+!^Ird`r?I`%FV!bZkW5Y4@F{NO?If<bkH^#8zwT-sdT_4$Pmkxl?|ns`W{5ll
zB<`cWj*X4w7yk7`rT2cOtABKx4T#n!FQ1W{{cS~yR+xvs0~x`FCCPiF;b!S%51#~T
z?How!qgP-I|6Qx0OlHMHrsBkPhS6o$sF?>btk%LE7}OIxZpmeOHB|y*-L+C4)amVf
zu66$}*t;X8;wppZt~Ti<9-K=qhAC2;5)<_86UeHT(8uf@70#Yk;^-<A#wb5!goXnU
zDu2uBJ;fc!tRJ43jTn)P<g+WtIFcDbx3cC`jPntk!czJ<VNYD_+GI*>1YHjv5Q+F;
zDe7do@84ZFuGgd*Q+YLEdVr7P)#G$w#Ry7PMoG><<HVrPmwgc-l#ZurgC23uMxH;y
zBXg|{&nwi~P48A5h1wFuY=&VTx#v(4vqEWze1Q_wRNTl-z2DYfrbkqJn+v8?tl%@Q
zYY3gji;@S)aTkc1|NpDnA@tHN>d*{l|6r})tKwYO*&DepM3_C-FXHM*v=&eR-HT}M
zN|3Vl^b-g&<Q2nFP5?v!ii+i+AykvX*oEibTl&0~rSdd8D<5s(7U-f}>aiqmRtaae
z!8bki5>B7ZcnNwpviX-6bo)kq(gGc|swJ5ubjV%_JhuWtUVpMek^S}LDMn934NF)4
z8<|{S!ss}7+j7IMy;s54WVk5wseNmVCF8>q{oMtvCzv9%RhmT;W}eT5u^QjZv9v`s
zAk|{O>X<ck2L<MB%x7G_PPdm)6p}>w=`G;=rM>2l<=T-c>^ys%CnvmF*8POHeSpOC
z`%+#AY&kiQj^-bJ&R+gc&?G55(>C>MLb{a|9Y_vEbQPM_15Z47|Jo5(ZhwhS%^KZl
zN8I?eXMH9=veXEzzB%{e`9-XqUF=A)sE{sJGZ6MtRMLDfG|b`;SI8h2Q%ve|CQ%tV
zI6be7KX-h-J^UKE`{etw%j6Xr$Ra@+Ot_dayzg2-n-J2q)(~t*4n))F2$o!IJL?MU
z^HxHD%Wa3Eq&}@9d%x~2@O?f7t$yP({_2y=Q1&Cc{xg!Fn<!r>jy{=Os61GjX<=w=
zp_#pOpuf5wFW9BYMx*Jok7scHg-A~c-{kal&Cy*DB4csnx;Ph-!fk2isel*AN2~GU
zi-`kt?hXet>?8zdAsyWDNf?!)vTb$7Kg!&n-HQC-KB<2V0p`lm0u4)W7{&>x48JHU
zDRqykh%(=)kXrEzv+_W(m^6rAi!4Jy17fgNM&om9ssC}<Mt8#tr=vsWd<vU1e}2H^
z8ghBf2%qc`9A2?|pyY$)QbUom{qRuF9{)ExF#S7AVVsu<0{jbZ$OfjkEtx_47QTOB
zS(6rQ7)xLri5RdtV9xms;zJPr4e#gRsBM*m=_!`X%Yt|A4lKv`WFEhGk*!(?Dcc1y
z_zL!%NJB}@?Vs(wh|SiX%RA}V_3a0-vQ?S7J*yN9sz*oRBF^Kf(LWi27$XWcjDD0Z
zNZi|<LQFb<g1;XGVNgfeeQmrY9mB4M7<(&gpO8R0Ar<(I@~X%<??hSNH=-F<^4<F4
zeA(nTl}&`eEyh-tT)brs1AYk+timz8i~F(Zwy7zEcf8J<39n|1HD7$d{OllV2Zj6_
zW>M<@6SHIkXswx{0$FNz+uz+xp)wbt!l6I;me2qp`rdY*4#vjIQT$YU3hp6?x#-`F
zu76jG?Na#)&lb705~=(|ynHuy3Z@2nXWcJDKZ747V!!|L>_PTuR@SN5RJsfR2LF&-
z=_<dhZzuIBFunOcts7ya@d^hyWdR+K)~2{67yn6dJo>2+alQP>mCMO}fheC>7Ra2X
zQ(+<P<%bxWyKtw2QRYu;+A2>sw6vW`r3dGZgJJ(-Jv-C>Hh*Nx4RTG#7N1r<&Dl1e
zi2NG`S$Y1kBK(*Uj4XnA9!1pzKmyzL{ii|YM~I~h$G1%OrH%@PLLo98qD%z0W8J_?
z5x=W*N(Kgo)%A6G4Gm%+Uth4ICdnTxsJX3$hJ#~O>qB2>?ZZa*)I{L3nXf9QQRRUD
zFI6$D_bL)#&Ay^)8W`0y==fh@*8hUA{+Ya^sQ34utjHxK&4eDc&Ll!Y0(nLJYF*Q5
zv*pgmK0j}}D9~eDd7eEi4h_(IZ*>OlZ8a(E-RqBdhJL?V*jzvIqQ>!uKSQsjm8#YQ
z=S1;8G1st<q;+W}ZU2n0su+=TFA}x}L)8;8K0dxh+wz>gVo(dr0~{#g60EaXJ#*1?
zKhaeL?9-o!d0P<^q#S8}B|P2h&keiiNxR70s`Xu0UL8{vT)BtiFfFYYp<PV2A<Rw>
zCUQ@fc(?5~*m6`*wqOcOF-~PA^f~8M5v#*VQnrodMw02|4uN||&%Jh=iD9rWU!Q2M
zJyPf+rqh{(u8B`WAsxmU?O6f~XFa^s$CwuB=Klh>lrVPxf+g7-xf(nET3p)U9Ug;+
zr-ll!tepR)WiE*i1IriKe%N3So7)B%HWP8@3VQDUM5}FTmIQ+oe&iti@Mr<r96?;7
z&{4}#d1?3+>vMd0MEAb~v6rF~zOa~zxY&Sfuw8`T*~X|LHgD+4-{9LqI$lN7jg(M<
zrTO1m1F0#$UQC*?>_BaEf0leNvV3@%!!jaUMIh^NiL&zW2}4Qbt=8Q>hmB_-9wSf>
zSz6F#t)38S=LM<<lZH8pd$>}m0KR?WyN5phRs`PYP6WCN?D1_YndiYDY2+aP!prn`
zr#q1Ae;Dh3w9*pcoMb52ZV4cEG?dr3YXnP%p55KG&6HlK-`l=rDD97PFPPTSm;gu)
z0I=E7#g6v~D#c&CkIi^9%^jTY%kTc8&9Y~5Qr`*(p#N|HT27n|L?j?n@;#K@m1$cx
zAT%47H>D;|5yPq3l{m9-#^sjFLjga2s77w_-zNUw%=9o=hd4)j4Nf>3!a}@r5^BpO
zWG#%cnB?rjj68G0*%Q}{pnDwZ&f6wu1OqVyAl$^-7~Qvmqz$1)_czvv+zhq+N9j9T
z${A{J8Y2q5PRa?npA0!U1!7rW+~CY~pD)uMYmaC9zCtsqp*+GCd|zDyX>CW>chJth
zROM3Y={Bh{FwN{yruizm7F&HI0a|6q4z&Z*06wPXZj^kLdUWbmo96RtUl@HN3q@;i
zzyG-*UGyu{{|G{R>|*NFSt2??^U`;vV|Bbu#W|CRUG)@_I2g2Gp2Rx%<50ZbsbC-Y
z<#vxVftG@TNx5MJ+hiWH+1Ny`DnYp9;=RgB@)54~bK|3Q&|kn#RM2R7`}r%{qwoEL
z4}14)t@3~1V>&UrX3FR>|0{9jpHNkdMVSk&=6?$Swa@CiMxB@zvg3wM_2@ZUC{`N&
zaR=HeebIwB2_|lT@-{9E*(oDLh^}>~Z-b{hhq7YdThIlP-GTj81PDIOkpj|Zl&xC8
zcpo+nrVan1QtyvcBB~(bKP%+}Z}{;S#c=o)zZ*9L!AiqFjHxl?{~#p#|6z7*b|-1U
zw8HTAe(AAx7#T`QI$eRC%!1Y~j;lukNn@=588>Kn6~mE$T6)j1%}-P+X+9B7^wR|l
zJ12PI%+)CCe1A0ZAoi2|11-!HZgrq_*^SWS`X^oe4EQG6-F;52%ZNH|Lc#n;SMi5}
zBQb15j-98B+gCP_eh;4xEF@3(ovbI29(+5|k<ac=I{{tkf8@BJ$0eDr^(~<&Ft{^r
z`&i7Yo^iX^c>JGf_Uv;eDjXxJuLZ42xwj&Y3^sWRyJ4byRZ$0_v7q}e;5R}1d_<jL
zC<6B|8?YT0C+R}P!2j>TbaKoY2H*HGUCe8RkB#JnH_(SWHN^SXcSTuXf5oN+D;-`o
z<Lc4D=Z_@j-|f{3rB7pghEiQ$BgwJ2)AMD0B@P8ebXVl!uUTjPR)gxcWYeZCV9v<I
zuuNt@N%=_cuJZr|3St!YtwLV~;}$%|p&x#JlpME$OdBB>>Nn||aqA3;8jN9cHK47`
zHk~Fnfb!@B{&IjfA|*3{!D|1OJgSX}UgzUN;Yz7XFxJ~ZcP|+0Lz$lW@%6#*rwqbk
z$%8yS(vzs;+S8dCecq(pb@*xI*~QFD6z8z04lOyDLYSu;Mq}qbyUE8vs2BZ1pZ>de
z+;f(yhPJ%v3n>&*=H476V=Zm;yYV1n#}7>me#{U!27-dJvpncoJ9x4Hg~9*9tgqKw
z`Wn97&<Y~b3aQZGIe7d+`_r?W)h*4@t$yLs-`5C|E_Boi4+71I%;?b>M@z%Zyr**$
zGQOSei!<D{KIbIbc*29t)BxWN01ddY-CU%xa;?72Dve(E0#ECNMS#=wuE8q+yAdLG
z9|?vmNXJ{k{y^h;Y#pL~I~J9IlCR<BhYBrL?Aw+7lJ?Kb)x&eXwB^G;+8X^_k)z;6
zEs{98mA4kgXAiy3LduEVOfVgKD$@5ccB`gZK3*3cw0}~jPZzVpI@~||P#z2E%O@2Z
z2V{5xO~)tT(7i-ts;<Hmvi=MotVcpsJgNcc$(8dSh%nywIoJ7`b=zNV6S4I!*ODH`
z;AiGi;?>c6D!<gK5u9ku8F<5KgbM9}&gcKqJs8jR5dU-Va8MEkX#P{s!3aDU0Y)*(
zX3Ma7Wslk|=pOb}(A5f_L1zx#dwdM9r4k@IYNSS&6Cv4e9HffGBSV<=tmslAGlwq=
z@cp-n#hN;BIzFsF4+zmeh!Dok@oN2_@F&JNGr5jslJGD#9RU$aorMFrk+*28u6_#3
z&1hDm5}z#XyOw*3hdGy?F$Lm?IiL8^2prmQCfJ~AM;;;-M^RnJXdx8UV31Ey4`!=k
zd`L<4bMdm75PN;-gF263R(=k<P>U5jT)0%<^>zd{hyvp{5t!>$qO1>F=vYl1E$X^2
z%5>s`6t)D1lG#|+P+22I+$`5JEY)>C5C=7jvY-AuJ{PG}W1WRJ)oQ*E9vvOcUySTx
z^j%h@Ncz)B{WZeBaRm#^xlt{Oftk`OR7mRo)zL)!^9}9jUYzi-t(I$1OW@HTCr*Xk
z>c9#gU#6kvp;UWu^ke`f@arxxE9*;;lzBKn^XJ*okpkW(OJITzRVrh1m*|ZE%$6FJ
zyL&B?8e6|e3LdWIaTLnh)zaXEZ3T>(Jkq^aDS_@mFBa{I-qw;VAZ>-JnsePDw28je
z@o9ot+LFVe>Ejh;4p<&H*G`JXM+z1(vFU)N^RhSQ8KiRmTI9A4A(4g|DDbRjT)%tM
z29+w6B&ZU>EG9A@g^Q+7z1{pp`wv2z#=~hKhm%GM#p7A-{ep`!KhgA0Z(nKz;c`A1
z33VWc`hsTBr<fFd7C=wN`E$f4KpqpC|2h1DmHQf}tS<x8IYah^BL3Xr$tkT!9#|~a
z5xE@w24Az#{d;dOczPIu8a^c#4EPTxvoQEt0Ga88hyf0nA^mOY{I>?FSedQyCS+)+
z+lBRjmW_NwRKg|~utJnISHo;v`p~=Yd*m`y5Btw*FzQxC&=1FI58P_qt4`&Vai^2c
zCEu;<aW1`&{rnCuM3Fd)9|>e!PY^vC(wi2mrs*x{Dmx2gE*=s#g?~OtZVaPJJR8oV
z5`=}DR0A$xPFBTK5kKo+3#uN<7FK{O&oL{ypuZ<V?cV#H_kK?UsG;8fesCs;mU*r{
za6Om6gk_HF&wa7qAZOk7-`jNHj{f(P4F45;^e@}?zb3)Z8#`_y_uEkO)X42PDU>$|
z2d<kRU<a$A7wh6jDFs)iZRL9(daKrumQ*<4<CRqN`kcAEPyzIOOBDC)bkN062j8t@
zz%%3o#Kh)KP9#@XS74^-<p*Hf+u>s)Th`48xfLaz6rCsUnn&}6_D2RmT32pk2YlQ)
zo1sL`4DiUv;qh@!OA8ZN9Y)Q_*bSaMiP)4p!{dV#jgmX1c>n<MJJkOL;A$-Zuoy)0
zHOFny0k18@u5B+-a->qSh~0yk)HlOh8M;Z#115?QvmlxlF1rX$J~^x5B$f!K$E#vg
z$|Y59uqTD5+j|#@)2kT8gbu`Le)E<5_S9|CFAJ}Fo>;8jQFLG6@H_m1s|d=xaGbRL
zva5Nfp`4o+U0kwn_vcEKJ|ko6pq}U6;-I0G&_=fK^4$7H+ryzmEADw_O;oa%^YrEE
z;XZ8w9-#rf5dhJ47&SwHH9Gh(+g;;VHjh_bF6J38(D8J5u%w`JyIDue0r9qJS2DnG
z<!|Z(oss_K@(It|-qHd@M!{pea=TG18lUB+#*Ixqu#h?qVB~JV#L6CAEY_W+mttsb
z#+_gA&-f^&BT@aTelamTJ&s)p95%|J2j3$`_|^~Ckrm%TvF)dj1g^L&?R#L3AryKb
zGwn-75aN2uo{++T;|mGyw!h11ThqQ_^+vrw;bjMQZAZpv`8N7}u*|>M(WlJewNi7=
zm1PpHw`EHZk48(AWh2Dp%twqPPz=tjiA=_1LbQP80t$s4HTi#U@K-62nPkDzv@|p<
z@B;aOGr@YY!cxP^Zs>Pd#JCm!t12c<l--7PzmF2Ep=Iu0lmW~83^!64i!SI`(NCcP
z5-#fM>7#;I$1+F`ko6w=Txul|i%jHl2C!CBCFQKUFo1!|6pqGsDO^7dP$?xY2D!`w
z@<Tk#?Gs4=7@U`2v#x&Fm=oS@eFl4Ja0hD7lzAZY1XGE^Fr2j2x({iPISHsAUSb6c
za93XME<-h#DkI#zrlj33!T=tp5=C3EwkD^jTa_>KtEfVfE7S!IO5Z!2b^60q>=F&5
z?VaO}3;=9O$2cAJVxMBl?ZP!pwdeIyg;)H6xyADP$sV(z03@38b8@*~^bt2ZELDBn
zd~!L|wUS)9!tMLj(Mv0DFmcJ6O>QvzfJYCkj{<<?R0m}Yr)<|d29HpfNEj@9AYumN
zqy;Ce0I<_3nkG|;-b+j9CP99zqus%c<76;9fBJ@jk2Xq$|I0#aFJeB`&tb@e3E0(7
zEtl-W`K%QBjY@FnePp%N`1vjJ)`bnKGGQ*luS-G{H!g(arp(Y6b%bh9M4F8cCe9R8
z5XmudS6%sympBboKQsX<3B8;uRMzbD3E!g~xqY9@AC5lE2B<)8JHR6i9i#dA17tT8
zSWauGvMsOz>A&ex|7*7C?+3a5X8yil56?Sg)znZyTLP-`loW-yS`ftVy3kMu#eOaL
z5zpP&?mTXpsvQ)&jL9j(FkieQW^a%w<o@f6wae5O@h2(qjQlFMarvmt?aJQq&oV^v
ztG0?z!(qSKFv3U;-ealedY?nylV+L5(&4W851#oCH|?l+V$FEFDdX3dkiY8+Q_Afh
z7|8zmRYj8|s8MmkU0bJX=Y%{;DZI;UwVnr!f+)n4nmXi7$wud*v(S^pqm7BvD`=w;
zFJp`{ORUQNJ)=^p7K8>Th5U%n!k$=tN#3Ak3l>W&n(4*s;qY+W_IbWHazG0r=Iht|
zuRr$pzbUfZg+)e2F8L8)53G292iwBIzzOXTZ@9!|X?<(D@p{-xYH)OvB332HN$fEv
z1q(F+84d;;nd+OR<-R0wrVdjw0xaBMdFy?+;Z-;gtWfU#+r*VpOi-|6YKk`H3n|!j
zMV6wH5;e9swBFNGufZOtWJMOzoS&R2Up_C@xF2zVgX+@79UL5tQ(+71S?o09A0HnF
zTY$W_vAKsd7qc@f*H`m<p$BdGa(P<=(<^(0`twev!qC3H-<2t4roJ*_AS)UtRU@aa
zu5R>>*2@W1HnNp)TdAD})!dm7o${Y9pHq{z=Vsw|$fP``tOB;-diFBQDSh2tF9gMz
zLKR(-`}^r<klQQXcRxN}c?^9YiZ(i7ahJDrzHo8b@aSPheW_6oaixsDmolrQ1UUKd
zE%g_q+lgn&Tcg5m`(`%LUBTW;SUU?&*GZi+)eKgZBm6nr8_xY?DNRZWeT79kmMz}b
zbGNR{xmu<cRoQj~Qh8lsY($1M>f)G|vVo+~o8G;cdYbdEA+CerhQ!G43wuR3Wc|k+
z&%aDt<>$JxydVG4bLek>@#&{}PksO*Ch_k2L7z}%<KQ`zEza!wI8~jpa2@*&hS$!e
z>Y(vQQ}5FqZS8=h@skw?L8OeBy7li1zx}ZQYNOG|aJWtM9un>tK=$~6aBqf+$+a;j
zGA=GoJLMK@fzQUK(3Y&9>QOjebh=DW6%|*(7NL0*<3vqb!M(hNN$Y0oRrcyVWuc8e
z%v7{#UfKFhp_AxX=T0TFD>7?;hH4)wQAQcoaxJMz?V&{Op5CHc3YK<rL{w=<oYg)O
zzD(r52rVQG^^3=~(~>Ma2p+u1Sb3nq5$!|g?twic8~yp{qWipVauSv^Y1QHp`rBl>
z(*L4%F`LFm5^hy?*V=rIxcljm=h$m3N6&eyGOeBZ?`0g{hOR``$b%G|hQ)a{*-A02
zR!P+pn|fXwCv>h0s;Q|_6P0Ebx!K3LybGo?H_FL=4P9$$<$a^y?J;?`bw|BvD0Axk
z`3T{Mo{Rhvv4=N>xTA^!I>yiiR`6^ZB+xiT_DjyWalux=(?P8RcR|NSsC=Jbt&C(Z
z@@0kZ@$%b1_2{wRkae44A<vnWqqO?mfc5K#DfJi6@f3&K`wrd3>Le<SYF@HgRE-c%
z<+~a#A8n##XZ@&X4lQCQjQkXhRL3VQE*(cOsccsUo;ZtM4R!BfcjRXzi6t1Ej~!7-
z_MVctSLtR9VTW0pS|~9IGN`_?L)cF@snaoNu&b~Uw!d2xvr}hpd{^WU`MRtiLqZup
zcN;L_n?ZyOIJ+8O*pGAIgg(GXmiE5WS_bd+{XAwx$C1Wc_~YzyTM8&2CcppTg!*Op
zXZ!d9hF_RgtAz;(3Byc2FOU+?dTU&>E6<1OXA0mcQ^8$k%sF(c{Gybf6YqD&7hHdr
zXHB$B`{G}>z!%T@jjwI1M7KzntK^uGeM}gL!<7~3Qg`ahi!*Ceo}{~gxy2@rv6DmX
zs&vo&r%GaWn&5A9-Te@Y47S!;TYF>x?iQi0Eq4ZCoqb#Zxag`Srd0+XhiAu+gs18X
zY^;wMhAs=>dt=OC6Xi=X$MB_7+^%r=mW7Fl$pm;HSh|J^VxeJ#>$KE>a9Z#Ld)#r8
zpS@nA_q2vd>{`kCx$w=mnuB(_-xdBBcx6YIsxl2?VGeRu9x(FPlmre%e4d3dm=~OP
z@3tkWkUe)ZEl+Sh-uzutAU;q)+#<TwNBR44^zH(k51fJ1ol0MwEgbWrY<&FZ=xF5~
z9>al}KZe)+)?dF^t@}~H1!<P!3Z=iNZ{76x+lrD8_%+C9{-w~y=p3=yGba*_+trpA
z$CPueuQ?brX5V87xs!#OnX8Qmj&tNJ>KE(E*O#9_Q|V>1y?#G=dlAbN1|TrK+2jIc
znYcQh8mQ{%Q0nODXzM1Jd6%--zovAFajBc9yQjwGOmzQawIh|mTw>r?L?+U1;Q3(s
z4Ocq)nnu=RG{Xpv@cR<w2^o_|OZMYQT;I~^l?3En)8%U{6ZOkt3_ibk6*9Gj)~}sf
z4D@VQnmRTQe($887f%03L`CH=kT+%pC6<-mZ2K~~mP+tPGo2T#N5xx0qQb7_P4BXM
z6Du!fAHggx>^&}n7Ay)ePPk-AAkFyuN-$flnh9R5L7%-dzf(V%TU4`7MWgL4J(rT}
zc_sco%2RYlj<@71(o2>Ge;9Q0C*x{PeBrFpw@M}4nH((Q)uVTF@%o}yT}5s9jqC8f
zqDr?vC#Vnk4aW748!&91rbhB+>lYJzZMY%4wO#XTc;98B`IT9)L1E(FD*RDG1FjP}
zV)ylWD%N9o4gS`fzQK1dc@iDW*yRqcL}a0F=R6vS+5X<sktEsd{Yrb~i-DLz@q;Aj
zTXMZq`L$PrOzh>iK3$|%`0c)40nJ9`j)v~;RUrQ*U5hH!&tEq>?>_<%#;aXY$}wZU
z-5>u?08|63{6jdj!f0P7H|8UI_T_?uOb%U}qF$+`>)s$U^NTF|ygYq)6~)$;df#gN
zb_+H~CzIY4G%bQ>e2C{8@4F5+*VFcRF15ljt9{wijLmh8NzW4Dke?R=y^L>Mh7OK*
zq1Z366p9eoCP^b1!B$(#(8l|RLC+|yHYFv%=;F_G-Wx()T|-Yqd3K|T#;%Es?XXj5
zx12U^y_!$`R8uUTzGgEM;9mP})+Y#uK?ImRc_YAvGnIULednhpmxumIY59jlR%dCe
z{hAMszfWmdC4c;z!nBqk5!t;Rb_#9w`sb8Y9m8U=q`m_2;b-6CiRru6Zx^7E)aYsa
zH)l^&Qd(BYAHMva$1~wQ`*OiSCx^B?&Al5}an{>V>g=?2_A<To1Z~85{-~E`haIKP
z&ZVwfOfIiWN`2ZxU9G~@<_AbjYK^4E(8C^@8f++b2iI;7;NLvHdYC&`TTqlbTDzX^
z7~|seKAN2lnp-c@eg9|1``c0iOvY56-0P;XVSW7V*YD$tCo{IgPNAt!ucFk~r+o#Y
zx#K1)iQVhB3(#!8P5T7l5QqS?CvOD!|0cdV%&8M!;NS8Flos-GzOsyOrb8xM9!+F&
z91MMJ2A88V^_2&JxEA2DU7;t#r&a|am&hE?o}v+8)YnQ`<sTUJZmh}-oi{&Ur>guU
zBPQ?r993j;9E@0K0L6X@PhfLZmSkz_DfM+u+%esBTS3SLGRL#0XaoobkJ=T^)l_q$
z`V?nQpW#pc_z#cY6yE9&WO5va@t^K<vB^P$!-dP$NXLKgFu5eFKOsMnIi5X5B*5ZA
zCWjytHZsSvM+8`)$m9@&!bawJ_J{xr6qy`?P}s;E&mIwAfg+Pb5DFWa<JltuEKp=}
z2tr{ab3A)QfCY-z>qXb)<NJb8i0Hb`!ootXhjHW)0Tw91U=USRMS_A*VCcGzs;UHo
z!CVjJ$Rh$QPz=K$7!2a|dhvKX5{aZh;`Mq727?$z9{u~7BZ>%65ClOeN<@HyAP7QH
zA_5cyK@f@(5uhLlf>4x*00lu1grY<QC<uZe6eS`+K@bF?C=me)f*=S*i3m^-1VJcD
gM1X=I2trZvKRo5P^U{GKG5`Po07*qoM6N<$f+wg9egFUf

literal 57670
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


From 22ce76d447407024d9bd58eedce6c166eb7b6eb2 Mon Sep 17 00:00:00 2001
From: Ruben Davila <rdavila84@gmail.com>
Date: Thu, 18 Aug 2016 07:33:27 -0500
Subject: [PATCH 64/64] Refactor to mark Changes tab as active on new MR page.

---
 app/controllers/projects/application_controller.rb      | 1 +
 app/controllers/projects/merge_requests_controller.rb   | 7 -------
 app/views/projects/merge_requests/_new_submit.html.haml | 4 ++--
 spec/features/merge_requests/create_new_mr_spec.rb      | 7 ++-----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 996909a28c6..91315a07deb 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -83,6 +83,7 @@ class Projects::ApplicationController < ApplicationController
   end
 
   def apply_diff_view_cookie!
+    @show_changes_tab = params[:view].present?
     cookies.permanent[:diff_view] = params.delete(:view) if params[:view].present?
   end
 
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 696f7192131..4c1f38be9f3 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -216,7 +216,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @base_commit = @merge_request.diff_base_commit
     @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
     @diff_notes_disabled = true
-    @show_diff_tab = check_diff_tab
     @pipeline = @merge_request.pipeline
     @statuses = @pipeline.statuses.relevant if @pipeline
 
@@ -520,10 +519,4 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
     @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
   end
-
-  private
-
-  def check_diff_tab
-    request.query_parameters[:view].present?
-  end
 end
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 0b05a2693a6..00bd4e143df 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -54,6 +54,6 @@
   });
 :javascript
   var merge_request = new MergeRequest({
-    action: "#{(@show_diff_tab ? 'diffs' : 'new')}",
-    setUrl: false 
+    action: "#{(@show_changes_tab ? 'diffs' : 'new')}",
+    setUrl: false
   });
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index 775b38814eb..b963d1305b5 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Create New Merge Request', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -51,11 +49,10 @@ feature 'Create New Merge Request', feature: true, js: true do
 
     click_link 'Changes'
 
-    expect(page.find_link('Inline')[:class]).to match(/\bactive\b/)
-    expect(page.find_link('Side-by-side')[:class]).not_to match(/\bactive\b/)
+    expect(page).to have_css('a.btn.active', text: 'Inline')
+    expect(page).not_to have_css('a.btn.active', text: 'Side-by-side')
 
     click_link 'Side-by-side'
-    wait_for_ajax
 
     within '.merge-request' do
       expect(page).not_to have_css('a.btn.active', text: 'Inline')