Merge branch 'master' into 'api-notes-entity-fields'

# Conflicts:
#   doc/api/v3_to_v4.md

VERSION

-8.17.0-pre
+8.18.0-pre

app/assets/images/icon-merge-request-unmerged.svg

+<svg width="12" height="15" viewBox="0 0 12 15" xmlns="http://www.w3.org/2000/svg"><path d="M10.267 11.028V5.167c-.028-.728-.318-1.372-.878-1.923-.56-.55-1.194-.85-1.922-.877h-.934V.5l-2.8 2.8 2.8 2.8V4.233h.934a.976.976 0 0 1 .644.29.88.88 0 0 1 .289.644v5.861a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472zM3.733 3.3a1.86 1.86 0 0 0-1.866-1.867 1.86 1.86 0 0 0-.934 3.472v6.123a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472V4.905c.55-.317.933-.914.933-1.605z" fill-rule="nonzero"/></svg>

app/assets/javascripts/environments/components/environment_actions.js.es6

@@ -15,12 +15,12 @@ module.exports = Vue.component('actions-component', {
   },
 
   template: `
-    <div class="inline">
-      <div class="dropdown">
-        <a class="dropdown-new btn btn-default" data-toggle="dropdown">
+    <div class="btn-group" role="group">
+      <button class="dropdown btn btn-default dropdown-new" data-toggle="dropdown">
+        <span>
           <span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
           <i class="fa fa-caret-down"></i>
-        </a>
+        </span>
 
       <ul class="dropdown-menu dropdown-menu-align-right">
         <li v-for="action in actions">
@@ -37,7 +37,7 @@ module.exports = Vue.component('actions-component', {
           </a>
         </li>
       </ul>
-      </div>
+    </button>
   </div>
   `,
 });

app/assets/javascripts/environments/components/environment_item.js.es6

@@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', {
 
       <td class="hidden-xs">
         <div v-if="!model.isFolder">
-          <div v-if="hasManualActions && canCreateDeployment"
-            class="inline js-manual-actions-container">
-            <actions-component
+          <div class="btn-group" role="group">
+            <actions-component v-if="hasManualActions && canCreateDeployment"
               :play-icon-svg="playIconSvg"
               :actions="manualActions">
             </actions-component>
-          </div>
 
-          <div v-if="externalURL && canReadEnvironment"
-            class="inline js-external-url-container">
-            <external-url-component
+            <external-url-component v-if="externalURL && canReadEnvironment"
               :external-url="externalURL">
             </external-url-component>
-          </div>
 
-          <div v-if="hasStopAction && canCreateDeployment"
-            class="inline js-stop-component-container">
-            <stop-component
+            <stop-component v-if="hasStopAction && canCreateDeployment"
               :stop-url="model.stop_path">
             </stop-component>
-          </div>
 
-          <div v-if="model && model.terminal_path"
-            class="inline js-terminal-button-container">
-            <terminal-button-component
+            <terminal-button-component v-if="model && model.terminal_path"
               :terminal-icon-svg="terminalIconSvg"
               :terminal-path="model.terminal_path">
             </terminal-button-component>
-          </div>
 
-          <div v-if="canRetry && canCreateDeployment"
-            class="inline js-rollback-component-container">
-            <rollback-component
+            <rollback-component v-if="canRetry && canCreateDeployment"
               :is-last-deployment="isLastDeployment"
               :retry-url="retryUrl">
               </rollback-component>

app/assets/stylesheets/pages/environments.scss

@@ -35,7 +35,6 @@
     display: table-cell;
   }
 
-  .environments-name,
   .environments-commit,
   .environments-actions {
     width: 20%;
@@ -45,6 +44,7 @@
     width: 10%;
   }
 
+  .environments-name,
   .environments-deploy,
   .environments-build {
     width: 15%;
@@ -62,6 +62,22 @@
     }
   }
 
+  .btn-group {
+
+    > a {
+      color: $gl-text-color-secondary;
+    }
+
+    svg path {
+      fill: $gl-text-color-secondary;
+    }
+
+    .dropdown {
+      outline: none;
+    }
+  }
+
+
   .commit-title {
     margin: 0;
   }

app/assets/stylesheets/pages/issues.scss

@@ -10,6 +10,11 @@
     .issue-labels {
       display: inline-block;
     }
+
+    .icon-merge-request-unmerged {
+      height: 13px;
+      margin-bottom: 3px;
+     }
   }
 }
 

app/controllers/concerns/issuable_collections.rb

@@ -9,7 +9,7 @@ module IssuableCollections
 
   private
 
-  def issuable_meta_data(issuable_collection)
+  def issuable_meta_data(issuable_collection, collection_type)
     # map has to be used here since using pluck or select will
     # throw an error when ordering issuables by priority which inserts
     # a new order into the collection.
@@ -17,16 +17,24 @@ module IssuableCollections
     issuable_ids = issuable_collection.map(&:id)
     issuable_note_count = Note.count_for_collection(issuable_ids, @collection_type)
     issuable_votes_count = AwardEmoji.votes_for_collection(issuable_ids, @collection_type)
+    issuable_merge_requests_count =
+      if collection_type == 'Issue'
+        MergeRequestsClosingIssues.count_for_collection(issuable_ids)
+      else
+        []
+      end
 
     issuable_ids.each_with_object({}) do |id, issuable_meta|
       downvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.downvote? }
       upvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.upvote? }
       notes = issuable_note_count.find { |notes| notes.noteable_id == id }
+      merge_requests = issuable_merge_requests_count.find { |mr| mr.first == id }
 
       issuable_meta[id] = Issuable::IssuableMeta.new(
         upvotes.try(:count).to_i,
         downvotes.try(:count).to_i,
-        notes.try(:count).to_i
+        notes.try(:count).to_i,
+        merge_requests.try(:last).to_i
       )
     end
   end

app/controllers/concerns/issues_action.rb

@@ -10,7 +10,7 @@ module IssuesAction
               .page(params[:page])
 
     @collection_type    = "Issue"
-    @issuable_meta_data = issuable_meta_data(@issues)
+    @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
 
     respond_to do |format|
       format.html

app/controllers/concerns/merge_requests_action.rb

@@ -9,7 +9,7 @@ module MergeRequestsAction
                       .page(params[:page])
 
     @collection_type    = "MergeRequest"
-    @issuable_meta_data = issuable_meta_data(@merge_requests)
+    @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
   end
 
   private

app/controllers/projects/issues_controller.rb

@@ -26,7 +26,7 @@ class Projects::IssuesController < Projects::ApplicationController
     @collection_type    = "Issue"
     @issues             = issues_collection
     @issues             = @issues.page(params[:page])
-    @issuable_meta_data = issuable_meta_data(@issues)
+    @issuable_meta_data = issuable_meta_data(@issues, @collection_type)
 
     if @issues.out_of_range? && @issues.total_pages != 0
       return redirect_to url_for(params.merge(page: @issues.total_pages))

app/controllers/projects/merge_requests_controller.rb

@@ -39,7 +39,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @collection_type    = "MergeRequest"
     @merge_requests     = merge_requests_collection
     @merge_requests     = @merge_requests.page(params[:page])
-    @issuable_meta_data = issuable_meta_data(@merge_requests)
+    @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
 
     if @merge_requests.out_of_range? && @merge_requests.total_pages != 0
       return redirect_to url_for(params.merge(page: @merge_requests.total_pages))

app/helpers/emails_helper.rb

 module EmailsHelper
+  include AppearancesHelper
+
   # Google Actions
   # https://developers.google.com/gmail/markup/reference/go-to-action
   def email_action(url)
@@ -49,4 +51,19 @@ module EmailsHelper
     msg = "This link is valid for #{password_reset_token_valid_time}.  "
     msg << "After it expires, you can #{link_tag}."
   end
+
+  def header_logo
+    if brand_item && brand_item.header_logo?
+      image_tag(
+        brand_item.header_logo,
+        style: 'height: 50px'
+      )
+    else
+      image_tag(
+        image_url('mailers/gitlab_header_logo.gif'),
+        size: "55x50",
+        alt: "GitLab"
+      )
+    end
+  end
 end

app/mailers/emails/pipelines.rb

@@ -22,8 +22,8 @@ module Emails
       mail(bcc: recipients,
            subject: pipeline_subject(status),
            skip_premailer: true) do |format|
-        format.html { render layout: false }
-        format.text
+        format.html { render layout: 'mailer' }
+        format.text { render layout: 'mailer' }
       end
     end
 

app/models/concerns/issuable.rb

@@ -16,9 +16,9 @@ module Issuable
   include TimeTrackable
 
   # This object is used to gather issuable meta data for displaying
-  # upvotes, downvotes and notes count for issues and merge requests
+  # upvotes, downvotes, notes and closing merge requests count for issues and merge requests
   # lists avoiding n+1 queries and improving performance.
-  IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count)
+  IssuableMeta = Struct.new(:upvotes, :downvotes, :notes_count, :merge_requests_count)
 
   included do
     cache_markdown_field :title, pipeline: :single_line

app/models/merge_requests_closing_issues.rb

@@ -4,4 +4,12 @@ class MergeRequestsClosingIssues < ActiveRecord::Base
 
   validates :merge_request_id, uniqueness: { scope: :issue_id }, presence: true
   validates :issue_id, presence: true
+
+  class << self
+    def count_for_collection(ids)
+      group(:issue_id).
+        where(issue_id: ids).
+        pluck('issue_id', 'COUNT(*) as count')
+    end
+  end
 end

app/views/layouts/mailer.html.haml

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+%html{ lang: "en" }
+  %head
+    %meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
+    %meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
+    %meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
+    %title= message.subject
+    :css
+      /* CLIENT-SPECIFIC STYLES */
+      body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
+      table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
+      img { -ms-interpolation-mode: bicubic; }
+
+      /* iOS BLUE LINKS */
+      a[x-apple-data-detectors] {
+          color: inherit !important;
+          text-decoration: none !important;
+          font-size: inherit !important;
+          font-family: inherit !important;
+          font-weight: inherit !important;
+          line-height: inherit !important;
+      }
+
+      /* ANDROID MARGIN HACK */
+      body { margin:0 !important; }
+      div[style*="margin: 16px 0"] { margin:0 !important; }
+
+      @media only screen and (max-width: 639px) {
+          body, #body {
+              min-width: 320px !important;
+          }
+          table.wrapper {
+              width: 100% !important;
+              min-width: 320px !important;
+          }
+          table.wrapper > tbody > tr > td {
+              border-left: 0 !important;
+              border-right: 0 !important;
+              border-radius: 0 !important;
+              padding-left: 10px !important;
+              padding-right: 10px !important;
+          }
+      }
+  %body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
+    %table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
+      %tbody
+        %tr.line
+          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
+        %tr.header
+          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
+            = header_logo
+        %tr
+          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
+            %table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" }
+              %tbody
+                %tr
+                  %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
+                    %table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" }
+                      %tbody
+                        = yield
+
+        %tr.footer
+          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
+            %img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
+            %div
+              %a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
+              &middot;
+              %a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
+            %div
+              You're receiving this email because of your account on
+              = succeed "." do
+                %a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host

app/views/layouts/mailer.text.haml

+= yield
+
+You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
+Manage all notifications: #{profile_notifications_url}
+Help: #{help_url}

app/views/notify/pipeline_failed_email.html.haml

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-%html{ lang: "en" }
-  %head
-    %meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
-    %meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
-    %meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
-    %title= message.subject
-    :css
-      /* CLIENT-SPECIFIC STYLES */
-      body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-      table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
-      img { -ms-interpolation-mode: bicubic; }
-
-      /* iOS BLUE LINKS */
-      a[x-apple-data-detectors] {
-          color: inherit !important;
-          text-decoration: none !important;
-          font-size: inherit !important;
-          font-family: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-      }
-
-      /* ANDROID MARGIN HACK */
-      body { margin:0 !important; }
-      div[style*="margin: 16px 0"] { margin:0 !important; }
-
-      @media only screen and (max-width: 639px) {
-          body, #body {
-              min-width: 320px !important;
-          }
-          table.wrapper {
-              width: 100% !important;
-              min-width: 320px !important;
-          }
-          table.wrapper > tbody > tr > td {
-              border-left: 0 !important;
-              border-right: 0 !important;
-              border-radius: 0 !important;
-              padding-left: 10px !important;
-              padding-right: 10px !important;
-          }
-      }
-  %body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
-    %table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
-      %tbody
-        %tr.line
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
-        %tr.header
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
-            %img{ alt: "GitLab", height: "50", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo.gif'), width: "55" }/
-        %tr
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
-            %table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" }
-              %tbody
-                %tr
-                  %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
-                    %table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" }
-                      %tbody
-                        %tr.alert
+%tr.alert
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;background-color:#d22f57;color:#ffffff;" }
     %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" }
       %tbody
@@ -66,10 +7,10 @@
             %img{ alt: "x", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif'), style: "display:block;", width: "13" }/
           %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" }
             Your pipeline has failed.
-                        %tr.spacer
+%tr.spacer
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
     &nbsp;
-                        %tr.section
+%tr.section
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
     %table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" }
       %tbody
@@ -127,11 +68,11 @@
                     - else
                       %span
                         = commit.author_name
-                        %tr.spacer
+%tr.spacer
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
     &nbsp;
-                        - failed = @pipeline.statuses.latest.failed
-                        %tr.pre-section
+- failed = @pipeline.statuses.latest.failed
+%tr.pre-section
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 0;" }
     Pipeline
     %a{ href: pipeline_url(@pipeline), style: "color:#3777b0;text-decoration:none;" }
@@ -140,10 +81,10 @@
     = failed.size
     failed
     #{'build'.pluralize(failed.size)}.
-                        %tr.warning
+%tr.warning
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;border:1px solid #ededed;border-bottom:0;border-radius:3px 3px 0 0;overflow:hidden;background-color:#fdf4f6;color:#d22852;font-size:14px;line-height:1.4;text-align:center;padding:8px 15px;" }
     Logs may contain sensitive data. Please consider before forwarding this email.
-                        %tr.section
+%tr.section
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;border-top:0;border-radius:0 0 3px 3px;" }
     %table.builds{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:collapse;" }
       %tbody
@@ -166,14 +107,3 @@
                   = build.trace_html(last_lines: 10).html_safe
             - else
               %td{ colspan: "2" }
-        %tr.footer
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
-            %img{ alt: "GitLab", height: "33", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
-            %div
-              %a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
-              &middot;
-              %a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
-            %div
-              You're receiving this email because of your account on
-              = succeed "." do
-                %a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host

app/views/notify/pipeline_failed_email.text.erb

@@ -27,7 +27,3 @@ Trace: <%= build.trace_with_state(last_lines: 10)[:text] %>
 <% end -%>
 
 <% end -%>
-
-You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
-Manage all notifications: <%= profile_notifications_url %>
-Help: <%= help_url %>

app/views/notify/pipeline_success_email.html.haml

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-%html{ lang: "en" }
-  %head
-    %meta{ content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
-    %meta{ content: "width=device-width, initial-scale=1", name: "viewport" }/
-    %meta{ content: "IE=edge", "http-equiv" => "X-UA-Compatible" }/
-    %title= message.subject
-    :css
-      /* CLIENT-SPECIFIC STYLES */
-      body, table, td, a { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-      table, td { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
-      img { -ms-interpolation-mode: bicubic; }
-
-      /* iOS BLUE LINKS */
-      a[x-apple-data-detectors] {
-          color: inherit !important;
-          text-decoration: none !important;
-          font-size: inherit !important;
-          font-family: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-      }
-
-      /* ANDROID MARGIN HACK */
-      body { margin:0 !important; }
-      div[style*="margin: 16px 0"] { margin:0 !important; }
-
-      @media only screen and (max-width: 639px) {
-          body, #body {
-              min-width: 320px !important;
-          }
-          table.wrapper {
-              width: 100% !important;
-              min-width: 320px !important;
-          }
-          table.wrapper > tbody > tr > td {
-              border-left: 0 !important;
-              border-right: 0 !important;
-              border-radius: 0 !important;
-              padding-left: 10px !important;
-              padding-right: 10px !important;
-          }
-      }
-  %body{ style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;height:100%;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
-    %table#body{ border: "0", cellpadding: "0", cellspacing: "0", style: "background-color:#fafafa;margin:0;padding:0;text-align:center;min-width:640px;width:100%;" }
-      %tbody
-        %tr.line
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;" }  
-        %tr.header
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
-            %img{ alt: "GitLab", height: "50", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo.gif'), width: "55" }/
-        %tr
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;" }
-            %table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;" }
-              %tbody
-                %tr
-                  %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
-                    %table.content{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;border-collapse:separate;border-spacing:0;" }
-                      %tbody
-                        %tr.success
+%tr.success
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:10px;border-radius:3px;font-size:14px;line-height:1.3;text-align:center;overflow:hidden;color:#ffffff;background-color:#31af64;" }
     %table.img{ border: "0", cellpadding: "0", cellspacing: "0", style: "border-collapse:collapse;margin:0 auto;" }
       %tbody
@@ -66,10 +7,10 @@
             %img{ alt: "✓", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), style: "display:block;", width: "13" }/
           %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" }
             Your pipeline has passed.
-                        %tr.spacer
+%tr.spacer
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
     &nbsp;
-                        %tr.section
+%tr.section
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:0 15px;border:1px solid #ededed;border-radius:3px;overflow:hidden;" }
     %table.info{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;" }
       %tbody
@@ -127,10 +68,10 @@
                     - else
                       %span
                         = commit.author_name
-                        %tr.spacer
+%tr.spacer
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" }
     &nbsp;
-                        %tr.success-message
+%tr.success-message
   %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;color:#333333;font-size:15px;font-weight:400;line-height:1.4;padding:15px 5px;text-align:center;" }
     - build_count = @pipeline.statuses.latest.size
     - stage_count = @pipeline.stages_count
@@ -141,14 +82,3 @@
     #{build_count} #{'build'.pluralize(build_count)}
     in
     #{stage_count} #{'stage'.pluralize(stage_count)}.
-        %tr.footer
-          %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
-            %img{ alt: "GitLab", height: "33", src: image_url('mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/
-            %div
-              %a{ href: profile_notifications_url, style: "color:#3777b0;text-decoration:none;" } Manage all notifications
-              &middot;
-              %a{ href: help_url, style: "color:#3777b0;text-decoration:none;" } Help
-            %div
-              You're receiving this email because of your account on
-              = succeed "." do
-                %a{ href: root_url, style: "color:#3777b0;text-decoration:none;" }= Gitlab.config.gitlab.host

app/views/notify/pipeline_success_email.text.erb

@@ -18,7 +18,3 @@ Commit Author: <%= commit.author_name %>
 <% build_count = @pipeline.statuses.latest.size -%>
 <% stage_count = @pipeline.stages_count -%>
 Pipeline #<%= @pipeline.id %> ( <%= pipeline_url(@pipeline) %> ) successfully completed <%= build_count %> <%= 'build'.pluralize(build_count) %> in <%= stage_count %> <%= 'stage'.pluralize(stage_count) %>.
-
-You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
-Manage all notifications: <%= profile_notifications_url %>
-Help: <%= help_url %>

app/views/projects/pipelines_settings/_badge.html.haml

@@ -25,3 +25,10 @@
               HTML
             .col-md-10.code.js-syntax-highlight
               = highlight('.html', badge.to_html)
+          .row
+            %hr
+          .row
+            .col-md-2.text-center
+              AsciiDoc
+            .col-md-10.code.js-syntax-highlight
+              = highlight('.adoc', badge.to_asciidoc)

app/views/projects/variables/_form.html.haml

@@ -6,5 +6,5 @@
     = f.text_field :key, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true
   .form-group
     = f.label :value, "Value", class: "label-light"
-    = f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE", required: true
+    = f.text_area :value, class: "form-control", placeholder: "PROJECT_VARIABLE"
   = f.submit btn_text, class: "btn btn-save"

app/views/shared/_issuable_meta_data.html.haml

@@ -2,6 +2,12 @@
 - issue_votes        = @issuable_meta_data[issuable.id]
 - upvotes, downvotes = issue_votes.upvotes, issue_votes.downvotes
 - issuable_url       = @collection_type == "Issue" ? issue_path(issuable, anchor: 'notes') : merge_request_path(issuable, anchor: 'notes')
+- issuable_mr        = @issuable_meta_data[issuable.id].merge_requests_count
+
+- if issuable_mr > 0
+  %li
+    = image_tag('icon-merge-request-unmerged', class: 'icon-merge-request-unmerged')
+    = issuable_mr
 
 - if upvotes > 0
   %li

changelogs/unreleased/17662-rename-builds.yml

----
-title: Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere
-merge_request: 8787
-author:

changelogs/unreleased/20452-remove-require-from-request_profiler-initializer.yml

----
-title: Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
-merge_request:
-author:

changelogs/unreleased/20852-getting-started-project-better-blank-state-for-labels-view.yml

----
-title: Added labels empty state
-merge_request: 7443
-author: 

changelogs/unreleased/21518_recaptcha_spam_issues.yml

----
-title: Use reCaptcha when an issue is identified as a spam
-merge_request: 8846
-author:

changelogs/unreleased/22007-unify-projects-search.yml

----
-title: Unify projects search by removing /projects/:search endpoint
-merge_request: 8877
-author:

changelogs/unreleased/22638-creating-a-branch-matching-a-wildcard-fails.yml

----
-title: Allow creating protected branches when user can merge to such branch
-merge_request: 8458
-author:

changelogs/unreleased/22974-trigger-service-events-through-api.yml

----
-title: Adds service trigger events to api
-merge_request: 8324
-author:

changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml

----
-title: Create a TODO for user who set auto-merge when a build fails, merge conflict occurs
-merge_request: 8056
-author: twonegatives

changelogs/unreleased/23634-remove-project-grouping.yml

----
-title: Don't group issues by project on group-level and dashboard issue indexes.
-merge_request: 8111
-author: Bernardo Castro

changelogs/unreleased/23767-disable-storing-of-sensitive-information.yml

----
-title: Fix disable storing of sensitive information when importing a new repo
-merge_request: 8885
-author: Bernard Pietraga

changelogs/unreleased/24147-delete-env-button.yml

----
-title: Adds back ability to stop all environments
-merge_request: 7379
-author:

changelogs/unreleased/24606-force-password-reset-on-next-login.yml

----
-title: Force new password after password reset via API
-merge_request:
-author: George Andrinopoulos

changelogs/unreleased/24716-fix-ctrl-click-links.yml

----
-title: Fix Ctrl+Click support for Todos and Merge Request page tabs
-merge_request: 8898
-author:

changelogs/unreleased/24795_refactor_merge_request_build_service.yml

----
-title: Refactor MergeRequests::BuildService
-merge_request: 8462
-author: Rydkin Maxim

changelogs/unreleased/24833-Allow-to-search-by-commit-hash-within-project.yml

----
-title: 'Allows to search within project by commit hash'
-merge_request: 
-author: YarNayar

changelogs/unreleased/24923_nested_tasks.yml

----
-title: Fix nested tasks in ordered list
-merge_request: 8626
-author:

changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml

----
-title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
-merge_request:
-author:

changelogs/unreleased/25312-search-input-cmd-click-issue.yml

----
-title: Prevent removal of input fields if it is the parent dropdown element
-merge_request: 8397
-author:

changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml

----
-title: Remove flash warning from login page
-merge_request: 8864
-author: Gerald J. Padilla

changelogs/unreleased/25460-replace-word-users-with-members.yml

----
-title: Replace word user with member
-merge_request: 8872
-author:

changelogs/unreleased/25624-anticipate-obstacles-to-removing-turbolinks.yml

----
-title: Remove turbolinks.
-merge_request: !8570
-author:

changelogs/unreleased/25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered.yml

----
-title: Update pipeline and commit links when CI status is updated
-merge_request: 8351
-author:

changelogs/unreleased/25910-convert-manual-action-icons-to-svg-to-propperly-position-them.yml

----
-title: Convert pipeline action icons to svg to have them propperly positioned
-merge_request:
-author:

changelogs/unreleased/25989-fix-rogue-scrollbars-on-comments.yml

----
-title: Remove rogue scrollbars for issue comments with inline elements
-merge_request:
-author:

changelogs/unreleased/26059-segoe-ui-vertical.yml

----
-title: Align Segoe UI label text
-merge_request:
-author:

changelogs/unreleased/26068_tasklist_issue.yml

----
-title: Don’t count tasks that are not defined as list items correctly
-merge_request: 8526
-author:

changelogs/unreleased/26087-asciidoc-cicd-badges-snippet.yml

+---
+title: Added AsciiDoc Snippet to CI/CD Badges
+merge_request: 9164
+author: Jan Christophersen

changelogs/unreleased/26117-sort-pipeline-for-commit.yml

----
-title: Add sorting pipeline for a commit
-merge_request: 8319
-author: Takuya Noguchi

changelogs/unreleased/26186-diff-view-plus-and-minus-signs-as-part-of-line-number.yml

----
-title: Color + and - signs in diffs to increase code legibility
-merge_request:
-author:

changelogs/unreleased/26445-accessible-piplelines-buttons.yml

----
-title: Improve button accessibility on pipelines page
-merge_request: 8561
-author:

changelogs/unreleased/26447-fix-tab-list-order.yml

----
-title: Fix tab index order on branch commits list page
-merge_request:
-author: Ryan Harris

changelogs/unreleased/26468-fix-users-sort-in-admin-area.yml

----
-title: Fix Sort by Recent Sign-in in Admin Area
-merge_request: 8637
-author: Poornima M

changelogs/unreleased/26787-add-copy-icon-hover-state.yml

----
-title: Add hover style to copy icon on commit page header
-merge_request:
-author: Ryan Harris

changelogs/unreleased/26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold.yml

----
-title: prevent diff unfolding link from appearing when there are no more lines to
-  show
-merge_request: 8761
-author:

changelogs/unreleased/26852-fix-slug-for-openshift.yml

----
-title: Avoid repeated dashes in $CI_ENVIRONMENT_SLUG
-merge_request: 8638
-author:

changelogs/unreleased/26863-Remove-hover-animation-from-row-elements.yml

----
-title: Remove hover animation from row elements
-merge_request:
-author:

changelogs/unreleased/26881-backup-fails-if-data-changes.yml

----
-title: Add `copy` backup strategy to combat file changed errors
-merge_request: 8728
-author:

changelogs/unreleased/26920-hover-cursor-on-pagination-element.yml

----
-title: Fixes hover cursor on pipeline pagenation
-merge_request: 9003
-author:

changelogs/unreleased/26947-build-status-self-link.yml

----
-title: Add link verification to badge partial in order to render a badge without a link
-merge_request: 8740
-author:

changelogs/unreleased/26982-improve-pipeline-status-icon-linking-in-widgets.yml

----
-title: Improve pipeline status icon linking in widgets
-merge_request:
-author:

changelogs/unreleased/27013-regression-in-commit-title-bar.yml

----
-title: Fix commit title bar and repository view copy clipboard button order on last commit in repository view
-merge_request:
-author:

changelogs/unreleased/27014-fix-pipeline-tooltip-wrapping.yml

----
-title: Fix mini-pipeline stage tooltip text wrapping
-merge_request:
-author:

changelogs/unreleased/27021-line-numbers-now-in-copy-pasta-data.yml

----
-title: Prevent copying of line numbers in parallel diff view
-merge_request: 8706
-author:

changelogs/unreleased/27032-add-a-house-keeping-api-call.yml

+---
+title: Add housekeeping endpoint for Projects API
+merge_request: 9421
+author:

changelogs/unreleased/27178-update-builds-link-in-project-settings.yml

----
-title: Updated builds info link on the project settings page
-merge_request:
-author: Ryan Harris

changelogs/unreleased/27277-small-mini-pipeline-graph-glitch-upon-hover.yml

----
-title: fixed small mini pipeline graph line glitch
-merge_request: 8804
-author:

changelogs/unreleased/27291-unify-mr-diff-file-buttons.yml

----
-title: Unify MR diff file button style
-merge_request: 8874
-author:

changelogs/unreleased/27321-double-separator-line-in-edit-projects-settings.yml

----
-title: Only render hr when user can't archive project.
-merge_request: !8917
-author:

changelogs/unreleased/27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safari.yml

----
-title: Fix pipeline graph vertical spacing in Firefox and Safari
-merge_request: 8886
-author:

changelogs/unreleased/27352-search-label-filter-header.yml

----
-title: 27352-search-label-filter-header
-merge_request:
-author:

changelogs/unreleased/27395-reduce-group-activity-sql-queries-2.yml

----
-title: Include :author, :project, and :target in Event.with_associations
-merge_request:
-author:

changelogs/unreleased/27395-reduce-group-activity-sql-queries.yml

----
-title: Don't instantiate AR objects in Event.in_projects
-merge_request:
-author:

changelogs/unreleased/27484-environment-show-name.yml

----
-title: Don't capitalize environment name in show page
-merge_request:
-author:

changelogs/unreleased/27488-fix-jwt-version.yml

----
-title: Update and pin the `jwt` gem to ~> 1.5.6
-merge_request:
-author:

changelogs/unreleased/27494-environment-list-column-headers.yml

----
-title: Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
-merge_request:
-author:

changelogs/unreleased/27602-fix-avatar-border-flicker-mention-dropdown.yml

----
-title: Fixes flickering of avatar border in mention dropdown
-merge_request: 8950
-author:

changelogs/unreleased/27632_fix_mr_widget_url.yml

----
-title: Fix MR widget url
-merge_request: 8989
-author:

changelogs/unreleased/27639-emoji-panel-under-the-side-panel-in-the-merge-request.yml

----
-title: Layer award emoji dropdown over the right sidebar
-merge_request: 9004
-author:

changelogs/unreleased/27656-doc-ci-enable-ci.yml

----
-title: Update doc for enabling or disabling GitLab CI
-merge_request: 8965
-author: Takuya Noguchi

changelogs/unreleased/27774-text-color-contrast-is-barely-readable-for-pipelines-visualization-graph-page-with-roboto-fonts.yml

----
-title: Give ci status text on pipeline graph a better font-weight
-merge_request:
-author:

changelogs/unreleased/27822-default-bulk-assign-labels.yml

----
-title: Add default labels to bulk assign dropdowns
-merge_request:
-author:

changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml

----
-title: Only return target project's comments for a commit
-merge_request:
-author:

changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml

----
-title: Fixes Pipelines table is not showing branch name for commit
-merge_request:
-author:

changelogs/unreleased/27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-text.yml

----
-title: Trigger autocomplete after selecting a slash command
-merge_request: 9117
-author:

changelogs/unreleased/27922-cmd-click-todo-doesn-t-work.yml

----
-title: Fix regression where cmd-click stopped working for todos and merge request
-  tabs
-merge_request:
-author:

changelogs/unreleased/27925-fix-mr-stray-pipelines-api-request.yml

----
-title: Fix stray pipelines API request when showing MR
-merge_request:
-author:

changelogs/unreleased/27932-merge-request-pipelines-displays-json.yml

----
-title: Fix Merge request pipelines displays JSON
-merge_request:
-author:

changelogs/unreleased/27939-fix-current-build-arrow.yml

----
-title: Fix current build arrow indicator
-merge_request:
-author:

changelogs/unreleased/27943-contribution-list-on-profile-page-is-aligned-right.yml

----
-title: Fix contribution activity alignment
-merge_request:
-author:

changelogs/unreleased/27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget.yml

----
-title: Add space between text and loading icon in Megre Request Widget
-merge_request: 9119
-author:

changelogs/unreleased/27955-mr-notification-use-pipeline-language.yml

----
-title: Show Pipeline(not Job) in MR desktop notification
-merge_request:
-author:

changelogs/unreleased/27963-tooltips-jobs.yml

----
-title: Fix tooltips in mini pipeline graph
-merge_request:
-author:

changelogs/unreleased/27966-branch-ref-switcher-input-filter-broken.yml

----
-title: Display loading indicator when filtering ref switcher dropdown
-merge_request:
-author: