From 2061414054ce43aa6d53d1be3f602114e5a336d2 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 10 May 2017 11:25:30 +0200
Subject: Additional metrics initial work, with working metrics listing, but
 without actoual metrics mesurements

---
 .../projects/environments_controller.rb            |  6 ++
 app/controllers/projects/prometheus_controller.rb  | 22 +++++++
 app/models/environment.rb                          |  8 +++
 app/models/project_services/prometheus_service.rb  | 20 ++++--
 config/additional_metrics.yml                      | 26 ++++++++
 config/routes/project.rb                           |  5 ++
 lib/gitlab/prometheus/metric.rb                    | 28 +++++++++
 lib/gitlab/prometheus/metric_group.rb              | 33 ++++++++++
 lib/gitlab/prometheus/metrics_sources.rb           |  7 +++
 lib/gitlab/prometheus/parsing_error.rb             |  3 +
 .../prometheus/queries/additional_metrics_query.rb | 70 +++++++++++++++++++++
 lib/gitlab/prometheus/queries/base_query.rb        |  2 +-
 .../prometheus/queries/matched_metrics_query.rb    | 72 ++++++++++++++++++++++
 lib/gitlab/prometheus_client.rb                    |  8 +++
 14 files changed, 304 insertions(+), 6 deletions(-)
 create mode 100644 app/controllers/projects/prometheus_controller.rb
 create mode 100644 config/additional_metrics.yml
 create mode 100644 lib/gitlab/prometheus/metric.rb
 create mode 100644 lib/gitlab/prometheus/metric_group.rb
 create mode 100644 lib/gitlab/prometheus/metrics_sources.rb
 create mode 100644 lib/gitlab/prometheus/parsing_error.rb
 create mode 100644 lib/gitlab/prometheus/queries/additional_metrics_query.rb
 create mode 100644 lib/gitlab/prometheus/queries/matched_metrics_query.rb

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index efe83776834..6d230e84ef7 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -129,6 +129,12 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     end
   end
 
+  def additional_metrics
+    additional_metrics = environment.additional_metrics || {}
+
+    render json: additional_metrics, status: additional_metrics.any? ? :ok : :no_content
+  end
+
   private
 
   def verify_api_request!
diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
new file mode 100644
index 00000000000..74e247535d5
--- /dev/null
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -0,0 +1,22 @@
+class Projects::PrometheusController < Projects::ApplicationController
+  before_action :authorize_read_project!
+
+  def active_metrics
+    return render_404 unless has_prometheus_metrics?
+    matched_metrics = prometheus_service.reactive_query(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
+
+    if matched_metrics
+      render json: matched_metrics, status: :ok
+    else
+      head :no_content
+    end
+  end
+
+  def prometheus_service
+    project.monitoring_service
+  end
+
+  def has_prometheus_metrics?
+    prometheus_service&.respond_to?(:reactive_query)
+  end
+end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 61572d8d69a..b4a4f74a8d5 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -149,10 +149,18 @@ class Environment < ActiveRecord::Base
     project.monitoring_service.present? && available? && last_deployment.present?
   end
 
+  def has_additional_metrics?
+    has_metrics? && project.monitoring_service&.respond_to?(:reactive_query)
+  end
+
   def metrics
     project.monitoring_service.environment_metrics(self) if has_metrics?
   end
 
+  def additional_metrics
+    project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsQuery, self.id) if has_additional_metrics?
+  end
+
   # An environment name is not necessarily suitable for use in URLs, DNS
   # or other third-party contexts, so provide a slugified version. A slug has
   # the following properties:
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index ec72cb6856d..674d485a03c 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -64,23 +64,26 @@ class PrometheusService < MonitoringService
   end
 
   def environment_metrics(environment)
-    with_reactive_cache(Gitlab::Prometheus::Queries::EnvironmentQuery.name, environment.id, &:itself)
+    with_reactive_cache(Gitlab::Prometheus::Queries::EnvironmentQuery.name, environment.id, &method(:rename_data_to_metrics))
   end
 
   def deployment_metrics(deployment)
-    metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &:itself)
+    metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &method(:rename_data_to_metrics))
     metrics&.merge(deployment_time: created_at.to_i) || {}
   end
 
+  def reactive_query(query_class, *args, &block)
+    calculate_reactive_cache(query_class, *args, &block)
+  end
+
   # Cache metrics for specific environment
   def calculate_reactive_cache(query_class_name, *args)
     return unless active? && project && !project.pending_delete?
 
-    metrics = Kernel.const_get(query_class_name).new(client).query(*args)
-
+    data = Kernel.const_get(query_class_name).new(client).query(*args)
     {
       success: true,
-      metrics: metrics,
+      data: data,
       last_update: Time.now.utc
     }
   rescue Gitlab::PrometheusError => err
@@ -90,4 +93,11 @@ class PrometheusService < MonitoringService
   def client
     @prometheus ||= Gitlab::PrometheusClient.new(api_url: api_url)
   end
+
+  private
+
+  def rename_data_to_metrics(metrics)
+    metrics[:metrics] = metrics.delete :data
+    metrics
+  end
 end
diff --git a/config/additional_metrics.yml b/config/additional_metrics.yml
new file mode 100644
index 00000000000..209209f4b30
--- /dev/null
+++ b/config/additional_metrics.yml
@@ -0,0 +1,26 @@
+- group: Kubernetes
+  priority: 1
+  metrics:
+  - title: "Memory usage"
+    detect: container_memory_usage_bytes
+    weight: 1
+    queries:
+    - query_range: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
+      label: Container memory
+      unit: MiB
+  - title: "Current memory usage"
+    detect: container_memory_usage_bytes
+    weight: 1
+    queries:
+    - query: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
+      unit: MiB
+  - title: "CPU usage"
+    detect: container_cpu_usage_seconds_total
+    weight: 1
+    queries:
+    - query_range: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
+  - title: "Current CPU usage"
+    detect: container_cpu_usage_seconds_total
+    weight: 1
+    queries:
+    - query: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 9fe8372edf9..f5d00e4e93b 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -72,6 +72,10 @@ constraints(ProjectUrlConstrainer.new) do
 
       resource :mattermost, only: [:new, :create]
 
+      namespace :prometheus do
+        get :active_metrics
+      end
+
       resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do
         member do
           put :enable
@@ -152,6 +156,7 @@ constraints(ProjectUrlConstrainer.new) do
           post :stop
           get :terminal
           get :metrics
+          get :additional_metrics
           get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil }
         end
 
diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
new file mode 100644
index 00000000000..2818afb34b0
--- /dev/null
+++ b/lib/gitlab/prometheus/metric.rb
@@ -0,0 +1,28 @@
+module Gitlab::Prometheus
+  class Metric
+    attr_reader :group, :title, :detect, :weight, :queries
+
+    def initialize(group, title, detect, weight, queries = [])
+      @group = group
+      @title = title
+      @detect = detect
+      @weight = weight
+      @queries = queries
+    end
+
+    def self.metric_from_entry(group, entry)
+      missing_fields = [:title, :detect, :weight, :queries].select { |key| !entry.has_key?(key) }
+      raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
+
+      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:queries])
+    end
+
+    def self.metrics_from_list(group, list)
+      list.map { |entry| metric_from_entry(group, entry) }
+    end
+
+    def self.additional_metrics_raw
+      @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).map(&:deep_symbolize_keys)
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
new file mode 100644
index 00000000000..093390b4fa7
--- /dev/null
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -0,0 +1,33 @@
+module Gitlab::Prometheus
+  class MetricGroup
+    attr_reader :priority, :name
+    attr_accessor :metrics
+
+    def initialize(name, priority, metrics = [])
+      @name = name
+      @priority = priority
+      @metrics = metrics
+    end
+
+    def self.all
+      load_groups_from_yaml
+    end
+
+    def self.group_from_entry(entry)
+      missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
+      raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
+
+      group = MetricGroup.new(entry[:group], entry[:priority])
+      group.metrics = Metric.metrics_from_list(group, entry[:metrics])
+      group
+    end
+
+    def self.load_groups_from_yaml
+      additional_metrics_raw.map(&method(:group_from_entry))
+    end
+
+    def self.additional_metrics_raw
+      @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml'))&.map(&:deep_symbolize_keys).freeze
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/metrics_sources.rb b/lib/gitlab/prometheus/metrics_sources.rb
new file mode 100644
index 00000000000..500b6e971a2
--- /dev/null
+++ b/lib/gitlab/prometheus/metrics_sources.rb
@@ -0,0 +1,7 @@
+module Gitlab::Prometheus
+  module MetricsSources
+    def self.additional_metrics
+      @additional_metrics ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).deep_symbolize_keys.freeze
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/parsing_error.rb b/lib/gitlab/prometheus/parsing_error.rb
new file mode 100644
index 00000000000..067ea7f878a
--- /dev/null
+++ b/lib/gitlab/prometheus/parsing_error.rb
@@ -0,0 +1,3 @@
+module Gitlab::Prometheus
+  ParsingError = Class.new(StandardError)
+end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
new file mode 100644
index 00000000000..001701383c3
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -0,0 +1,70 @@
+module Gitlab::Prometheus::Queries
+  class AdditionalMetricsQuery < BaseQuery
+    def self.metrics
+      @metrics ||= YAML.load_file(Rails.root.join('config/custom_metrics.yml')).freeze
+    end
+
+    def query(environment_id)
+      environment = Environment.find_by(id: environment_id)
+
+      context = {
+        environment_slug: environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{environment.slug}"}
+      }
+
+      timeframe_start = 8.hours.ago.to_f
+      timeframe_end = Time.now.to_f
+
+      matched_metrics.map do |group|
+        group[:metrics].map! do |metric|
+          metric[:queries].map! do |query|
+            query = query.symbolize_keys
+            query[:result] =
+              if query.has_key?(:query_range)
+                client_query_range(query[:query_range] % context, start: timeframe_start, stop: timeframe_end)
+              else
+                client_query(query[:query] % context, time: timeframe_end)
+              end
+            query
+          end
+          metric
+        end
+        group
+      end
+    end
+
+    def process_query(group, query)
+      result = if query.has_key?(:query_range)
+                 client_query_range(query[:query_range] % context, start: timeframe_start, stop: timeframe_end)
+               else
+                 client_query(query[:query] % context, time: timeframe_end)
+               end
+      contains_metrics = result.all? do |item|
+        item&.[](:values)&.any? || item&.[](:value)&.any?
+      end
+    end
+
+    def process_result(query_result)
+      contains_metrics = query_result.all? do |item|
+        item&.[](:values)&.any? || item&.[](:value)&.any?
+      end
+
+      contains_metrics
+    end
+
+    def matched_metrics
+      label_values = client_label_values || []
+
+      result = Gitlab::Prometheus::MetricsSources.additional_metrics.map do |group|
+        group[:metrics].map!(&:symbolize_keys)
+        group[:metrics].select! do |metric|
+          matcher = Regexp.compile(metric[:detect])
+          label_values.any? &matcher.method(:match)
+        end
+        group
+      end
+
+      result.select {|group| !group[:metrics].empty?}
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/queries/base_query.rb b/lib/gitlab/prometheus/queries/base_query.rb
index 2a2eb4ae57f..c60828165bd 100644
--- a/lib/gitlab/prometheus/queries/base_query.rb
+++ b/lib/gitlab/prometheus/queries/base_query.rb
@@ -3,7 +3,7 @@ module Gitlab
     module Queries
       class BaseQuery
         attr_accessor :client
-        delegate :query_range, :query, to: :client, prefix: true
+        delegate :query_range, :query, :label_values, :series, to: :client, prefix: true
 
         def raw_memory_usage_query(environment_slug)
           %{avg(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}) / 2^20}
diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
new file mode 100644
index 00000000000..61926320e40
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
@@ -0,0 +1,72 @@
+module Gitlab::Prometheus::Queries
+  class MatchedMetricsQuery < BaseQuery
+    MAX_QUERY_ITEMS = 40.freeze
+
+    def self.metrics
+      @metrics ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).map(&:deep_symbolize_keys)
+    end
+
+    def query
+      groups_data.map do |group, data|
+        {
+          group: group.name,
+          priority: group.priority,
+          active_metrics: data[:active_metrics],
+          metrics_missing_requirements: data[:metrics_missing_requirements]
+        }
+      end
+    end
+
+    def groups_data
+      metrics_series = metrics_with_series(Gitlab::Prometheus::MetricGroup.all)
+      lookup = active_series_lookup(metrics_series)
+
+      groups = {}
+
+      metrics_series.each do |metrics, series|
+        groups[metrics.group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
+        group = groups[metrics.group]
+
+        if series.all?(&lookup.method(:has_key?))
+          group[:active_metrics] += 1
+        else
+          group[:metrics_missing_requirements] += 1
+        end
+        group
+      end
+
+      groups
+    end
+
+    def active_series_lookup(metrics)
+      timeframe_start = 8.hours.ago
+      timeframe_end = Time.now
+
+      series = metrics.flat_map { |metrics, series| series }.uniq
+
+      lookup = series.each_slice(MAX_QUERY_ITEMS).flat_map do |batched_series|
+        client_series(*batched_series, start: timeframe_start, stop: timeframe_end)
+          .select(&method(:has_matching_label))
+          .map { |series_info| [series_info['__name__'], true] }
+      end
+      lookup.to_h
+    end
+
+    def has_matching_label(series_info)
+      series_info.has_key?('environment')
+    end
+
+    def metrics_with_series(metric_groups)
+      label_values = client_label_values || []
+
+      metrics = metric_groups.flat_map do |group|
+        group.metrics.map do |metric|
+          matcher = Regexp.compile(metric.detect)
+          [metric, label_values.select(&matcher.method(:match))]
+        end
+      end
+
+      metrics.select { |metric, labels| labels&.any? }
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus_client.rb b/lib/gitlab/prometheus_client.rb
index 5b51a1779dd..f4ef4ff8ba4 100644
--- a/lib/gitlab/prometheus_client.rb
+++ b/lib/gitlab/prometheus_client.rb
@@ -29,6 +29,14 @@ module Gitlab
       end
     end
 
+    def label_values(name='__name__')
+      json_api_get("label/#{name}/values")
+    end
+
+    def series(*matches, start: 8.hours.ago, stop: Time.now)
+      json_api_get('series', 'match': matches, start: start.to_f, end: stop.to_f)
+    end
+
     private
 
     def json_api_get(type, args = {})
-- 
cgit v1.2.1


From 61d7b7f117ff090f34f882918d55691575d76e55 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 25 May 2017 14:01:10 +0200
Subject: Finalize refactoring additional metrics query

---
 app/models/environment.rb                          |  4 +-
 app/models/project_services/prometheus_service.rb  |  2 +-
 lib/gitlab/prometheus/metric_group.rb              |  8 +--
 .../prometheus/queries/additional_metrics_query.rb | 79 +++++++++++-----------
 .../prometheus/queries/matched_metrics_query.rb    |  6 +-
 5 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/app/models/environment.rb b/app/models/environment.rb
index b4a4f74a8d5..7ab4a23ab16 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -158,7 +158,9 @@ class Environment < ActiveRecord::Base
   end
 
   def additional_metrics
-    project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsQuery, self.id) if has_additional_metrics?
+    if has_additional_metrics?
+      project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsQuery.name, self.id, &:itself)
+    end
   end
 
   # An environment name is not necessarily suitable for use in URLs, DNS
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index 674d485a03c..d3f43d66937 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -73,7 +73,7 @@ class PrometheusService < MonitoringService
   end
 
   def reactive_query(query_class, *args, &block)
-    calculate_reactive_cache(query_class, *args, &block)
+    with_reactive_cache(query_class, *args, &block)
   end
 
   # Cache metrics for specific environment
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 093390b4fa7..9f95525bc0c 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -13,6 +13,10 @@ module Gitlab::Prometheus
       load_groups_from_yaml
     end
 
+    def self.load_groups_from_yaml
+      additional_metrics_raw.map(&method(:group_from_entry))
+    end
+
     def self.group_from_entry(entry)
       missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
       raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
@@ -22,10 +26,6 @@ module Gitlab::Prometheus
       group
     end
 
-    def self.load_groups_from_yaml
-      additional_metrics_raw.map(&method(:group_from_entry))
-    end
-
     def self.additional_metrics_raw
       @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml'))&.map(&:deep_symbolize_keys).freeze
     end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index 001701383c3..de0dab0b19c 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -1,47 +1,46 @@
 module Gitlab::Prometheus::Queries
   class AdditionalMetricsQuery < BaseQuery
-    def self.metrics
-      @metrics ||= YAML.load_file(Rails.root.join('config/custom_metrics.yml')).freeze
-    end
-
     def query(environment_id)
-      environment = Environment.find_by(id: environment_id)
-
-      context = {
-        environment_slug: environment.slug,
-        environment_filter: %{container_name!="POD",environment="#{environment.slug}"}
-      }
-
-      timeframe_start = 8.hours.ago.to_f
-      timeframe_end = Time.now.to_f
+      query_processor = method(:process_query).curry[query_context(environment_id)]
 
       matched_metrics.map do |group|
-        group[:metrics].map! do |metric|
-          metric[:queries].map! do |query|
-            query = query.symbolize_keys
-            query[:result] =
-              if query.has_key?(:query_range)
-                client_query_range(query[:query_range] % context, start: timeframe_start, stop: timeframe_end)
-              else
-                client_query(query[:query] % context, time: timeframe_end)
-              end
-            query
-          end
-          metric
+        metrics = group.metrics.map do |metric|
+          {
+            title: metric.title,
+            weight: metric.weight,
+            queries: metric.queries.map(&query_processor)
+          }
         end
-        group
+
+        {
+          group: group.name,
+          priority: group.priority,
+          metrics: metrics
+        }
       end
     end
 
-    def process_query(group, query)
-      result = if query.has_key?(:query_range)
-                 client_query_range(query[:query_range] % context, start: timeframe_start, stop: timeframe_end)
-               else
-                 client_query(query[:query] % context, time: timeframe_end)
-               end
-      contains_metrics = result.all? do |item|
-        item&.[](:values)&.any? || item&.[](:value)&.any?
-      end
+    private
+
+    def query_context(environment_id)
+      environment = Environment.find_by(id: environment_id)
+      {
+        environment_slug: environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
+        timeframe_start: 8.hours.ago.to_f,
+        timeframe_end: Time.now.to_f
+      }
+    end
+
+    def process_query(context, query)
+      query_with_result = query.dup
+      query_with_result[:result] =
+        if query.has_key?(:query_range)
+          client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
+        else
+          client_query(query[:query] % context, time: context[:timeframe_end])
+        end
+      query_with_result
     end
 
     def process_result(query_result)
@@ -54,17 +53,17 @@ module Gitlab::Prometheus::Queries
 
     def matched_metrics
       label_values = client_label_values || []
+      Gitlab::Prometheus::MetricGroup.all
 
-      result = Gitlab::Prometheus::MetricsSources.additional_metrics.map do |group|
-        group[:metrics].map!(&:symbolize_keys)
-        group[:metrics].select! do |metric|
-          matcher = Regexp.compile(metric[:detect])
+      result = Gitlab::Prometheus::MetricGroup.all.map do |group|
+        group.metrics.select! do |metric|
+          matcher = Regexp.compile(metric.detect)
           label_values.any? &matcher.method(:match)
         end
         group
       end
 
-      result.select {|group| !group[:metrics].empty?}
+      result.select { |group| group.metrics.any? }
     end
   end
 end
diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
index 61926320e40..5a8b0f6c701 100644
--- a/lib/gitlab/prometheus/queries/matched_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
@@ -2,10 +2,6 @@ module Gitlab::Prometheus::Queries
   class MatchedMetricsQuery < BaseQuery
     MAX_QUERY_ITEMS = 40.freeze
 
-    def self.metrics
-      @metrics ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).map(&:deep_symbolize_keys)
-    end
-
     def query
       groups_data.map do |group, data|
         {
@@ -17,6 +13,8 @@ module Gitlab::Prometheus::Queries
       end
     end
 
+    private
+
     def groups_data
       metrics_series = metrics_with_series(Gitlab::Prometheus::MetricGroup.all)
       lookup = active_series_lookup(metrics_series)
-- 
cgit v1.2.1


From 4d8f3978a254f33d959de65dbf7b20a1d41a058d Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 25 May 2017 16:19:54 +0200
Subject: Use before action to respond with 404 if prometheus metrics are
 missing

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

diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
index 74e247535d5..0402be6f85c 100644
--- a/app/controllers/projects/prometheus_controller.rb
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -1,8 +1,8 @@
 class Projects::PrometheusController < Projects::ApplicationController
   before_action :authorize_read_project!
+  before_action :require_prometheus_metrics!
 
   def active_metrics
-    return render_404 unless has_prometheus_metrics?
     matched_metrics = prometheus_service.reactive_query(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
 
     if matched_metrics
@@ -12,6 +12,8 @@ class Projects::PrometheusController < Projects::ApplicationController
     end
   end
 
+  private
+
   def prometheus_service
     project.monitoring_service
   end
@@ -19,4 +21,8 @@ class Projects::PrometheusController < Projects::ApplicationController
   def has_prometheus_metrics?
     prometheus_service&.respond_to?(:reactive_query)
   end
+
+  def require_prometheus_metrics!
+    render_404 unless has_prometheus_metrics?
+  end
 end
-- 
cgit v1.2.1


From 608186d54bb9aefb0b867c177ac62d534e8840ad Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 25 May 2017 17:39:43 +0200
Subject: Add per deployment additional metrics

---
 app/controllers/projects/deployments_controller.rb | 11 +++++++++
 app/models/deployment.rb                           | 10 +++++++++
 config/routes/project.rb                           |  1 +
 .../queries/additional_metrics_deployment_query.rb | 17 ++++++++++++++
 .../prometheus/queries/additional_metrics_query.rb | 26 +++++++++++++---------
 5 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index 6644deb49c9..29d94e2760a 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -22,6 +22,17 @@ class Projects::DeploymentsController < Projects::ApplicationController
     render_404
   end
 
+  def additional_metrics
+    return render_404 unless deployment.has_additional_metrics?
+    metrics = deployment.additional_metrics
+
+    if metrics&.any?
+      render json: metrics, status: :ok
+    else
+      head :no_content
+    end
+  end
+
   private
 
   def deployment
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 216cec751e3..f49410f18ae 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -103,12 +103,22 @@ class Deployment < ActiveRecord::Base
     project.monitoring_service.present?
   end
 
+  def has_additional_metrics?
+    has_metrics? && project.monitoring_service&.respond_to?(:reactive_query)
+  end
+
   def metrics
     return {} unless has_metrics?
 
     project.monitoring_service.deployment_metrics(self)
   end
 
+  def additional_metrics
+    return {} unless has_additional_metrics?
+    metrics = project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery.name, id, &:itself)
+    metrics&.merge(deployment_time: created_at.to_i) || {}
+  end
+
   private
 
   def ref_path
diff --git a/config/routes/project.rb b/config/routes/project.rb
index f5d00e4e93b..89b14ef6527 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -167,6 +167,7 @@ constraints(ProjectUrlConstrainer.new) do
         resources :deployments, only: [:index] do
           member do
             get :metrics
+            get :additional_metrics
           end
         end
       end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
new file mode 100644
index 00000000000..382052c298f
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -0,0 +1,17 @@
+module Gitlab::Prometheus::Queries
+  class AdditionalMetricsDeploymentQuery < AdditionalMetricsQuery
+
+    def query(deployment_id)
+      deployment = Deployment.find_by(id: deployment_id)
+      query_context = {
+        environment_slug: deployment.environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
+        timeframe_start: (deployment.created_at - 30.minutes).to_f,
+        timeframe_end: (deployment.created_at + 30.minutes).to_f
+      }
+
+      query_metrics(query_context)
+    end
+  end
+end
+
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index de0dab0b19c..c48fcadee57 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -1,7 +1,21 @@
 module Gitlab::Prometheus::Queries
   class AdditionalMetricsQuery < BaseQuery
     def query(environment_id)
-      query_processor = method(:process_query).curry[query_context(environment_id)]
+      environment = Environment.find_by(id: environment_id)
+      query_context = {
+        environment_slug: environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
+        timeframe_start: 8.hours.ago.to_f,
+        timeframe_end: Time.now.to_f
+      }
+
+      query_metrics(query_context)
+    end
+
+    protected
+
+    def query_metrics(query_context)
+      query_processor = method(:process_query).curry[query_context]
 
       matched_metrics.map do |group|
         metrics = group.metrics.map do |metric|
@@ -22,16 +36,6 @@ module Gitlab::Prometheus::Queries
 
     private
 
-    def query_context(environment_id)
-      environment = Environment.find_by(id: environment_id)
-      {
-        environment_slug: environment.slug,
-        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
-        timeframe_start: 8.hours.ago.to_f,
-        timeframe_end: Time.now.to_f
-      }
-    end
-
     def process_query(context, query)
       query_with_result = query.dup
       query_with_result[:result] =
-- 
cgit v1.2.1


From aaeda829ddb5e150be41c9dff374b2be0beab336 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 30 May 2017 13:17:13 +0200
Subject: Add Y Label field to yml and responses

---
 config/additional_metrics.yml                             | 1 +
 lib/gitlab/prometheus/metric.rb                           | 7 ++++---
 lib/gitlab/prometheus/metrics_sources.rb                  | 7 -------
 lib/gitlab/prometheus/queries/additional_metrics_query.rb | 1 +
 4 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 lib/gitlab/prometheus/metrics_sources.rb

diff --git a/config/additional_metrics.yml b/config/additional_metrics.yml
index 209209f4b30..59ca387f055 100644
--- a/config/additional_metrics.yml
+++ b/config/additional_metrics.yml
@@ -2,6 +2,7 @@
   priority: 1
   metrics:
   - title: "Memory usage"
+    y_label: "Values"
     detect: container_memory_usage_bytes
     weight: 1
     queries:
diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
index 2818afb34b0..777cf030ceb 100644
--- a/lib/gitlab/prometheus/metric.rb
+++ b/lib/gitlab/prometheus/metric.rb
@@ -1,12 +1,13 @@
 module Gitlab::Prometheus
   class Metric
-    attr_reader :group, :title, :detect, :weight, :queries
+    attr_reader :group, :title, :detect, :weight, :y_label, :queries
 
-    def initialize(group, title, detect, weight, queries = [])
+    def initialize(group, title, detect, weight, y_label, queries = [])
       @group = group
       @title = title
       @detect = detect
       @weight = weight
+      @y_label = y_label || 'Values'
       @queries = queries
     end
 
@@ -14,7 +15,7 @@ module Gitlab::Prometheus
       missing_fields = [:title, :detect, :weight, :queries].select { |key| !entry.has_key?(key) }
       raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
-      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:queries])
+      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:y_label],entry[:queries])
     end
 
     def self.metrics_from_list(group, list)
diff --git a/lib/gitlab/prometheus/metrics_sources.rb b/lib/gitlab/prometheus/metrics_sources.rb
deleted file mode 100644
index 500b6e971a2..00000000000
--- a/lib/gitlab/prometheus/metrics_sources.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Gitlab::Prometheus
-  module MetricsSources
-    def self.additional_metrics
-      @additional_metrics ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).deep_symbolize_keys.freeze
-    end
-  end
-end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index c48fcadee57..fd7f072834d 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -22,6 +22,7 @@ module Gitlab::Prometheus::Queries
           {
             title: metric.title,
             weight: metric.weight,
+            y_label: metric.y_label,
             queries: metric.queries.map(&query_processor)
           }
         end
-- 
cgit v1.2.1


From 9ccda901271eb755cf37f37831f6beef83ed7037 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 30 May 2017 15:25:05 +0200
Subject: Add Prometheus client tests

---
 spec/lib/gitlab/prometheus_client_spec.rb | 30 ++++++++++++++++++++
 spec/support/prometheus_helpers.rb        | 46 +++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/spec/lib/gitlab/prometheus_client_spec.rb b/spec/lib/gitlab/prometheus_client_spec.rb
index 2d8bd2f6b97..46eaadae206 100644
--- a/spec/lib/gitlab/prometheus_client_spec.rb
+++ b/spec/lib/gitlab/prometheus_client_spec.rb
@@ -119,6 +119,36 @@ describe Gitlab::PrometheusClient, lib: true do
     end
   end
 
+  describe '#series' do
+    let(:query_url) { prometheus_series_url('series_name', 'other_service') }
+
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    it 'calls endpoint and returns list of series' do
+      req_stub = stub_prometheus_request(query_url, body: prometheus_series('series_name'))
+      expected = prometheus_series('series_name').deep_stringify_keys['data']
+
+      expect(subject.series('series_name', 'other_service')).to eq(expected)
+
+      expect(req_stub).to have_been_requested
+    end
+  end
+
+  describe '#label_values' do
+    let(:query_url) { prometheus_label_values_url('__name__') }
+
+    it 'calls endpoint and returns label values' do
+      req_stub = stub_prometheus_request(query_url, body: prometheus_label_values)
+      expected = prometheus_label_values.deep_stringify_keys['data']
+
+      expect(subject.label_values('__name__')).to eq(expected)
+
+      expect(req_stub).to have_been_requested
+    end
+  end
+
   describe '#query_range' do
     let(:prometheus_query) { prometheus_memory_query('env-slug') }
     let(:query_url) { prometheus_query_range_url(prometheus_query) }
diff --git a/spec/support/prometheus_helpers.rb b/spec/support/prometheus_helpers.rb
index 6b9ebcf2bb3..e49902475da 100644
--- a/spec/support/prometheus_helpers.rb
+++ b/spec/support/prometheus_helpers.rb
@@ -36,6 +36,19 @@ module PrometheusHelpers
     "https://prometheus.example.com/api/v1/query_range?#{query}"
   end
 
+  def prometheus_label_values_url(name)
+    "https://prometheus.example.com/api/v1/label/#{name}/values"
+  end
+
+  def prometheus_series_url(*matches, start: 8.hours.ago, stop: Time.now)
+    query = {
+      match: matches,
+      start: start.to_f,
+      end: stop.to_f
+    }.to_query
+    "https://prometheus.example.com/api/v1/series?#{query}"
+  end
+
   def stub_prometheus_request(url, body: {}, status: 200)
     WebMock.stub_request(:get, url)
       .to_return({
@@ -140,4 +153,37 @@ module PrometheusHelpers
       }
     }
   end
+
+  def prometheus_label_values
+    {
+      'status': 'success',
+      'data': %w(job_adds job_controller_rate_limiter_use job_depth job_queue_latency job_work_duration_sum up)
+    }
+  end
+
+  def prometheus_series(name)
+    {
+      'status': 'success',
+      'data': [
+        {
+          '__name__': name,
+          'container_name': 'gitlab',
+          'environment': 'mattermost',
+          'id': '/docker/9953982f95cf5010dfc59d7864564d5f188aaecddeda343699783009f89db667',
+          'image': 'gitlab/gitlab-ce:8.15.4-ce.1',
+          'instance': 'minikube',
+          'job': 'kubernetes-nodes',
+          'name': 'k8s_gitlab.e6611886_mattermost-4210310111-77z8r_gitlab_2298ae6b-da24-11e6-baee-8e7f67d0eb3a_43536cb6',
+          'namespace': 'gitlab',
+          'pod_name': 'mattermost-4210310111-77z8r'
+        },
+        {
+          '__name__': name,
+          'id': '/docker',
+          'instance': 'minikube',
+          'job': 'kubernetes-nodes'
+        }
+      ]
+    }
+  end
 end
-- 
cgit v1.2.1


From efb264f70d943196f94132655a50d73fc416f9dc Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 26 May 2017 19:53:48 +0530
Subject: Empty state icon for Metrics

---
 app/views/shared/icons/_icon_empty_metrics.svg | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/views/shared/icons/_icon_empty_metrics.svg

diff --git a/app/views/shared/icons/_icon_empty_metrics.svg b/app/views/shared/icons/_icon_empty_metrics.svg
new file mode 100644
index 00000000000..24fa353f3ba
--- /dev/null
+++ b/app/views/shared/icons/_icon_empty_metrics.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <g fill="#E5E5E5">
+    <path d="M32 64C30.8954305 64 30 63.1045695 30 62 30 60.8954305 30.8954305 60 32 60 33.8894444 60 35.7536611 59.8131396 37.574335 59.4454933 38.6570511 59.2268618 39.7120017 59.9273408 39.9306331 61.0100569 40.1492646 62.0927729 39.4487856 63.1477235 38.3660695 63.366355 36.285133 63.7865558 34.1557023 64 32 64zM49.2301062 58.9696428C51.0302775 57.8173242 52.7114504 56.4871355 54.247711 55.0008916 55.0415758 54.232873 55.0625283 52.9667164 54.2945097 52.1728516 53.5264912 51.3789869 52.2603346 51.3580344 51.4664698 52.1260529 50.1212672 53.4274592 48.6493395 54.5920875 47.0736141 55.6007347 46.1433158 56.1962335 45.8719072 57.4331365 46.4674061 58.3634348 47.0629049 59.2937331 48.2998079 59.5651416 49.2301062 58.9696428zM61.0426034 45.4531856C61.9412068 43.5163476 62.6441937 41.4911051 63.1388045 39.4034279 63.393449 38.3286117 62.7285685 37.2508708 61.6537523 36.9962262 60.5789361 36.7415816 59.5011952 37.4064621 59.2465506 38.4812784 58.8141946 40.3061875 58.1997219 42.0764286 57.4141077 43.7697311 56.9492346 44.7717126 57.3846469 45.9608331 58.3866284 46.4257062 59.3886098 46.8905793 60.5777303 46.455167 61.0426034 45.4531856zM63.7270657 27.8034151C63.4476841 25.6718707 62.9558906 23.5863203 62.2616468 21.5714028 61.9018246 20.527084 60.7635435 19.9721898 59.7192246 20.3320119 58.6749058 20.6918341 58.1200116 21.8301152 58.4798337 22.874434 59.0867105 24.6357842 59.5166381 26.45898 59.760988 28.3232492 59.9045362 29.4184513 60.9087418 30.1899192 62.0039439 30.046371 63.099146 29.9028228 63.8706139 28.8986173 63.7270657 27.8034151zM56.4699838 11.3781121C55.0919588 9.74451505 53.5537382 8.25140603 51.8798083 6.92273835 51.0146495 6.23602588 49.7566092 6.38068523 49.0698968 7.24584403 48.3831843 8.11100284 48.5278436 9.36904308 49.3930024 10.0557555 50.8587525 11.2191822 52.2058153 12.5267396 53.4125204 13.9572433 54.1247279 14.8015385 55.3865225 14.9086168 56.2308177 14.1964094 57.0751129 13.484202 57.1821912 12.2224073 56.4699838 11.3781121zM41.481294 1.42849704C39.4470333.798260231 37.3474846.371987025 35.2067823.158824109 34.1076485.0493765922 33.1278998.851675811 33.0184523 1.95080957 32.9090048 3.04994333 33.711304 4.02969203 34.8104377 4.13913955 36.6833634 4.32563829 38.5191483 4.69835932 40.297557 5.24933028 41.3526509 5.57621023 42.4729622 4.98587613 42.7998421 3.93078217 43.1267221 2.8756882 42.536388 1.75537699 41.481294 1.42849704zM23.6558195 1.0993008C21.5852929 1.6571259 19.5822296 2.42161363 17.6728876 3.37914679 16.6855233 3.874309 16.2865147 5.07613416 16.7816769 6.06349841 17.2768392 7.05086266 18.4786643 7.44987125 19.4660286 6.95470905 21.1354949 6.11747332 22.8864813 5.44919307 24.6963667 4.96158787 25.7629079 4.67424869 26.3945759 3.57671185 26.1072367 2.51017072 25.8198975 1.44362959 24.7223606.811961615 23.6558195 1.0993008zM8.36290105 10.4291871C6.92120358 12.00815 5.63985273 13.7275139 4.53998784 15.5610549 3.97179016 16.5082746 4.27904822 17.7367631 5.22626792 18.3049608 6.17348763 18.8731585 7.40197615 18.5659004 7.97017383 17.6186807 8.9327668 16.0139803 10.054503 14.5087932 11.3168098 13.126301 12.0615972 12.3106016 12.0041117 11.0455771 11.1884123 10.3007897 10.372713 9.55600224 9.10768848 9.61348772 8.36290105 10.4291871zM.450120287 26.6230259C.151304663 28.3883054 0 30.1850053 0 32 0 32.2974081.00406268322 32.594367.0121750297 32.8908218.0423897377 33.994978.96197903 34.8655796 2.0661352 34.8353649 3.17029137 34.8051502 4.04089294 33.8855609 4.01067824 32.7814047 4.00356366 32.521412 4 32.2609289 4 32 4 30.4089462 4.13249902 28.8355581 4.39401589 27.2906242 4.57836807 26.2015475 3.84494393 25.1692294 2.75586724 24.9848772 1.66679054 24.800525.634472466 25.5339492.450120287 26.6230259zM2.45830096 44.3202494C3.28286321 46.2952494 4.30407075 48.1806071 5.50459135 49.9494734 6.124886 50.8634254 7.36863868 51.1014818 8.28259072 50.4811871 9.19654276 49.8608925 9.43459912 48.6171398 8.81430448 47.7031878 7.76386025 46.1554464 6.87058107 44.5062706 6.14951581 42.7791677 5.72395784 41.7598668 4.55266835 41.2785432 3.53336751 41.7041011 2.51406668 42.1296591 2.03274299 43.3009486 2.45830096 44.3202494zM13.73374 58.2776222C15.4883094 59.4994144 17.3614388 60.5433005 19.3262717 61.39161 20.3403619 61.8294398 21.5173756 61.3622885 21.9552054 60.3481983 22.3930351 59.3341082 21.9258838 58.1570945 20.9117937 57.7192647 19.1934726 56.9773858 17.5548741 56.0642026 16.0195384 54.9950736 15.1130877 54.3638678 13.8665707 54.5869979 13.2353649 55.4934487 12.6041591 56.3998995 12.8272892 57.6464164 13.73374 58.2776222zM30.6955071 63.9738646C29.5918263 63.9295649 28.7330282 62.9989428 28.7773279 61.895262 28.8216276 60.7915812 29.7522497 59.9327832 30.8559305 59.9770829 31.2344492 59.9922759 31.6140624 59.9999282 31.9946308 59.9999995 33.0992003 60.0002065 33.994463 60.8958047 33.994256 62.0003742 33.9940491 63.1049437 33.0984508 64.0002064 31.9938814 63.9999994 31.5600677 63.9999181 31.1272192 63.9911927 30.6955071 63.9738646zM30.1721098 44.2840559C30.7941711 46.023825 33.2407935 46.0619159 33.9167124 44.3423547L38.9452693 31.5495297 41.1315797 35.2685507C41.4908522 35.8796908 42.1468005 36.2549751 42.8557214 36.2549751L51.1106965 36.2549751C52.215266 36.2549751 53.1106965 35.3595446 53.1106965 34.2549751 53.1106965 33.1504056 52.215266 32.2549751 51.1106965 32.2549751L43.9999712 32.2549751 40.3112064 25.9802055C39.465988 24.5424477 37.3358287 24.7099356 36.7257006 26.2621229L32.1439734 37.9181973 26.2115967 21.3266406C25.5807315 19.562249 23.0875908 19.5563214 22.4483429 21.3176933L18.4775633 32.2587065 13 32.2587065C11.8954305 32.2587065 11 33.154137 11 34.2587065 11 35.363276 11.8954305 36.2587065 13 36.2587065L19.8793532 36.2587065C20.720826 36.2587065 21.4722973 35.732004 21.7593685 34.9410132L24.314328 27.9011249 30.1721098 44.2840559z"/>
+  </g>
+</svg>
-- 
cgit v1.2.1


From 2e302e35e798ae171e08c08b81092e12c34dcfc7 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 26 May 2017 19:54:10 +0530
Subject: Prometheus Metrics Panel View

---
 .../projects/services/prometheus/_show.html.haml    | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 app/views/projects/services/prometheus/_show.html.haml

diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
new file mode 100644
index 00000000000..70f53bffe58
--- /dev/null
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -0,0 +1,21 @@
+.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring
+  .col-lg-3
+    %h4.prepend-top-0
+      Metrics
+    %p
+      Metrics are automatically configured and monitored
+      based on a library of metrics from popular exporters.
+      More information
+
+  .col-lg-9
+    .panel.panel-default
+      .panel-heading
+        %h3.panel-title
+          Monitored
+          %span.badge-count.js-monitored-count 0
+      .panel-body
+        .empty-metrics
+          = custom_icon('icon_empty_metrics')
+          %p No metrics are being monitored. To start monitoring, deploy to an environment.
+          = link_to project_environments_path(@project), title: 'View environments', class: 'btn btn-success' do
+            View environments
\ No newline at end of file
-- 
cgit v1.2.1


From 7cef07c948db4aa61ec948ab227c4d42438b87fc Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 26 May 2017 19:55:14 +0530
Subject: Render service extras partial conditionally

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

diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index f1a80f1d5e1..f9ce81b729f 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -18,3 +18,7 @@
 
           = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title
         = link_to "Cancel", namespace_project_settings_integrations_path(@project.namespace, @project), class: "btn btn-cancel"
+
+- if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
+  %hr
+  = render "projects/services/#{@service.to_param}/show"
\ No newline at end of file
-- 
cgit v1.2.1


From 33fe2af4a3cfe0d1f1b93b8c6546f796cde141f2 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 26 May 2017 19:55:37 +0530
Subject: Add styles for Prometheus Metrics panel

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

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 3889deee21a..e1ee566c3a1 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -35,3 +35,28 @@
     margin-left: 5px;
   }
 }
+
+.prometheus-metrics-monitoring {
+  .panel {
+    .panel-heading .badge-count {
+      padding: 3px 8px;
+      color: $white-light;
+      background: $common-gray-dark;
+      border-radius: 40%;
+    }
+  }
+
+  .empty-metrics {
+    text-align: center;
+    padding: 20px 10px;
+
+    p,
+    .btn {
+      margin-top: 10px;
+    }
+
+    p {
+      color: $gl-gray-light;
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 2559a880eebd2b8beb0a29bad6ab9948dca0c010 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:08:22 +0530
Subject: Prometheus Metrics Bundle

---
 app/assets/javascripts/prometheus_metrics/index.js |  7 ++
 .../prometheus_metrics/prometheus_metrics.js       | 75 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 app/assets/javascripts/prometheus_metrics/index.js
 create mode 100644 app/assets/javascripts/prometheus_metrics/prometheus_metrics.js

diff --git a/app/assets/javascripts/prometheus_metrics/index.js b/app/assets/javascripts/prometheus_metrics/index.js
new file mode 100644
index 00000000000..9f20161783b
--- /dev/null
+++ b/app/assets/javascripts/prometheus_metrics/index.js
@@ -0,0 +1,7 @@
+import PrometheusMetrics from './prometheus_metrics';
+
+$(() => {
+  const prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
+  prometheusMetrics.init();
+  prometheusMetrics.loadActiveMetrics();
+});
diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
new file mode 100644
index 00000000000..0dc6f7727a2
--- /dev/null
+++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
@@ -0,0 +1,75 @@
+/* eslint-disable class-methods-use-this, promise/catch-or-return */
+
+export default class PrometheusMetrics {
+  constructor(wrapperSelector) {
+    this.backOffRequestCounter = 0;
+
+    this.$wrapper = $(wrapperSelector);
+
+    this.$monitoredMetricsPanel = this.$wrapper.find('.js-panel-monitored-metrics');
+    this.$monitoredMetricsCount = this.$monitoredMetricsPanel.find('.js-monitored-count');
+    this.$monitoredMetricsLoading = this.$monitoredMetricsPanel.find('.js-loading-metrics');
+    this.$monitoredMetricsEmpty = this.$monitoredMetricsPanel.find('.js-empty-metrics');
+    this.$monitoredMetricsList = this.$monitoredMetricsPanel.find('.js-metrics-list');
+
+    this.$panelToggle = this.$wrapper.find('.js-panel-toggle');
+
+    this.activeMetricsEndpoint = this.$monitoredMetricsPanel.data('active-metrics');
+  }
+
+  init() {
+    this.$panelToggle.on('click', e => this.handlePanelToggle(e));
+  }
+
+  handlePanelToggle(e) {
+    const $toggleBtn = $(e.currentTarget);
+    const $currentPanelBody = $toggleBtn.parents('.panel').find('.panel-body');
+    if ($currentPanelBody.is(':visible')) {
+      $currentPanelBody.addClass('hidden');
+      $toggleBtn.removeClass('fa-caret-down').addClass('fa-caret-right');
+    } else {
+      $currentPanelBody.removeClass('hidden');
+      $toggleBtn.removeClass('fa-caret-right').addClass('fa-caret-down');
+    }
+  }
+
+  populateActiveMetrics(metrics) {
+    let totalMonitoredMetrics = 0;
+    metrics.forEach((metric) => {
+      this.$monitoredMetricsList.append(`<li>${metric.group}<span class="badge-count">${metric.active_metrics}</span></li>`);
+      totalMonitoredMetrics += metric.active_metrics;
+    });
+
+    this.$monitoredMetricsCount.text(totalMonitoredMetrics);
+    this.$monitoredMetricsLoading.addClass('hidden');
+    this.$monitoredMetricsList.removeClass('hidden');
+  }
+
+  loadActiveMetrics() {
+    this.$monitoredMetricsLoading.removeClass('hidden');
+    gl.utils.backOff((next, stop) => {
+      $.getJSON(this.activeMetricsEndpoint)
+        .done((res) => {
+          if (res && res.success) {
+            stop(res);
+          } else {
+            this.backOffRequestCounter = this.backOffRequestCounter += 1;
+            if (this.backOffRequestCounter < 3) {
+              next();
+            } else {
+              stop(res);
+            }
+          }
+        })
+        .fail(stop);
+    })
+    .then((res) => {
+      if (res && res.data && res.data.length) {
+        this.populateActiveMetrics(res.data);
+      } else {
+        this.$monitoredMetricsLoading.addClass('hidden');
+        this.$monitoredMetricsEmpty.removeClass('hidden');
+      }
+    });
+  }
+}
-- 
cgit v1.2.1


From 2742bbd22c6f2330d87b631d7be25f1d7549a1d8 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:08:41 +0530
Subject: Add Prometheus Metrics Bundle

---
 config/webpack.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/webpack.config.js b/config/webpack.config.js
index c77b1d6334c..38769f3f625 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -51,6 +51,7 @@ var config = {
     pipelines:            './pipelines/index.js',
     pipelines_details:     './pipelines/pipeline_details_bundle.js',
     profile:              './profile/profile_bundle.js',
+    prometheus_metrics:   './prometheus_metrics',
     protected_branches:   './protected_branches/protected_branches_bundle.js',
     protected_tags:       './protected_tags',
     sidebar:              './sidebar/sidebar_bundle.js',
-- 
cgit v1.2.1


From 15908cf29099b994b4495ac864446ef2045d254c Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:09:21 +0530
Subject: Add Prometheus Metrics Bundle, panel for Missing environment
 variables

---
 .../projects/services/prometheus/_show.html.haml   | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index 70f53bffe58..2f0f539560a 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -1,4 +1,7 @@
-.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring
+- content_for :page_specific_javascripts do
+  = webpack_bundle_tag('prometheus_metrics')
+
+.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring.js-prometheus-metrics-monitoring
   .col-lg-3
     %h4.prepend-top-0
       Metrics
@@ -8,14 +11,28 @@
       More information
 
   .col-lg-9
-    .panel.panel-default
+    .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } }
       .panel-heading
         %h3.panel-title
           Monitored
           %span.badge-count.js-monitored-count 0
       .panel-body
-        .empty-metrics
+        .loading-metrics.js-loading-metrics
+          = icon('spinner spin 3x')
+          %p Finding and configuring metrics...
+        .empty-metrics.hidden.js-empty-metrics
           = custom_icon('icon_empty_metrics')
           %p No metrics are being monitored. To start monitoring, deploy to an environment.
           = link_to project_environments_path(@project), title: 'View environments', class: 'btn btn-success' do
-            View environments
\ No newline at end of file
+            View environments
+        %ul.metrics-list.hidden.js-metrics-list
+
+    .panel.panel-default.js-panel-missing-env-vars
+      .panel-heading
+        %h3.panel-title
+          = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
+          Missing environment variable(s)
+          %span.badge-count.js-env-var-count 0
+      .panel-body.hidden
+        .empty-metrics
+          %p Nothing to show here at the moment
\ No newline at end of file
-- 
cgit v1.2.1


From a2b68693a86493150a68719376cdc990ad93267a Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:09:42 +0530
Subject: Add styles for Prometheus Service Metrics

---
 app/assets/stylesheets/pages/settings.scss | 38 +++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index e1ee566c3a1..3ce17d64182 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -38,14 +38,31 @@
 
 .prometheus-metrics-monitoring {
   .panel {
+    .panel-toggle {
+      width: 12px;
+
+      &.fa-caret-right {
+        padding-left: 4px;
+      }
+    }
+
     .panel-heading .badge-count {
-      padding: 3px 8px;
       color: $white-light;
       background: $common-gray-dark;
+    }
+
+    .panel-body {
+      padding: 0;
+    }
+
+    .badge-count {
+      margin-left: 3px;
+      padding: 3px 8px;
       border-radius: 40%;
     }
   }
 
+  .loading-metrics,
   .empty-metrics {
     text-align: center;
     padding: 20px 10px;
@@ -59,4 +76,23 @@
       color: $gl-gray-light;
     }
   }
+
+  .metrics-list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+
+    li {
+      padding: 15px 10px;
+
+      .badge-count {
+        background: $badge-bg;
+      }
+    }
+
+    /* Ensure we don't add border if there's only single li */
+    li + li {
+      border-top: 1px solid $border-color;
+    }
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.1


From a57e6a8b760d79a0a2adca8cce0547928599e3cb Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:10:03 +0530
Subject: Add support for Prometheus Service

---
 spec/factories/services.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index 3fad4d2d658..412dd82c929 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -25,6 +25,14 @@ FactoryGirl.define do
     })
   end
 
+  factory :prometheus_service do
+    project factory: :empty_project
+    active true
+    properties({
+      api_url: 'https://prometheus.example.com/'
+    })
+  end
+
   factory :jira_service do
     project factory: :empty_project
     active true
-- 
cgit v1.2.1


From c3c644c722dc2f0887067dbba68e43d91e610f62 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 17:10:30 +0530
Subject: Prometheus Service Fixture Generator

---
 spec/javascripts/fixtures/prometheus_service.rb | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 spec/javascripts/fixtures/prometheus_service.rb

diff --git a/spec/javascripts/fixtures/prometheus_service.rb b/spec/javascripts/fixtures/prometheus_service.rb
new file mode 100644
index 00000000000..7dfbf885fbd
--- /dev/null
+++ b/spec/javascripts/fixtures/prometheus_service.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:admin)     { create(:admin) }
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project)   { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
+  let!(:service)  { create(:prometheus_service, project: project) }
+  
+
+  render_views
+
+  before(:all) do
+    clean_frontend_fixtures('services/')
+  end
+
+  before(:each) do
+    sign_in(admin)
+  end
+
+  it 'services/prometheus_service.html.raw' do |example|
+    get :edit,
+      namespace_id: namespace,
+      project_id: project,
+      id: service.to_param
+
+    expect(response).to be_success
+    store_frontend_fixture(response, example.description)
+  end
+end
-- 
cgit v1.2.1


From 5cccbde4c66eaf22fc45da5a8d87a3f05552ecc7 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 19:05:26 +0530
Subject: Populate Missing env var panel

---
 .../javascripts/prometheus_metrics/prometheus_metrics.js | 16 +++++++++++++++-
 app/views/projects/services/prometheus/_show.html.haml   | 15 +++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
index 0dc6f7727a2..b44fdcc9dc4 100644
--- a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
+++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
@@ -12,7 +12,10 @@ export default class PrometheusMetrics {
     this.$monitoredMetricsEmpty = this.$monitoredMetricsPanel.find('.js-empty-metrics');
     this.$monitoredMetricsList = this.$monitoredMetricsPanel.find('.js-metrics-list');
 
-    this.$panelToggle = this.$wrapper.find('.js-panel-toggle');
+    this.$missingEnvVarPanel = this.$wrapper.find('.js-panel-missing-env-vars');
+    this.$panelToggle = this.$missingEnvVarPanel.find('.js-panel-toggle');
+    this.$missingEnvVarMetricCount = this.$missingEnvVarPanel.find('.js-env-var-count');
+    this.$missingEnvVarMetricsList = this.$missingEnvVarPanel.find('.js-missing-var-metrics-list');
 
     this.activeMetricsEndpoint = this.$monitoredMetricsPanel.data('active-metrics');
   }
@@ -35,14 +38,25 @@ export default class PrometheusMetrics {
 
   populateActiveMetrics(metrics) {
     let totalMonitoredMetrics = 0;
+    let totalMissingEnvVarMetrics = 0;
+
     metrics.forEach((metric) => {
       this.$monitoredMetricsList.append(`<li>${metric.group}<span class="badge-count">${metric.active_metrics}</span></li>`);
       totalMonitoredMetrics += metric.active_metrics;
+      if (metric.metrics_missing_requirements > 0) {
+        this.$missingEnvVarMetricsList.append(`<li>${metric.group}</li>`);
+        totalMissingEnvVarMetrics += 1;
+      }
     });
 
     this.$monitoredMetricsCount.text(totalMonitoredMetrics);
     this.$monitoredMetricsLoading.addClass('hidden');
     this.$monitoredMetricsList.removeClass('hidden');
+
+    if (totalMissingEnvVarMetrics > 0) {
+      this.$missingEnvVarPanel.removeClass('hidden');
+      this.$missingEnvVarMetricCount.text(totalMissingEnvVarMetrics);
+    }
   }
 
   loadActiveMetrics() {
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index 2f0f539560a..3192116d128 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -8,7 +8,7 @@
     %p
       Metrics are automatically configured and monitored
       based on a library of metrics from popular exporters.
-      More information
+      = link_to 'More information', '#'
 
   .col-lg-9
     .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } }
@@ -27,12 +27,19 @@
             View environments
         %ul.metrics-list.hidden.js-metrics-list
 
-    .panel.panel-default.js-panel-missing-env-vars
+    .panel.panel-default.hidden.js-panel-missing-env-vars
       .panel-heading
         %h3.panel-title
           = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
           Missing environment variable(s)
           %span.badge-count.js-env-var-count 0
       .panel-body.hidden
-        .empty-metrics
-          %p Nothing to show here at the moment
\ No newline at end of file
+        .flash-container
+          .flash-notice
+            .flash-text
+              To set up automatic monitoring, add the environment variable
+              %code
+                $CI_ENVIRONMENT_SLUG
+              to exporter's queries.
+              = link_to 'More information', '#'
+        %ul.metrics-list.js-missing-var-metrics-list
\ No newline at end of file
-- 
cgit v1.2.1


From b4b16212d9c17231f843db1b59caa5d086490860 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 19:05:54 +0530
Subject: Styles for banner within panel

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

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 3ce17d64182..7c35690f584 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -60,6 +60,14 @@
       padding: 3px 8px;
       border-radius: 40%;
     }
+
+    .flash-container {
+      margin-bottom: 0;
+
+      .flash-notice {
+        border-radius: 0;
+      }
+    }
   }
 
   .loading-metrics,
-- 
cgit v1.2.1


From 85b6b9b6aa3f76bd7e6ea764a49829afbfba9de8 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Wed, 31 May 2017 20:17:31 +0530
Subject: Lint: Fix missing new line at EOF

---
 app/assets/stylesheets/pages/settings.scss             | 2 +-
 app/views/projects/services/_form.html.haml            | 2 +-
 app/views/projects/services/prometheus/_show.html.haml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 7c35690f584..7c99eef3406 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -103,4 +103,4 @@
       border-top: 1px solid $border-color;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index f9ce81b729f..a9013701591 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -21,4 +21,4 @@
 
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
   %hr
-  = render "projects/services/#{@service.to_param}/show"
\ No newline at end of file
+  = render "projects/services/#{@service.to_param}/show"
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index 3192116d128..bf8bfe4ddcb 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -42,4 +42,4 @@
                 $CI_ENVIRONMENT_SLUG
               to exporter's queries.
               = link_to 'More information', '#'
-        %ul.metrics-list.js-missing-var-metrics-list
\ No newline at end of file
+        %ul.metrics-list.js-missing-var-metrics-list
-- 
cgit v1.2.1


From b83a40483ad5f87b3e08c3ed2d090b5d87bdac27 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Thu, 1 Jun 2017 13:25:16 +0530
Subject: Remove service help, add URL field help

---
 app/models/project_services/prometheus_service.rb | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index d3f43d66937..d4d6611fd3b 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -28,17 +28,6 @@ class PrometheusService < MonitoringService
     'Prometheus monitoring'
   end
 
-  def help
-    <<-MD.strip_heredoc
-      Retrieves the Kubernetes node metrics `container_cpu_usage_seconds_total`
-      and `container_memory_usage_bytes` from the configured Prometheus server.
-
-      If you are not using [Auto-Deploy](https://docs.gitlab.com/ee/ci/autodeploy/index.html)
-      or have set up your own Prometheus server, an `environment` label is required on each metric to
-      [identify the Environment](https://docs.gitlab.com/ce/user/project/integrations/prometheus.html#metrics-and-labels).
-    MD
-  end
-
   def self.to_param
     'prometheus'
   end
@@ -49,7 +38,8 @@ class PrometheusService < MonitoringService
         type: 'text',
         name: 'api_url',
         title: 'API URL',
-        placeholder: 'Prometheus API Base URL, like http://prometheus.example.com/'
+        placeholder: 'Prometheus API Base URL, like http://prometheus.example.com/',
+        help: 'By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server.'
       }
     ]
   end
-- 
cgit v1.2.1


From 4826ae074f2757e2ca7cddbb201688a11bcf8f8b Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Thu, 1 Jun 2017 13:25:48 +0530
Subject: Changes based on UX review

---
 app/assets/stylesheets/pages/settings.scss             | 9 +++++++--
 app/views/projects/services/prometheus/_show.html.haml | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 7c99eef3406..deed4501399 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -73,11 +73,12 @@
   .loading-metrics,
   .empty-metrics {
     text-align: center;
-    padding: 20px 10px;
+    padding: 30px 10px;
 
     p,
     .btn {
       margin-top: 10px;
+      margin-bottom: 0;
     }
 
     p {
@@ -85,13 +86,17 @@
     }
   }
 
+  .loading-metrics .fa-spin {
+    color: $loading-color;
+  }
+
   .metrics-list {
     list-style-type: none;
     margin: 0;
     padding: 0;
 
     li {
-      padding: 15px 10px;
+      padding: 16px;
 
       .badge-count {
         background: $badge-bg;
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index bf8bfe4ddcb..82d4dd2488f 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -31,7 +31,7 @@
       .panel-heading
         %h3.panel-title
           = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
-          Missing environment variable(s)
+          Missing environment variable
           %span.badge-count.js-env-var-count 0
       .panel-body.hidden
         .flash-container
@@ -40,6 +40,6 @@
               To set up automatic monitoring, add the environment variable
               %code
                 $CI_ENVIRONMENT_SLUG
-              to exporter's queries.
+              to exporter&rsquo;s queries.
               = link_to 'More information', '#'
         %ul.metrics-list.js-missing-var-metrics-list
-- 
cgit v1.2.1


From afc1a67d19c077bc61350a01d6a0f7e676e5a0f6 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Thu, 1 Jun 2017 15:05:15 +0530
Subject: Handle response failure case for loadActiveMetrics

---
 app/assets/javascripts/prometheus_metrics/prometheus_metrics.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
index b44fdcc9dc4..d83e85b2026 100644
--- a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
+++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
@@ -1,5 +1,3 @@
-/* eslint-disable class-methods-use-this, promise/catch-or-return */
-
 export default class PrometheusMetrics {
   constructor(wrapperSelector) {
     this.backOffRequestCounter = 0;
@@ -24,6 +22,7 @@ export default class PrometheusMetrics {
     this.$panelToggle.on('click', e => this.handlePanelToggle(e));
   }
 
+  /* eslint-disable class-methods-use-this */
   handlePanelToggle(e) {
     const $toggleBtn = $(e.currentTarget);
     const $currentPanelBody = $toggleBtn.parents('.panel').find('.panel-body');
@@ -84,6 +83,10 @@ export default class PrometheusMetrics {
         this.$monitoredMetricsLoading.addClass('hidden');
         this.$monitoredMetricsEmpty.removeClass('hidden');
       }
+    })
+    .catch(() => {
+      this.$monitoredMetricsLoading.addClass('hidden');
+      this.$monitoredMetricsEmpty.removeClass('hidden');
     });
   }
 }
-- 
cgit v1.2.1


From 4c58fd82df71e1a8a4389cbbb8a5ea3b0186291c Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Thu, 1 Jun 2017 15:05:27 +0530
Subject: Tests for `PrometheusMetrics` class

---
 spec/javascripts/prometheus_metrics/mock_data.js   |  41 +++++++
 .../prometheus_metrics/prometheus_metrics_spec.js  | 125 +++++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100644 spec/javascripts/prometheus_metrics/mock_data.js
 create mode 100644 spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js

diff --git a/spec/javascripts/prometheus_metrics/mock_data.js b/spec/javascripts/prometheus_metrics/mock_data.js
new file mode 100644
index 00000000000..3af56df92e2
--- /dev/null
+++ b/spec/javascripts/prometheus_metrics/mock_data.js
@@ -0,0 +1,41 @@
+export const metrics = [
+  {
+    group: 'Kubernetes',
+    priority: 1,
+    active_metrics: 4,
+    metrics_missing_requirements: 0,
+  },
+  {
+    group: 'HAProxy',
+    priority: 2,
+    active_metrics: 3,
+    metrics_missing_requirements: 0,
+  },
+  {
+    group: 'Apache',
+    priority: 3,
+    active_metrics: 5,
+    metrics_missing_requirements: 0,
+  },
+];
+
+export const missingVarMetrics = [
+  {
+    group: 'Kubernetes',
+    priority: 1,
+    active_metrics: 4,
+    metrics_missing_requirements: 0,
+  },
+  {
+    group: 'HAProxy',
+    priority: 2,
+    active_metrics: 3,
+    metrics_missing_requirements: 1,
+  },
+  {
+    group: 'Apache',
+    priority: 3,
+    active_metrics: 5,
+    metrics_missing_requirements: 3,
+  },
+];
diff --git a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
new file mode 100644
index 00000000000..8b4f386af80
--- /dev/null
+++ b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
@@ -0,0 +1,125 @@
+import PrometheusMetrics from '~/prometheus_metrics/prometheus_metrics';
+import { metrics, missingVarMetrics } from './mock_data';
+
+describe('PrometheusMetrics', () => {
+  const FIXTURE = 'services/prometheus_service.html.raw';
+  preloadFixtures(FIXTURE);
+
+  beforeEach(() => {
+    loadFixtures(FIXTURE);
+  });
+
+  describe('constructor', () => {
+    let prometheusMetrics;
+
+    beforeEach(() => {
+      prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
+    });
+
+    it('should initialize wrapper element refs on class object', () => {
+      expect(prometheusMetrics.$wrapper).toBeDefined();
+      expect(prometheusMetrics.$monitoredMetricsPanel).toBeDefined();
+      expect(prometheusMetrics.$monitoredMetricsCount).toBeDefined();
+      expect(prometheusMetrics.$monitoredMetricsLoading).toBeDefined();
+      expect(prometheusMetrics.$monitoredMetricsEmpty).toBeDefined();
+      expect(prometheusMetrics.$monitoredMetricsList).toBeDefined();
+      expect(prometheusMetrics.$missingEnvVarPanel).toBeDefined();
+      expect(prometheusMetrics.$panelToggle).toBeDefined();
+      expect(prometheusMetrics.$missingEnvVarMetricCount).toBeDefined();
+      expect(prometheusMetrics.$missingEnvVarMetricsList).toBeDefined();
+    });
+
+    it('should initialize metadata on class object', () => {
+      expect(prometheusMetrics.backOffRequestCounter).toEqual(0);
+      expect(prometheusMetrics.activeMetricsEndpoint).toContain('/test');
+    });
+  });
+
+  describe('populateActiveMetrics', () => {
+    let prometheusMetrics;
+
+    beforeEach(() => {
+      prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
+    });
+
+    it('should show monitored metrics list', () => {
+      prometheusMetrics.populateActiveMetrics(metrics);
+
+      const $metricsListLi = prometheusMetrics.$monitoredMetricsList.find('li');
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$monitoredMetricsList.hasClass('hidden')).toBeFalsy();
+
+      expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual('12');
+      expect($metricsListLi.length).toEqual(metrics.length);
+      expect($metricsListLi.first().find('.badge-count').text()).toEqual(`${metrics[0].active_metrics}`);
+    });
+
+    it('should show missing environment variables list', () => {
+      prometheusMetrics.populateActiveMetrics(missingVarMetrics);
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$missingEnvVarPanel.hasClass('hidden')).toBeFalsy();
+
+      expect(prometheusMetrics.$missingEnvVarMetricCount.text()).toEqual('2');
+      expect(prometheusMetrics.$missingEnvVarPanel.find('li').length).toEqual(2);
+      expect(prometheusMetrics.$missingEnvVarPanel.find('.flash-container')).toBeDefined();
+    });
+  });
+
+  describe('loadActiveMetrics', () => {
+    let prometheusMetrics;
+
+    beforeEach(() => {
+      prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
+    });
+
+    it('should show loader animation while response is being loaded and hide it when request is complete', (done) => {
+      const deferred = $.Deferred();
+      spyOn($, 'getJSON').and.returnValue(deferred.promise());
+
+      prometheusMetrics.loadActiveMetrics();
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeFalsy();
+      expect($.getJSON).toHaveBeenCalledWith(prometheusMetrics.activeMetricsEndpoint);
+
+      deferred.resolve({ data: metrics, success: true });
+
+      setTimeout(() => {
+        expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+        done();
+      });
+    });
+
+    it('should show empty state if response failed to load', (done) => {
+      const deferred = $.Deferred();
+      spyOn($, 'getJSON').and.returnValue(deferred.promise());
+      spyOn(prometheusMetrics, 'populateActiveMetrics');
+
+      prometheusMetrics.loadActiveMetrics();
+
+      deferred.reject();
+
+      setTimeout(() => {
+        expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+        expect(prometheusMetrics.$monitoredMetricsEmpty.hasClass('hidden')).toBeFalsy();
+        done();
+      });
+    });
+
+    it('should populate metrics list once response is loaded', (done) => {
+      const deferred = $.Deferred();
+      spyOn($, 'getJSON').and.returnValue(deferred.promise());
+      spyOn(prometheusMetrics, 'populateActiveMetrics');
+
+      prometheusMetrics.loadActiveMetrics();
+
+      deferred.resolve({ data: metrics, success: true });
+
+      setTimeout(() => {
+        expect(prometheusMetrics.populateActiveMetrics).toHaveBeenCalledWith(metrics);
+        done();
+      });
+    });
+  });
+});
-- 
cgit v1.2.1


From 3f0eff82592f4a30abb6ffd15ac248a5f773c994 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Thu, 1 Jun 2017 21:24:56 +0530
Subject: Update as per review feedback

---
 .../javascripts/prometheus_metrics/constants.js    |  5 +++
 app/assets/javascripts/prometheus_metrics/index.js |  1 -
 .../prometheus_metrics/prometheus_metrics.js       | 45 +++++++++++++++-------
 app/assets/stylesheets/pages/settings.scss         | 30 +++++----------
 .../projects/services/prometheus/_show.html.haml   | 14 +++----
 .../prometheus_metrics/prometheus_metrics_spec.js  | 35 ++++++++++++++++-
 6 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100644 app/assets/javascripts/prometheus_metrics/constants.js

diff --git a/app/assets/javascripts/prometheus_metrics/constants.js b/app/assets/javascripts/prometheus_metrics/constants.js
new file mode 100644
index 00000000000..50f1248456e
--- /dev/null
+++ b/app/assets/javascripts/prometheus_metrics/constants.js
@@ -0,0 +1,5 @@
+export default {
+  EMPTY: 'empty',
+  LOADING: 'loading',
+  LIST: 'list',
+};
diff --git a/app/assets/javascripts/prometheus_metrics/index.js b/app/assets/javascripts/prometheus_metrics/index.js
index 9f20161783b..a0c43c5abe1 100644
--- a/app/assets/javascripts/prometheus_metrics/index.js
+++ b/app/assets/javascripts/prometheus_metrics/index.js
@@ -2,6 +2,5 @@ import PrometheusMetrics from './prometheus_metrics';
 
 $(() => {
   const prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
-  prometheusMetrics.init();
   prometheusMetrics.loadActiveMetrics();
 });
diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
index d83e85b2026..ef4d6df5138 100644
--- a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
+++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
@@ -1,3 +1,5 @@
+import PANEL_STATE from './constants';
+
 export default class PrometheusMetrics {
   constructor(wrapperSelector) {
     this.backOffRequestCounter = 0;
@@ -16,31 +18,48 @@ export default class PrometheusMetrics {
     this.$missingEnvVarMetricsList = this.$missingEnvVarPanel.find('.js-missing-var-metrics-list');
 
     this.activeMetricsEndpoint = this.$monitoredMetricsPanel.data('active-metrics');
-  }
 
-  init() {
     this.$panelToggle.on('click', e => this.handlePanelToggle(e));
   }
 
   /* eslint-disable class-methods-use-this */
   handlePanelToggle(e) {
     const $toggleBtn = $(e.currentTarget);
-    const $currentPanelBody = $toggleBtn.parents('.panel').find('.panel-body');
-    if ($currentPanelBody.is(':visible')) {
-      $currentPanelBody.addClass('hidden');
+    const $currentPanelBody = $toggleBtn.closest('.panel').find('.panel-body');
+    $currentPanelBody.toggleClass('hidden');
+    if ($toggleBtn.hasClass('fa-caret-down')) {
       $toggleBtn.removeClass('fa-caret-down').addClass('fa-caret-right');
     } else {
-      $currentPanelBody.removeClass('hidden');
       $toggleBtn.removeClass('fa-caret-right').addClass('fa-caret-down');
     }
   }
 
+  showMonitoringMetricsPanelState(stateName) {
+    switch (stateName) {
+      case PANEL_STATE.LOADING:
+        this.$monitoredMetricsLoading.removeClass('hidden');
+        this.$monitoredMetricsEmpty.addClass('hidden');
+        this.$monitoredMetricsList.addClass('hidden');
+        break;
+      case PANEL_STATE.LIST:
+        this.$monitoredMetricsLoading.addClass('hidden');
+        this.$monitoredMetricsEmpty.addClass('hidden');
+        this.$monitoredMetricsList.removeClass('hidden');
+        break;
+      default:
+        this.$monitoredMetricsLoading.addClass('hidden');
+        this.$monitoredMetricsEmpty.removeClass('hidden');
+        this.$monitoredMetricsList.addClass('hidden');
+        break;
+    }
+  }
+
   populateActiveMetrics(metrics) {
     let totalMonitoredMetrics = 0;
     let totalMissingEnvVarMetrics = 0;
 
     metrics.forEach((metric) => {
-      this.$monitoredMetricsList.append(`<li>${metric.group}<span class="badge-count">${metric.active_metrics}</span></li>`);
+      this.$monitoredMetricsList.append(`<li>${metric.group}<span class="badge">${metric.active_metrics}</span></li>`);
       totalMonitoredMetrics += metric.active_metrics;
       if (metric.metrics_missing_requirements > 0) {
         this.$missingEnvVarMetricsList.append(`<li>${metric.group}</li>`);
@@ -49,17 +68,17 @@ export default class PrometheusMetrics {
     });
 
     this.$monitoredMetricsCount.text(totalMonitoredMetrics);
-    this.$monitoredMetricsLoading.addClass('hidden');
-    this.$monitoredMetricsList.removeClass('hidden');
+    this.showMonitoringMetricsPanelState(PANEL_STATE.LIST);
 
     if (totalMissingEnvVarMetrics > 0) {
       this.$missingEnvVarPanel.removeClass('hidden');
+      this.$missingEnvVarPanel.find('.flash-container').off('click');
       this.$missingEnvVarMetricCount.text(totalMissingEnvVarMetrics);
     }
   }
 
   loadActiveMetrics() {
-    this.$monitoredMetricsLoading.removeClass('hidden');
+    this.showMonitoringMetricsPanelState(PANEL_STATE.LOADING);
     gl.utils.backOff((next, stop) => {
       $.getJSON(this.activeMetricsEndpoint)
         .done((res) => {
@@ -80,13 +99,11 @@ export default class PrometheusMetrics {
       if (res && res.data && res.data.length) {
         this.populateActiveMetrics(res.data);
       } else {
-        this.$monitoredMetricsLoading.addClass('hidden');
-        this.$monitoredMetricsEmpty.removeClass('hidden');
+        this.showMonitoringMetricsPanelState(PANEL_STATE.EMPTY);
       }
     })
     .catch(() => {
-      this.$monitoredMetricsLoading.addClass('hidden');
-      this.$monitoredMetricsEmpty.removeClass('hidden');
+      this.showMonitoringMetricsPanelState(PANEL_STATE.EMPTY);
     });
   }
 }
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index deed4501399..e2ed1239541 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -39,11 +39,11 @@
 .prometheus-metrics-monitoring {
   .panel {
     .panel-toggle {
-      width: 12px;
+      width: 14px;
+    }
 
-      &.fa-caret-right {
-        padding-left: 4px;
-      }
+    .badge {
+      font-size: inherit;
     }
 
     .panel-heading .badge-count {
@@ -55,14 +55,9 @@
       padding: 0;
     }
 
-    .badge-count {
-      margin-left: 3px;
-      padding: 3px 8px;
-      border-radius: 40%;
-    }
-
     .flash-container {
       margin-bottom: 0;
+      cursor: default;
 
       .flash-notice {
         border-radius: 0;
@@ -80,25 +75,20 @@
       margin-top: 10px;
       margin-bottom: 0;
     }
-
-    p {
-      color: $gl-gray-light;
-    }
   }
 
-  .loading-metrics .fa-spin {
+  .loading-metrics .metrics-load-spinner {
     color: $loading-color;
   }
 
   .metrics-list {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
+    margin-bottom: 0;
 
     li {
-      padding: 16px;
+      padding: $gl-padding;
 
-      .badge-count {
+      .badge {
+        margin-left: 5px;
         background: $badge-bg;
       }
     }
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index 82d4dd2488f..f0bd8c8bee9 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -11,28 +11,28 @@
       = link_to 'More information', '#'
 
   .col-lg-9
-    .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project)}.json" } }
+    .panel.panel-default.js-panel-monitored-metrics{ data: { "active-metrics" => "#{namespace_project_prometheus_active_metrics_path(@project.namespace, @project, :json)}" } }
       .panel-heading
         %h3.panel-title
           Monitored
-          %span.badge-count.js-monitored-count 0
+          %span.badge.js-monitored-count 0
       .panel-body
         .loading-metrics.js-loading-metrics
-          = icon('spinner spin 3x')
+          = icon('spinner spin 3x', class: 'metrics-load-spinner')
           %p Finding and configuring metrics...
         .empty-metrics.hidden.js-empty-metrics
           = custom_icon('icon_empty_metrics')
           %p No metrics are being monitored. To start monitoring, deploy to an environment.
           = link_to project_environments_path(@project), title: 'View environments', class: 'btn btn-success' do
             View environments
-        %ul.metrics-list.hidden.js-metrics-list
+        %ul.list-unstyled.metrics-list.hidden.js-metrics-list
 
     .panel.panel-default.hidden.js-panel-missing-env-vars
       .panel-heading
         %h3.panel-title
-          = icon('caret-right lg', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
+          = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
           Missing environment variable
-          %span.badge-count.js-env-var-count 0
+          %span.badge.js-env-var-count 0
       .panel-body.hidden
         .flash-container
           .flash-notice
@@ -42,4 +42,4 @@
                 $CI_ENVIRONMENT_SLUG
               to exporter&rsquo;s queries.
               = link_to 'More information', '#'
-        %ul.metrics-list.js-missing-var-metrics-list
+        %ul.list-unstyled.metrics-list.js-missing-var-metrics-list
diff --git a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
index 8b4f386af80..e7187a8a5e0 100644
--- a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
+++ b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
@@ -1,4 +1,5 @@
 import PrometheusMetrics from '~/prometheus_metrics/prometheus_metrics';
+import PANEL_STATE from '~/prometheus_metrics/constants';
 import { metrics, missingVarMetrics } from './mock_data';
 
 describe('PrometheusMetrics', () => {
@@ -35,6 +36,38 @@ describe('PrometheusMetrics', () => {
     });
   });
 
+  describe('showMonitoringMetricsPanelState', () => {
+    let prometheusMetrics;
+
+    beforeEach(() => {
+      prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
+    });
+
+    it('should show loading state when called with `loading`', () => {
+      prometheusMetrics.showMonitoringMetricsPanelState(PANEL_STATE.LOADING);
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeFalsy();
+      expect(prometheusMetrics.$monitoredMetricsEmpty.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$monitoredMetricsList.hasClass('hidden')).toBeTruthy();
+    });
+
+    it('should show metrics list when called with `list`', () => {
+      prometheusMetrics.showMonitoringMetricsPanelState(PANEL_STATE.LIST);
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$monitoredMetricsEmpty.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$monitoredMetricsList.hasClass('hidden')).toBeFalsy();
+    });
+
+    it('should show empty state when called with `empty`', () => {
+      prometheusMetrics.showMonitoringMetricsPanelState(PANEL_STATE.EMPTY);
+
+      expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy();
+      expect(prometheusMetrics.$monitoredMetricsEmpty.hasClass('hidden')).toBeFalsy();
+      expect(prometheusMetrics.$monitoredMetricsList.hasClass('hidden')).toBeTruthy();
+    });
+  });
+
   describe('populateActiveMetrics', () => {
     let prometheusMetrics;
 
@@ -52,7 +85,7 @@ describe('PrometheusMetrics', () => {
 
       expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual('12');
       expect($metricsListLi.length).toEqual(metrics.length);
-      expect($metricsListLi.first().find('.badge-count').text()).toEqual(`${metrics[0].active_metrics}`);
+      expect($metricsListLi.first().find('.badge').text()).toEqual(`${metrics[0].active_metrics}`);
     });
 
     it('should show missing environment variables list', () => {
-- 
cgit v1.2.1


From 223abc6df005beba45a514b44af7227b224dadd3 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Fri, 2 Jun 2017 17:03:30 +0530
Subject: Use `.text-center` class instead of text-align prop

---
 app/assets/stylesheets/pages/settings.scss             | 1 -
 app/views/projects/services/prometheus/_show.html.haml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index e2ed1239541..7f39a99b59d 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -67,7 +67,6 @@
 
   .loading-metrics,
   .empty-metrics {
-    text-align: center;
     padding: 30px 10px;
 
     p,
diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml
index f0bd8c8bee9..c4ac384ca1a 100644
--- a/app/views/projects/services/prometheus/_show.html.haml
+++ b/app/views/projects/services/prometheus/_show.html.haml
@@ -17,10 +17,10 @@
           Monitored
           %span.badge.js-monitored-count 0
       .panel-body
-        .loading-metrics.js-loading-metrics
+        .loading-metrics.text-center.js-loading-metrics
           = icon('spinner spin 3x', class: 'metrics-load-spinner')
           %p Finding and configuring metrics...
-        .empty-metrics.hidden.js-empty-metrics
+        .empty-metrics.text-center.hidden.js-empty-metrics
           = custom_icon('icon_empty_metrics')
           %p No metrics are being monitored. To start monitoring, deploy to an environment.
           = link_to project_environments_path(@project), title: 'View environments', class: 'btn btn-success' do
-- 
cgit v1.2.1


From e74896df0c7d0d88958a3d35b3144361cfdd0594 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 31 May 2017 19:36:07 +0200
Subject: Matched Metrics tests

---
 config/additional_metrics.yml                      | 14 ++++--
 lib/gitlab/prometheus/metric.rb                    | 21 ++++-----
 lib/gitlab/prometheus/metric_group.rb              |  2 +-
 .../prometheus/queries/matched_metrics_query.rb    | 49 ++++++++++++---------
 .../queries/matched_metrics_query_spec.rb          | 50 ++++++++++++++++++++++
 5 files changed, 97 insertions(+), 39 deletions(-)
 create mode 100644 spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb

diff --git a/config/additional_metrics.yml b/config/additional_metrics.yml
index 59ca387f055..d84db1530a8 100644
--- a/config/additional_metrics.yml
+++ b/config/additional_metrics.yml
@@ -3,25 +3,31 @@
   metrics:
   - title: "Memory usage"
     y_label: "Values"
-    detect: container_memory_usage_bytes
+    required_metrics:
+      - container_memory_usage_bytes
     weight: 1
     queries:
     - query_range: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
       label: Container memory
+      display_empty: true
       unit: MiB
   - title: "Current memory usage"
-    detect: container_memory_usage_bytes
+    required_metrics:
+     - container_memory_usage_bytes
     weight: 1
     queries:
     - query: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
+      display_empty: false
       unit: MiB
   - title: "CPU usage"
-    detect: container_cpu_usage_seconds_total
+    required_metrics:
+     - container_cpu_usage_seconds_total
     weight: 1
     queries:
     - query_range: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
   - title: "Current CPU usage"
-    detect: container_cpu_usage_seconds_total
+    required_metrics:
+     - container_cpu_usage_seconds_total
     weight: 1
     queries:
     - query: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
index 777cf030ceb..d7cd4237a7b 100644
--- a/lib/gitlab/prometheus/metric.rb
+++ b/lib/gitlab/prometheus/metric.rb
@@ -1,29 +1,24 @@
 module Gitlab::Prometheus
   class Metric
-    attr_reader :group, :title, :detect, :weight, :y_label, :queries
+    attr_reader :group, :title, :required_metrics, :weight, :y_label, :queries
 
-    def initialize(group, title, detect, weight, y_label, queries = [])
-      @group = group
+    def initialize(title, required_metrics, weight, y_label, queries = [])
       @title = title
-      @detect = detect
+      @required_metrics = required_metrics
       @weight = weight
       @y_label = y_label || 'Values'
       @queries = queries
     end
 
-    def self.metric_from_entry(group, entry)
-      missing_fields = [:title, :detect, :weight, :queries].select { |key| !entry.has_key?(key) }
+    def self.metric_from_entry(entry)
+      missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.has_key?(key) }
       raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
-      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:y_label],entry[:queries])
+      Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
     end
 
-    def self.metrics_from_list(group, list)
-      list.map { |entry| metric_from_entry(group, entry) }
-    end
-
-    def self.additional_metrics_raw
-      @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).map(&:deep_symbolize_keys)
+    def self.metrics_from_list(list)
+      list.map { |entry| metric_from_entry(entry) }
     end
   end
 end
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 9f95525bc0c..0dcd9dc0f36 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -22,7 +22,7 @@ module Gitlab::Prometheus
       raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
       group = MetricGroup.new(entry[:group], entry[:priority])
-      group.metrics = Metric.metrics_from_list(group, entry[:metrics])
+      group.metrics = Metric.metrics_from_list(entry[:metrics])
       group
     end
 
diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
index 5a8b0f6c701..a5e1f6a3fde 100644
--- a/lib/gitlab/prometheus/queries/matched_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
@@ -16,31 +16,28 @@ module Gitlab::Prometheus::Queries
     private
 
     def groups_data
-      metrics_series = metrics_with_series(Gitlab::Prometheus::MetricGroup.all)
-      lookup = active_series_lookup(metrics_series)
+      metrics_groups = groups_with_active_metrics(Gitlab::Prometheus::MetricGroup.all)
+      lookup = active_series_lookup(metrics_groups)
 
       groups = {}
 
-      metrics_series.each do |metrics, series|
-        groups[metrics.group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
-        group = groups[metrics.group]
+      metrics_groups.each do |group|
+        groups[group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
+        metrics = group.metrics.flat_map(&:required_metrics)
+        active_metrics = metrics.count(&lookup.method(:has_key?))
 
-        if series.all?(&lookup.method(:has_key?))
-          group[:active_metrics] += 1
-        else
-          group[:metrics_missing_requirements] += 1
-        end
-        group
+        groups[group][:active_metrics] += active_metrics
+        groups[group][:metrics_missing_requirements] += metrics.count - active_metrics
       end
 
       groups
     end
 
-    def active_series_lookup(metrics)
+    def active_series_lookup(metric_groups)
       timeframe_start = 8.hours.ago
       timeframe_end = Time.now
 
-      series = metrics.flat_map { |metrics, series| series }.uniq
+      series = metric_groups.flat_map(&:metrics).flat_map(&:required_metrics).uniq
 
       lookup = series.each_slice(MAX_QUERY_ITEMS).flat_map do |batched_series|
         client_series(*batched_series, start: timeframe_start, stop: timeframe_end)
@@ -54,17 +51,27 @@ module Gitlab::Prometheus::Queries
       series_info.has_key?('environment')
     end
 
-    def metrics_with_series(metric_groups)
-      label_values = client_label_values || []
+    def available_metrics
+      @available_metrics ||= client_label_values || []
+    end
 
-      metrics = metric_groups.flat_map do |group|
-        group.metrics.map do |metric|
-          matcher = Regexp.compile(metric.detect)
-          [metric, label_values.select(&matcher.method(:match))]
-        end
+    def filter_active_metrics(metric_group)
+      metric_group.metrics.select! do |metric|
+        metric.required_metrics.all?(&available_metrics.method(:include?))
       end
+      metric_group
+    end
 
-      metrics.select { |metric, labels| labels&.any? }
+    def groups_with_active_metrics(metric_groups)
+      metric_groups.map(&method(:filter_active_metrics)).select { |group| group.metrics.any? }
+    end
+
+    def metrics_with_required_series(metric_groups)
+      metric_groups.flat_map do |group|
+        group.metrics.select do |metric|
+          metric.required_metrics.all?(&available_metrics.method(:include?))
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
new file mode 100644
index 00000000000..0aee9d37889
--- /dev/null
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
+  let(:environment) { create(:environment, slug: 'environment-slug') }
+  let(:deployment) { create(:deployment, environment: environment) }
+
+  let(:client) { double('prometheus_client') }
+  subject { described_class.new(client) }
+
+  around do |example|
+    time_without_subsecond_values = Time.local(2008, 9, 1, 12, 0, 0)
+    Timecop.freeze(time_without_subsecond_values) { example.run }
+  end
+
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
+
+  let(:simple_metrics) do
+    [
+      metric_class.new('title', ['metrica', 'metricb'], '1', 'y_label', [{ :query_range => 'avg' }])
+    ]
+  end
+
+  let(:simple_metric_group) do
+    metric_group_class.new('name', 1, simple_metrics)
+  end
+
+  let(:xx) do
+    [{
+       '__name__': 'metrica',
+       'environment': 'mattermost'
+     },
+     {
+       '__name__': 'metricb',
+       'environment': 'mattermost'
+     }]
+  end
+
+  before do
+    allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+
+    allow(client).to receive(:label_values).and_return(['metrica', 'metricb'])
+    allow(client).to receive(:series).and_return(xx)
+  end
+
+  it "something something" do
+
+    expect(subject.query).to eq("asf")
+  end
+end
-- 
cgit v1.2.1


From 6a70509a2763717e592c603249855bfb43519d2f Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 2 Jun 2017 23:32:59 +0200
Subject: Towards Reviewable prometheus

---
 .../prometheus/queries/matched_metrics_query.rb    |   7 +-
 spec/db/production/settings.rb.orig                |  16 +++
 .../queries/matched_metrics_query_spec.rb          | 125 ++++++++++++++++-----
 .../prometheus/matched_metrics_query_helper.rb     |  33 ++++++
 4 files changed, 146 insertions(+), 35 deletions(-)
 create mode 100644 spec/db/production/settings.rb.orig
 create mode 100644 spec/support/prometheus/matched_metrics_query_helper.rb

diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
index a5e1f6a3fde..fc97bca486c 100644
--- a/lib/gitlab/prometheus/queries/matched_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
@@ -23,11 +23,10 @@ module Gitlab::Prometheus::Queries
 
       metrics_groups.each do |group|
         groups[group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
-        metrics = group.metrics.flat_map(&:required_metrics)
-        active_metrics = metrics.count(&lookup.method(:has_key?))
+        active_metrics = group.metrics.count { |metric| metric.required_metrics.all?(&lookup.method(:has_key?)) }
 
         groups[group][:active_metrics] += active_metrics
-        groups[group][:metrics_missing_requirements] += metrics.count - active_metrics
+        groups[group][:metrics_missing_requirements] += group.metrics.count - active_metrics
       end
 
       groups
@@ -48,7 +47,7 @@ module Gitlab::Prometheus::Queries
     end
 
     def has_matching_label(series_info)
-      series_info.has_key?('environment')
+      series_info.key?('environment')
     end
 
     def available_metrics
diff --git a/spec/db/production/settings.rb.orig b/spec/db/production/settings.rb.orig
new file mode 100644
index 00000000000..3cbb173c4cc
--- /dev/null
+++ b/spec/db/production/settings.rb.orig
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'seed production settings', lib: true do
+  include StubENV
+
+  context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
+    before do
+      stub_env('GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN', '013456789')
+    end
+
+    it 'writes the token to the database' do
+      load(File.join(__dir__, '../../../db/fixtures/production/010_settings.rb'))
+      expect(ApplicationSetting.current.runners_registration_token).to eq('013456789')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
index 0aee9d37889..d46de56f520 100644
--- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -1,50 +1,113 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
-  let(:environment) { create(:environment, slug: 'environment-slug') }
-  let(:deployment) { create(:deployment, environment: environment) }
+  include Prometheus::MatchedMetricsQueryHelper
+
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
 
   let(:client) { double('prometheus_client') }
+
   subject { described_class.new(client) }
 
-  around do |example|
-    time_without_subsecond_values = Time.local(2008, 9, 1, 12, 0, 0)
-    Timecop.freeze(time_without_subsecond_values) { example.run }
-  end
+  context 'with one group where two metrics are found' do
+    before do
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+      allow(client).to receive(:label_values).and_return(metric_names)
+    end
 
-  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
-  let(:metric_class) { Gitlab::Prometheus::Metric }
+    context 'both metrics in the group pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_with_environment)
+      end
 
-  let(:simple_metrics) do
-    [
-      metric_class.new('title', ['metrica', 'metricb'], '1', 'y_label', [{ :query_range => 'avg' }])
-    ]
-  end
+      it 'responds with both metrics as actve' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 }])
+      end
+    end
 
-  let(:simple_metric_group) do
-    metric_group_class.new('name', 1, simple_metrics)
-  end
+    context 'none of the metrics pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_without_environment)
+      end
 
-  let(:xx) do
-    [{
-       '__name__': 'metrica',
-       'environment': 'mattermost'
-     },
-     {
-       '__name__': 'metricb',
-       'environment': 'mattermost'
-     }]
+      it 'responds with both metrics missing requirements' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }])
+      end
+    end
+
+    context 'no series information found about the metrics' do
+      before do
+        allow(client).to receive(:series).and_return(empty_series_info)
+      end
+
+      it 'responds with both metrics missing requirements' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }])
+      end
+    end
+
+    context 'one of the series info was not found' do
+      before do
+        allow(client).to receive(:series).and_return(partialy_empty_series_info)
+      end
+      it 'responds with one active and one missing metric' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 1 }])
+      end
+    end
   end
 
-  before do
-    allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+  context 'with one group where only one metric is found' do
+    before do
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+      allow(client).to receive(:label_values).and_return('metric_a')
+    end
+
+    context 'both metrics in the group pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_with_environment)
+      end
+
+      it 'responds with one metrics as active and no missing requiremens' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 }])
+      end
+    end
 
-    allow(client).to receive(:label_values).and_return(['metrica', 'metricb'])
-    allow(client).to receive(:series).and_return(xx)
+    context 'no metrics in group pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_without_environment)
+      end
+
+      it 'responds with one metrics as active and no missing requiremens' do
+        expect(subject.query).to eq([{ group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 }])
+      end
+    end
   end
 
-  it "something something" do
+  context 'with two groups where only one metric is found' do
+    before do
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group,
+                                                             simple_metric_group('nameb', simple_metrics('metric_c'))])
+      allow(client).to receive(:label_values).and_return('metric_c')
+    end
+
+    context 'both metrics in the group pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_with_environment('metric_c'))
+      end
+
+      it 'responds with one metrics as active and no missing requiremens' do
+        expect(subject.query).to eq([{ group: 'nameb', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 }])
+      end
+    end
+
+    context 'no metris in group pass requirements' do
+      before do
+        allow(client).to receive(:series).and_return(series_info_without_environment)
+      end
 
-    expect(subject.query).to eq("asf")
+      it 'responds with one metrics as active and no missing requiremens' do
+        expect(subject.query).to eq([{ group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 }])
+      end
+    end
   end
 end
diff --git a/spec/support/prometheus/matched_metrics_query_helper.rb b/spec/support/prometheus/matched_metrics_query_helper.rb
new file mode 100644
index 00000000000..ecaf85e3338
--- /dev/null
+++ b/spec/support/prometheus/matched_metrics_query_helper.rb
@@ -0,0 +1,33 @@
+module Prometheus
+  module MatchedMetricsQueryHelper
+    def metric_names
+      %w{metric_a metric_b}
+    end
+
+    def simple_metrics(metric_name = 'metric_a')
+      [metric_class.new('title', %W(#{metric_name} metric_b), nil, nil),
+       metric_class.new('title', [metric_name], nil, nil)]
+    end
+
+    def simple_metric_group(name = 'name', metrics = simple_metrics)
+      metric_group_class.new(name, 1, metrics)
+    end
+
+    def series_info_with_environment(*more_metrics)
+      %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } }
+    end
+
+    def series_info_without_environment
+      [{ '__name__' => 'metric_a' },
+       { '__name__' => 'metric_b' }]
+    end
+
+    def partialy_empty_series_info
+      [{ '__name__' => 'metric_a', 'environment' => '' }]
+    end
+
+    def empty_series_info
+      []
+    end
+  end
+end
-- 
cgit v1.2.1


From ae5268ce8cc533be4086a11d9d89fa726136d59d Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 11:32:56 +0200
Subject: Additional Metrics tests

---
 config/additional_metrics.yml                      |  1 -
 .../prometheus/queries/additional_metrics_query.rb | 35 +++++++++------
 .../queries/additional_metrics_query_spec.rb       | 49 +++++++++++++++++++++
 .../queries/matched_metrics_query_spec.rb          |  2 +-
 .../prometheus/additional_metrics_query_helper.rb  | 51 ++++++++++++++++++++++
 .../prometheus/matched_metrics_query_helper.rb     |  6 +--
 6 files changed, 126 insertions(+), 18 deletions(-)
 create mode 100644 spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
 create mode 100644 spec/support/prometheus/additional_metrics_query_helper.rb

diff --git a/config/additional_metrics.yml b/config/additional_metrics.yml
index d84db1530a8..daecde49570 100644
--- a/config/additional_metrics.yml
+++ b/config/additional_metrics.yml
@@ -9,7 +9,6 @@
     queries:
     - query_range: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
       label: Container memory
-      display_empty: true
       unit: MiB
   - title: "Current memory usage"
     required_metrics:
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index fd7f072834d..d21a3978e25 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -17,26 +17,42 @@ module Gitlab::Prometheus::Queries
     def query_metrics(query_context)
       query_processor = method(:process_query).curry[query_context]
 
-      matched_metrics.map do |group|
+      groups = matched_metrics.map do |group|
         metrics = group.metrics.map do |metric|
           {
             title: metric.title,
             weight: metric.weight,
             y_label: metric.y_label,
-            queries: metric.queries.map(&query_processor)
+            queries: metric.queries.map(&query_processor).select(&method(:query_with_result))
           }
         end
 
         {
           group: group.name,
           priority: group.priority,
-          metrics: metrics
+          metrics: metrics.select(&method(:metric_with_any_queries))
         }
       end
+
+      groups.select(&method(:group_with_any_metrics))
     end
 
     private
 
+    def metric_with_any_queries(metric)
+      metric[:queries]&.count > 0
+    end
+
+    def group_with_any_metrics(group)
+      group[:metrics]&.count > 0
+    end
+
+    def query_with_result(query)
+      query[:result]&.any? do |item|
+        item&.[](:values)&.any? || item&.[](:value)&.any?
+      end
+    end
+
     def process_query(context, query)
       query_with_result = query.dup
       query_with_result[:result] =
@@ -48,22 +64,15 @@ module Gitlab::Prometheus::Queries
       query_with_result
     end
 
-    def process_result(query_result)
-      contains_metrics = query_result.all? do |item|
-        item&.[](:values)&.any? || item&.[](:value)&.any?
-      end
 
-      contains_metrics
+    def available_metrics
+      @available_metrics ||= client_label_values || []
     end
 
     def matched_metrics
-      label_values = client_label_values || []
-      Gitlab::Prometheus::MetricGroup.all
-
       result = Gitlab::Prometheus::MetricGroup.all.map do |group|
         group.metrics.select! do |metric|
-          matcher = Regexp.compile(metric.detect)
-          label_values.any? &matcher.method(:match)
+          metric.required_metrics.all?(&available_metrics.method(:include?))
         end
         group
       end
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
new file mode 100644
index 00000000000..c7e2dbc12ec
--- /dev/null
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
+  include Prometheus::AdditionalMetricsQueryHelper
+
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
+
+  let(:client) { double('prometheus_client') }
+  let(:environment) { create(:environment, slug: 'environment-slug') }
+
+  subject(:query_result) { described_class.new(client).query(environment.id) }
+
+
+  context 'with one group where two metrics is found' do
+    before do
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+      allow(client).to receive(:label_values).and_return(metric_names)
+    end
+
+    context 'some querie return results' do
+      before do
+        expect(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        expect(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+        expect(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
+      end
+
+      it 'return results only for queries with results' do
+        puts query_result
+        expected = {
+          group: 'name',
+          priority: 1,
+          metrics:
+            [
+              {
+                title: 'title', weight: nil, y_label: 'Values', queries:
+                [
+                  { query_range: 'query_range_a', result: query_range_result },
+                  { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
+                ]
+              }
+            ]
+        }
+
+        expect(query_result).to eq([expected])
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
index d46de56f520..390fff568cc 100644
--- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -10,7 +10,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
 
   subject { described_class.new(client) }
 
-  context 'with one group where two metrics are found' do
+  context 'with one group where two metrics is found' do
     before do
       allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
       allow(client).to receive(:label_values).and_return(metric_names)
diff --git a/spec/support/prometheus/additional_metrics_query_helper.rb b/spec/support/prometheus/additional_metrics_query_helper.rb
new file mode 100644
index 00000000000..d80beb066ff
--- /dev/null
+++ b/spec/support/prometheus/additional_metrics_query_helper.rb
@@ -0,0 +1,51 @@
+module Prometheus
+  module AdditionalMetricsQueryHelper
+    def metric_names
+      %w{metric_a metric_b}
+    end
+
+    def simple_queries
+      [{ query_range: 'query_range_a' }, { query_range: 'query_range_b', label: 'label', unit: 'unit' }]
+    end
+
+    def simple_query(suffix = 'a')
+      [{ query_range: "query_range_#{suffix}" }]
+    end
+
+    def simple_metrics
+      [
+        Gitlab::Prometheus::Metric.new('title', %w(metric_a metric_b), nil, nil, simple_queries),
+        Gitlab::Prometheus::Metric.new('title', %w{metric_a}, nil, nil, simple_query('empty')),
+        Gitlab::Prometheus::Metric.new('title', %w{metric_c}, nil, nil)
+      ]
+    end
+
+    def simple_metric_group(name = 'name', metrics = simple_metrics)
+      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
+    end
+
+    def query_result
+      [
+        {
+          'metric': {},
+          'value': [
+            1488772511.004,
+            '0.000041021495238095323'
+          ]
+        }
+      ]
+    end
+
+    def query_range_result
+      [
+        {
+          'metric': {},
+          'values': [
+            [1488758662.506, '0.00002996364761904785'],
+            [1488758722.506, '0.00003090239047619091']
+          ]
+        }
+      ]
+    end
+  end
+end
diff --git a/spec/support/prometheus/matched_metrics_query_helper.rb b/spec/support/prometheus/matched_metrics_query_helper.rb
index ecaf85e3338..86e874fb295 100644
--- a/spec/support/prometheus/matched_metrics_query_helper.rb
+++ b/spec/support/prometheus/matched_metrics_query_helper.rb
@@ -5,12 +5,12 @@ module Prometheus
     end
 
     def simple_metrics(metric_name = 'metric_a')
-      [metric_class.new('title', %W(#{metric_name} metric_b), nil, nil),
-       metric_class.new('title', [metric_name], nil, nil)]
+      [Gitlab::Prometheus::Metric.new('title', %W(#{metric_name} metric_b), nil, nil),
+       Gitlab::Prometheus::Metric.new('title', [metric_name], nil, nil)]
     end
 
     def simple_metric_group(name = 'name', metrics = simple_metrics)
-      metric_group_class.new(name, 1, metrics)
+      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
     end
 
     def series_info_with_environment(*more_metrics)
-- 
cgit v1.2.1


From eaaad702deab2ff73cc204d55056745bf34c703e Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 13:33:11 +0200
Subject: Additional metrics test using multiple groups

---
 .../queries/additional_metrics_query_spec.rb       | 96 +++++++++++++++++++---
 .../prometheus/additional_metrics_query_helper.rb  | 20 -----
 spec/support/prometheus/metric_builders.rb         | 27 ++++++
 3 files changed, 111 insertions(+), 32 deletions(-)
 create mode 100644 spec/support/prometheus/metric_builders.rb

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
index c7e2dbc12ec..617028cde37 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
   include Prometheus::AdditionalMetricsQueryHelper
+  include Prometheus::MetricBuilders
 
   let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
   let(:metric_class) { Gitlab::Prometheus::Metric }
@@ -11,6 +12,9 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
 
   subject(:query_result) { described_class.new(client).query(environment.id) }
 
+  around do |example|
+    Timecop.freeze { example.run }
+  end
 
   context 'with one group where two metrics is found' do
     before do
@@ -18,31 +22,99 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
       allow(client).to receive(:label_values).and_return(metric_names)
     end
 
-    context 'some querie return results' do
+    context 'some queries return results' do
       before do
         expect(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
         expect(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
         expect(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
       end
 
+      it 'return results only for queries with results' do
+        expected = [
+          {
+            group: 'name',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title', weight: nil, y_label: 'Values', queries: [
+                { query_range: 'query_range_a', result: query_range_result },
+                { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
+              ]
+              }
+            ]
+          }
+        ]
+
+        expect(query_result).to eq(expected)
+      end
+    end
+  end
+
+  context 'with two groups with one metric each' do
+    let(:metrics) { [simple_metric(queries: [simple_query])] }
+    before do
+      allow(metric_group_class).to receive(:all).and_return(
+        [
+          simple_metric_group('group_a', [simple_metric(queries: [simple_query])]),
+          simple_metric_group('group_b', [simple_metric(title: 'title_b', queries: [simple_query('b')])])
+        ])
+      allow(client).to receive(:label_values).and_return(metric_names)
+    end
+
+    context 'some queries return results' do
+      before do
+        expect(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        expect(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+      end
+
       it 'return results only for queries with results' do
         puts query_result
-        expected = {
-          group: 'name',
-          priority: 1,
-          metrics:
-            [
+        expected = [
+          {
+            group: 'group_a',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_a',
+                    result: [
+                      {
+                        metric: {},
+                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            group: 'group_b',
+            priority: 1,
+            metrics: [
               {
-                title: 'title', weight: nil, y_label: 'Values', queries:
-                [
-                  { query_range: 'query_range_a', result: query_range_result },
-                  { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
+                title: 'title_b',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_b', result: [
+                    {
+                      metric: {},
+                      values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
+                    }
+                  ]
+                  }
                 ]
               }
             ]
-        }
+          }
+        ]
 
-        expect(query_result).to eq([expected])
+        expect(query_result).to eq(expected)
       end
     end
   end
diff --git a/spec/support/prometheus/additional_metrics_query_helper.rb b/spec/support/prometheus/additional_metrics_query_helper.rb
index d80beb066ff..84cbc24a301 100644
--- a/spec/support/prometheus/additional_metrics_query_helper.rb
+++ b/spec/support/prometheus/additional_metrics_query_helper.rb
@@ -4,26 +4,6 @@ module Prometheus
       %w{metric_a metric_b}
     end
 
-    def simple_queries
-      [{ query_range: 'query_range_a' }, { query_range: 'query_range_b', label: 'label', unit: 'unit' }]
-    end
-
-    def simple_query(suffix = 'a')
-      [{ query_range: "query_range_#{suffix}" }]
-    end
-
-    def simple_metrics
-      [
-        Gitlab::Prometheus::Metric.new('title', %w(metric_a metric_b), nil, nil, simple_queries),
-        Gitlab::Prometheus::Metric.new('title', %w{metric_a}, nil, nil, simple_query('empty')),
-        Gitlab::Prometheus::Metric.new('title', %w{metric_c}, nil, nil)
-      ]
-    end
-
-    def simple_metric_group(name = 'name', metrics = simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
-    end
-
     def query_result
       [
         {
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
new file mode 100644
index 00000000000..2d54ecdfb5c
--- /dev/null
+++ b/spec/support/prometheus/metric_builders.rb
@@ -0,0 +1,27 @@
+module Prometheus
+  module MetricBuilders
+    def simple_query(suffix = 'a', **opts)
+      { query_range: "query_range_#{suffix}" }.merge(opts)
+    end
+
+    def simple_queries
+      [simple_query, simple_query('b', label: 'label', unit: 'unit')]
+    end
+
+    def simple_metric(title: 'title', required_metrics: [], queries: [])
+      Gitlab::Prometheus::Metric.new(title, required_metrics, nil, nil, queries)
+    end
+
+    def simple_metrics
+      [
+        simple_metric(required_metrics: %w(metric_a metric_b), queries: simple_queries),
+        simple_metric(required_metrics: %w{metric_a}, queries: [simple_query('empty')]),
+        simple_metric(required_metrics: %w{metric_c})
+      ]
+    end
+
+    def simple_metric_group(name = 'name', metrics = simple_metrics)
+      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.1


From cf4aeafa6f3baaec7652f486cd04b7170dde9fbf Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 14:42:53 +0200
Subject: Test Partial additional query response

---
 .../queries/additional_metrics_query_spec.rb       | 54 ++++++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
index 617028cde37..2291c4d67bb 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
@@ -24,12 +24,12 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
 
     context 'some queries return results' do
       before do
-        expect(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
-        expect(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
-        expect(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
       end
 
-      it 'return results only for queries with results' do
+      it 'return group data only for queries with results' do
         expected = [
           {
             group: 'name',
@@ -61,14 +61,13 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
       allow(client).to receive(:label_values).and_return(metric_names)
     end
 
-    context 'some queries return results' do
+    context 'both queries return results' do
       before do
-        expect(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
-        expect(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
       end
 
-      it 'return results only for queries with results' do
-        puts query_result
+      it 'return group data both queries' do
         expected = [
           {
             group: 'group_a',
@@ -117,5 +116,42 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
         expect(query_result).to eq(expected)
       end
     end
+
+    context 'one query returns result' do
+      before do
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return([])
+      end
+
+      it 'queries using specific time' do
+        expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
+
+        expect(query_result).not_to be_nil
+      end
+
+      it 'return group data only for query with results' do
+        expected = [
+          {
+            group: 'group_a',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_a',
+                    result: query_range_result
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+
+        expect(query_result).to eq(expected)
+      end
+    end
   end
 end
-- 
cgit v1.2.1


From 223d07b38315a68fe39df90a7675f043d8b7acaf Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 18:38:09 +0200
Subject: Environments#additional_metrics tests

---
 .../projects/environments_controller_spec.rb       | 40 ++++++++++
 spec/models/environment_spec.rb                    | 93 ++++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 20f99b209eb..12efdc700c5 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -311,6 +311,46 @@ describe Projects::EnvironmentsController do
     end
   end
 
+  describe 'GET #additional_metrics' do
+    before do
+      allow(controller).to receive(:environment).and_return(environment)
+    end
+
+    context 'when environment has no metrics' do
+      before do
+        expect(environment).to receive(:additional_metrics).and_return(nil)
+      end
+
+      context 'when requesting metrics as JSON' do
+        it 'returns a metrics JSON document' do
+          get :additional_metrics, environment_params(format: :json)
+
+          expect(response).to have_http_status(204)
+          expect(json_response).to eq({})
+        end
+      end
+    end
+
+    context 'when environment has some metrics' do
+      before do
+        expect(environment).to receive(:additional_metrics).and_return({
+                                                              success: true,
+                                                              data: {},
+                                                              last_update: 42
+                                                            })
+      end
+
+      it 'returns a metrics JSON document' do
+        get :additional_metrics, environment_params(format: :json)
+
+        expect(response).to be_ok
+        expect(json_response['success']).to be(true)
+        expect(json_response['data']).to eq({})
+        expect(json_response['last_update']).to eq(42)
+      end
+    end
+  end
+
   def environment_params(opts = {})
     opts.reverse_merge(namespace_id: project.namespace,
                        project_id: project,
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 12519de8636..12de9c9111b 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -409,6 +409,99 @@ describe Environment, models: true do
     end
   end
 
+  describe '#has_metrics?' do
+    subject { environment.has_metrics? }
+
+    context 'when the enviroment is available' do
+      context 'with a deployment service' do
+        let(:project) { create(:prometheus_project) }
+
+        context 'and a deployment' do
+          let!(:deployment) { create(:deployment, environment: environment) }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'but no deployments' do
+          it { is_expected.to be_falsy }
+        end
+      end
+
+      context 'without a monitoring service' do
+        it { is_expected.to be_falsy }
+      end
+    end
+
+    context 'when the environment is unavailable' do
+      let(:project) { create(:prometheus_project) }
+
+      before do
+        environment.stop
+      end
+
+      it { is_expected.to be_falsy }
+    end
+  end
+
+  describe '#additional_metrics' do
+    let(:project) { create(:prometheus_project) }
+    subject { environment.additional_metrics }
+
+    context 'when the environment has additional metrics' do
+      before do
+        allow(environment).to receive(:has_additional_metrics?).and_return(true)
+      end
+
+      it 'returns the additional metrics from the deployment service' do
+        expect(project.monitoring_service).to receive(:reactive_query)
+                                                .with(Gitlab::Prometheus::Queries::AdditionalMetricsQuery.name, environment.id)
+                                                .and_return(:fake_metrics)
+
+        is_expected.to eq(:fake_metrics)
+      end
+    end
+
+    context 'when the environment does not have metrics' do
+      before do
+        allow(environment).to receive(:has_additional_metrics?).and_return(false)
+      end
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#has_additional_metrics??' do
+    subject { environment.has_metrics? }
+
+    context 'when the enviroment is available' do
+      context 'with a deployment service' do
+        let(:project) { create(:prometheus_project) }
+
+        context 'and a deployment' do
+          let!(:deployment) { create(:deployment, environment: environment) }
+          it { is_expected.to be_truthy }
+        end
+
+        context 'but no deployments' do
+          it { is_expected.to be_falsy }
+        end
+      end
+
+      context 'without a monitoring service' do
+        it { is_expected.to be_falsy }
+      end
+    end
+
+    context 'when the environment is unavailable' do
+      let(:project) { create(:prometheus_project) }
+
+      before do
+        environment.stop
+      end
+
+      it { is_expected.to be_falsy }
+    end
+  end
+
   describe '#slug' do
     it "is automatically generated" do
       expect(environment.slug).not_to be_nil
-- 
cgit v1.2.1


From eccc187a70a6745ca02211648814c89ff390dfa3 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 19:26:46 +0200
Subject: Additional Metrics of deployment tests

---
 .../additional_metrics_deployment_query_spec.rb    |  29 +++++
 .../queries/additional_metrics_query_spec.rb       | 143 +--------------------
 .../additional_metrics_shared_examples.rb          | 143 +++++++++++++++++++++
 spec/support/prometheus/metric_builders.rb         |   6 +-
 4 files changed, 179 insertions(+), 142 deletions(-)
 create mode 100644 spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
 create mode 100644 spec/support/prometheus/additional_metrics_shared_examples.rb

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
new file mode 100644
index 00000000000..93a9ce38d80
--- /dev/null
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery, lib: true do
+  include Prometheus::AdditionalMetricsQueryHelper
+  include Prometheus::MetricBuilders
+
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
+
+  let(:client) { double('prometheus_client') }
+  let(:environment) { create(:environment, slug: 'environment-slug') }
+  let(:deployment) { create(:deployment, environment: environment) }
+
+  subject(:query_result) { described_class.new(client).query(deployment.id) }
+
+  around do |example|
+    Timecop.freeze { example.run }
+  end
+
+  include_examples 'additional metrics query' do
+    it 'queries using specific time' do
+      expect(client).to receive(:query_range).with(anything,
+                                                   start: (deployment.created_at - 30.minutes).to_f,
+                                                   stop: (deployment.created_at + 30.minutes).to_f)
+
+      expect(query_result).not_to be_nil
+    end
+  end
+end
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
index 2291c4d67bb..e5db1326597 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
@@ -4,9 +4,6 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
   include Prometheus::AdditionalMetricsQueryHelper
   include Prometheus::MetricBuilders
 
-  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
-  let(:metric_class) { Gitlab::Prometheus::Metric }
-
   let(:client) { double('prometheus_client') }
   let(:environment) { create(:environment, slug: 'environment-slug') }
 
@@ -16,142 +13,10 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
     Timecop.freeze { example.run }
   end
 
-  context 'with one group where two metrics is found' do
-    before do
-      allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
-      allow(client).to receive(:label_values).and_return(metric_names)
-    end
-
-    context 'some queries return results' do
-      before do
-        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
-        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
-        allow(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
-      end
-
-      it 'return group data only for queries with results' do
-        expected = [
-          {
-            group: 'name',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title', weight: nil, y_label: 'Values', queries: [
-                { query_range: 'query_range_a', result: query_range_result },
-                { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
-              ]
-              }
-            ]
-          }
-        ]
-
-        expect(query_result).to eq(expected)
-      end
-    end
-  end
-
-  context 'with two groups with one metric each' do
-    let(:metrics) { [simple_metric(queries: [simple_query])] }
-    before do
-      allow(metric_group_class).to receive(:all).and_return(
-        [
-          simple_metric_group('group_a', [simple_metric(queries: [simple_query])]),
-          simple_metric_group('group_b', [simple_metric(title: 'title_b', queries: [simple_query('b')])])
-        ])
-      allow(client).to receive(:label_values).and_return(metric_names)
-    end
-
-    context 'both queries return results' do
-      before do
-        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
-        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
-      end
-
-      it 'return group data both queries' do
-        expected = [
-          {
-            group: 'group_a',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_a',
-                    result: [
-                      {
-                        metric: {},
-                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] }
-                    ]
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            group: 'group_b',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title_b',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_b', result: [
-                    {
-                      metric: {},
-                      values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
-                    }
-                  ]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-
-        expect(query_result).to eq(expected)
-      end
-    end
-
-    context 'one query returns result' do
-      before do
-        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
-        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return([])
-      end
-
-      it 'queries using specific time' do
-        expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
-
-        expect(query_result).not_to be_nil
-      end
-
-      it 'return group data only for query with results' do
-        expected = [
-          {
-            group: 'group_a',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_a',
-                    result: query_range_result
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-
-        expect(query_result).to eq(expected)
-      end
+  include_examples 'additional metrics query' do
+    it 'queries using specific time' do
+      expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
+      expect(query_result).not_to be_nil
     end
   end
 end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
new file mode 100644
index 00000000000..96a9e1f5049
--- /dev/null
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -0,0 +1,143 @@
+RSpec.shared_examples 'additional metrics query' do
+  include Prometheus::MetricBuilders
+
+  before do
+    allow(client).to receive(:label_values).and_return(metric_names)
+    allow(metric_group_class).to receive(:all).and_return([simple_metric_group(metrics: [simple_metric])])
+  end
+
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
+
+  context 'with one group where two metrics is found' do
+    before do
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
+    end
+
+    context 'some queries return results' do
+      before do
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_empty', any_args).and_return([])
+      end
+
+      it 'return group data only for queries with results' do
+        expected = [
+          {
+            group: 'name',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title', weight: nil, y_label: 'Values', queries: [
+                { query_range: 'query_range_a', result: query_range_result },
+                { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
+              ]
+              }
+            ]
+          }
+        ]
+
+        expect(query_result).to eq(expected)
+      end
+    end
+  end
+
+  context 'with two groups with one metric each' do
+    let(:metrics) { [simple_metric(queries: [simple_query])] }
+    before do
+      allow(metric_group_class).to receive(:all).and_return(
+        [
+          simple_metric_group(name: 'group_a', metrics: [simple_metric(queries: [simple_query])]),
+          simple_metric_group(name: 'group_b', metrics: [simple_metric(title: 'title_b', queries: [simple_query('b')])])
+        ])
+      allow(client).to receive(:label_values).and_return(metric_names)
+    end
+
+    context 'both queries return results' do
+      before do
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return(query_range_result)
+      end
+
+      it 'return group data both queries' do
+        expected = [
+          {
+            group: 'group_a',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_a',
+                    result: [
+                      {
+                        metric: {},
+                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            group: 'group_b',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title_b',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_b', result: [
+                    {
+                      metric: {},
+                      values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
+                    }
+                  ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+
+        expect(query_result).to eq(expected)
+      end
+    end
+
+    context 'one query returns result' do
+      before do
+        allow(client).to receive(:query_range).with('query_range_a', any_args).and_return(query_range_result)
+        allow(client).to receive(:query_range).with('query_range_b', any_args).and_return([])
+      end
+
+      it 'return group data only for query with results' do
+        expected = [
+          {
+            group: 'group_a',
+            priority: 1,
+            metrics: [
+              {
+                title: 'title',
+                weight: nil,
+                y_label: 'Values',
+                queries: [
+                  {
+                    query_range: 'query_range_a',
+                    result: query_range_result
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+
+        expect(query_result).to eq(expected)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index 2d54ecdfb5c..c57694bf7fd 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -8,7 +8,7 @@ module Prometheus
       [simple_query, simple_query('b', label: 'label', unit: 'unit')]
     end
 
-    def simple_metric(title: 'title', required_metrics: [], queries: [])
+    def simple_metric(title: 'title', required_metrics: [], queries: [simple_query])
       Gitlab::Prometheus::Metric.new(title, required_metrics, nil, nil, queries)
     end
 
@@ -20,8 +20,8 @@ module Prometheus
       ]
     end
 
-    def simple_metric_group(name = 'name', metrics = simple_metrics)
+    def simple_metric_group(name: 'name', metrics: simple_metrics)
       Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From a3eb8264f31a79fc05113df4276d7dcf4e0bad75 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 19:43:30 +0200
Subject: Refactor Metric tests to use more common code

---
 .../prometheus/queries/matched_metrics_query_spec.rb | 20 +++++++++++++-------
 .../prometheus/matched_metrics_query_helper.rb       |  9 ---------
 spec/support/prometheus/metric_builders.rb           |  6 +++---
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
index 390fff568cc..34f11205878 100644
--- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
   include Prometheus::MatchedMetricsQueryHelper
+  include Prometheus::MetricBuilders
 
   let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
   let(:metric_class) { Gitlab::Prometheus::Metric }
@@ -83,30 +84,35 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
     end
   end
 
-  context 'with two groups where only one metric is found' do
+  context 'with two groups where metrics are found in each group' do
+    let(:second_metric_group) { simple_metric_group(name: 'nameb', metrics: simple_metrics(added_metric_name: 'metric_c')) }
+
     before do
-      allow(metric_group_class).to receive(:all).and_return([simple_metric_group,
-                                                             simple_metric_group('nameb', simple_metrics('metric_c'))])
+      allow(metric_group_class).to receive(:all).and_return([simple_metric_group, second_metric_group])
       allow(client).to receive(:label_values).and_return('metric_c')
     end
 
-    context 'both metrics in the group pass requirements' do
+    context 'all metrics in both groups pass requirements' do
       before do
         allow(client).to receive(:series).and_return(series_info_with_environment('metric_c'))
       end
 
       it 'responds with one metrics as active and no missing requiremens' do
-        expect(subject.query).to eq([{ group: 'nameb', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 }])
+        expect(subject.query).to eq([
+                                      { group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 },
+                                      { group: 'nameb', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 }])
       end
     end
 
-    context 'no metris in group pass requirements' do
+    context 'no metrics in groups pass requirements' do
       before do
         allow(client).to receive(:series).and_return(series_info_without_environment)
       end
 
       it 'responds with one metrics as active and no missing requiremens' do
-        expect(subject.query).to eq([{ group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 }])
+        expect(subject.query).to eq([
+                                      { group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 },
+                                      { group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }])
       end
     end
   end
diff --git a/spec/support/prometheus/matched_metrics_query_helper.rb b/spec/support/prometheus/matched_metrics_query_helper.rb
index 86e874fb295..0471a78e426 100644
--- a/spec/support/prometheus/matched_metrics_query_helper.rb
+++ b/spec/support/prometheus/matched_metrics_query_helper.rb
@@ -4,15 +4,6 @@ module Prometheus
       %w{metric_a metric_b}
     end
 
-    def simple_metrics(metric_name = 'metric_a')
-      [Gitlab::Prometheus::Metric.new('title', %W(#{metric_name} metric_b), nil, nil),
-       Gitlab::Prometheus::Metric.new('title', [metric_name], nil, nil)]
-    end
-
-    def simple_metric_group(name = 'name', metrics = simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
-    end
-
     def series_info_with_environment(*more_metrics)
       %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } }
     end
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index c57694bf7fd..4c0e01bd5f6 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -12,10 +12,10 @@ module Prometheus
       Gitlab::Prometheus::Metric.new(title, required_metrics, nil, nil, queries)
     end
 
-    def simple_metrics
+    def simple_metrics(added_metric_name: 'metric_a')
       [
-        simple_metric(required_metrics: %w(metric_a metric_b), queries: simple_queries),
-        simple_metric(required_metrics: %w{metric_a}, queries: [simple_query('empty')]),
+        simple_metric(required_metrics: %W(#{added_metric_name} metric_b), queries: simple_queries),
+        simple_metric(required_metrics: [added_metric_name], queries: [simple_query('empty')]),
         simple_metric(required_metrics: %w{metric_c})
       ]
     end
-- 
cgit v1.2.1


From ffedc52eaa33a7a31d3a7b4893387e81163a3d5f Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 20:11:22 +0200
Subject: Cleanup Additional Metrics tests

---
 .../additional_metrics_deployment_query_spec.rb    |  8 ------
 .../queries/additional_metrics_query_spec.rb       |  1 -
 .../queries/matched_metrics_query_spec.rb          | 12 ++++++++-
 .../prometheus/additional_metrics_query_helper.rb  | 31 ----------------------
 .../additional_metrics_shared_examples.rb          | 12 ++++++---
 .../prometheus/matched_metrics_query_helper.rb     | 24 -----------------
 6 files changed, 20 insertions(+), 68 deletions(-)
 delete mode 100644 spec/support/prometheus/additional_metrics_query_helper.rb
 delete mode 100644 spec/support/prometheus/matched_metrics_query_helper.rb

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
index 93a9ce38d80..836f2be629f 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
@@ -1,22 +1,14 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery, lib: true do
-  include Prometheus::AdditionalMetricsQueryHelper
   include Prometheus::MetricBuilders
 
-  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
-  let(:metric_class) { Gitlab::Prometheus::Metric }
-
   let(:client) { double('prometheus_client') }
   let(:environment) { create(:environment, slug: 'environment-slug') }
   let(:deployment) { create(:deployment, environment: environment) }
 
   subject(:query_result) { described_class.new(client).query(deployment.id) }
 
-  around do |example|
-    Timecop.freeze { example.run }
-  end
-
   include_examples 'additional metrics query' do
     it 'queries using specific time' do
       expect(client).to receive(:query_range).with(anything,
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
index e5db1326597..6fbd2fd17d6 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
-  include Prometheus::AdditionalMetricsQueryHelper
   include Prometheus::MetricBuilders
 
   let(:client) { double('prometheus_client') }
diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
index 34f11205878..2395675a247 100644
--- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -1,12 +1,22 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
-  include Prometheus::MatchedMetricsQueryHelper
   include Prometheus::MetricBuilders
 
   let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
   let(:metric_class) { Gitlab::Prometheus::Metric }
 
+  def series_info_with_environment(*more_metrics)
+    %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } }
+  end
+  let(:metric_names) { %w{metric_a metric_b} }
+  let(:series_info_without_environment) do
+    [{ '__name__' => 'metric_a' },
+     { '__name__' => 'metric_b' }]
+  end
+  let(:partialy_empty_series_info) { [{ '__name__' => 'metric_a', 'environment' => '' }] }
+  let(:empty_series_info) { [] }
+
   let(:client) { double('prometheus_client') }
 
   subject { described_class.new(client) }
diff --git a/spec/support/prometheus/additional_metrics_query_helper.rb b/spec/support/prometheus/additional_metrics_query_helper.rb
deleted file mode 100644
index 84cbc24a301..00000000000
--- a/spec/support/prometheus/additional_metrics_query_helper.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Prometheus
-  module AdditionalMetricsQueryHelper
-    def metric_names
-      %w{metric_a metric_b}
-    end
-
-    def query_result
-      [
-        {
-          'metric': {},
-          'value': [
-            1488772511.004,
-            '0.000041021495238095323'
-          ]
-        }
-      ]
-    end
-
-    def query_range_result
-      [
-        {
-          'metric': {},
-          'values': [
-            [1488758662.506, '0.00002996364761904785'],
-            [1488758722.506, '0.00003090239047619091']
-          ]
-        }
-      ]
-    end
-  end
-end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index 96a9e1f5049..449a53664c1 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -1,14 +1,20 @@
 RSpec.shared_examples 'additional metrics query' do
   include Prometheus::MetricBuilders
 
+  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
+  let(:metric_class) { Gitlab::Prometheus::Metric }
+
+  let(:metric_names) { %w{metric_a metric_b} }
+
+  let(:query_range_result) do
+    [{ 'metric': {}, 'values': [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] }]
+  end
+
   before do
     allow(client).to receive(:label_values).and_return(metric_names)
     allow(metric_group_class).to receive(:all).and_return([simple_metric_group(metrics: [simple_metric])])
   end
 
-  let(:metric_group_class) { Gitlab::Prometheus::MetricGroup }
-  let(:metric_class) { Gitlab::Prometheus::Metric }
-
   context 'with one group where two metrics is found' do
     before do
       allow(metric_group_class).to receive(:all).and_return([simple_metric_group])
diff --git a/spec/support/prometheus/matched_metrics_query_helper.rb b/spec/support/prometheus/matched_metrics_query_helper.rb
deleted file mode 100644
index 0471a78e426..00000000000
--- a/spec/support/prometheus/matched_metrics_query_helper.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Prometheus
-  module MatchedMetricsQueryHelper
-    def metric_names
-      %w{metric_a metric_b}
-    end
-
-    def series_info_with_environment(*more_metrics)
-      %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } }
-    end
-
-    def series_info_without_environment
-      [{ '__name__' => 'metric_a' },
-       { '__name__' => 'metric_b' }]
-    end
-
-    def partialy_empty_series_info
-      [{ '__name__' => 'metric_a', 'environment' => '' }]
-    end
-
-    def empty_series_info
-      []
-    end
-  end
-end
-- 
cgit v1.2.1


From 1b6ab2dffce29df53f57cd857720b9f77ab4a7ca Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 5 Jun 2017 21:00:57 +0200
Subject: Remove orig file + rubocop cleanup

---
 .../queries/additional_metrics_deployment_query.rb       |  2 --
 .../prometheus/queries/additional_metrics_query.rb       |  5 ++---
 lib/gitlab/prometheus_client.rb                          |  2 +-
 spec/db/production/settings.rb.orig                      | 16 ----------------
 .../prometheus/queries/matched_metrics_query_spec.rb     |  9 +++++++--
 .../prometheus/additional_metrics_shared_examples.rb     |  5 +++--
 6 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 spec/db/production/settings.rb.orig

diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
index 382052c298f..7693772bf81 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -1,6 +1,5 @@
 module Gitlab::Prometheus::Queries
   class AdditionalMetricsDeploymentQuery < AdditionalMetricsQuery
-
     def query(deployment_id)
       deployment = Deployment.find_by(id: deployment_id)
       query_context = {
@@ -14,4 +13,3 @@ module Gitlab::Prometheus::Queries
     end
   end
 end
-
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index d21a3978e25..7ef4ee3a91a 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -40,11 +40,11 @@ module Gitlab::Prometheus::Queries
     private
 
     def metric_with_any_queries(metric)
-      metric[:queries]&.count > 0
+      metric[:queries]&.count&.> 0
     end
 
     def group_with_any_metrics(group)
-      group[:metrics]&.count > 0
+      group[:metrics]&.count&.> 0
     end
 
     def query_with_result(query)
@@ -64,7 +64,6 @@ module Gitlab::Prometheus::Queries
       query_with_result
     end
 
-
     def available_metrics
       @available_metrics ||= client_label_values || []
     end
diff --git a/lib/gitlab/prometheus_client.rb b/lib/gitlab/prometheus_client.rb
index f4ef4ff8ba4..aa94614bf18 100644
--- a/lib/gitlab/prometheus_client.rb
+++ b/lib/gitlab/prometheus_client.rb
@@ -29,7 +29,7 @@ module Gitlab
       end
     end
 
-    def label_values(name='__name__')
+    def label_values(name = '__name__')
       json_api_get("label/#{name}/values")
     end
 
diff --git a/spec/db/production/settings.rb.orig b/spec/db/production/settings.rb.orig
deleted file mode 100644
index 3cbb173c4cc..00000000000
--- a/spec/db/production/settings.rb.orig
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'seed production settings', lib: true do
-  include StubENV
-
-  context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
-    before do
-      stub_env('GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN', '013456789')
-    end
-
-    it 'writes the token to the database' do
-      load(File.join(__dir__, '../../../db/fixtures/production/010_settings.rb'))
-      expect(ApplicationSetting.current.runners_registration_token).to eq('013456789')
-    end
-  end
-end
diff --git a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
index 2395675a247..d2796ab72da 100644
--- a/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/matched_metrics_query_spec.rb
@@ -9,6 +9,7 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
   def series_info_with_environment(*more_metrics)
     %w{metric_a metric_b}.concat(more_metrics).map { |metric_name| { '__name__' => metric_name, 'environment' => '' } }
   end
+
   let(:metric_names) { %w{metric_a metric_b} }
   let(:series_info_without_environment) do
     [{ '__name__' => 'metric_a' },
@@ -110,7 +111,9 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
       it 'responds with one metrics as active and no missing requiremens' do
         expect(subject.query).to eq([
                                       { group: 'name', priority: 1, active_metrics: 1, metrics_missing_requirements: 0 },
-                                      { group: 'nameb', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 }])
+                                      { group: 'nameb', priority: 1, active_metrics: 2, metrics_missing_requirements: 0 }
+                                    ]
+                                   )
       end
     end
 
@@ -122,7 +125,9 @@ describe Gitlab::Prometheus::Queries::MatchedMetricsQuery, lib: true do
       it 'responds with one metrics as active and no missing requiremens' do
         expect(subject.query).to eq([
                                       { group: 'name', priority: 1, active_metrics: 0, metrics_missing_requirements: 1 },
-                                      { group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }])
+                                      { group: 'nameb', priority: 1, active_metrics: 0, metrics_missing_requirements: 2 }
+                                    ]
+                                   )
       end
     end
   end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index 449a53664c1..0581eab95a0 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -81,7 +81,8 @@ RSpec.shared_examples 'additional metrics query' do
                     result: [
                       {
                         metric: {},
-                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']] }
+                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
+                      }
                     ]
                   }
                 ]
@@ -146,4 +147,4 @@ RSpec.shared_examples 'additional metrics query' do
       end
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From 336cef434372244b9f17bd1fd222e54f8b70979e Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 6 Jun 2017 11:07:29 +0200
Subject: Fix transient error in deployment test

---
 .../prometheus/queries/additional_metrics_deployment_query_spec.rb    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
index 836f2be629f..4909aec5a4d 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
@@ -9,6 +9,10 @@ describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery, lib: tru
 
   subject(:query_result) { described_class.new(client).query(deployment.id) }
 
+  around do |example|
+    Timecop.freeze(Time.local(2008, 9, 1, 12, 0, 0)) { example.run }
+  end
+
   include_examples 'additional metrics query' do
     it 'queries using specific time' do
       expect(client).to receive(:query_range).with(anything,
-- 
cgit v1.2.1


From c0a66dbd2dd8b716e809938d20e7655d84595176 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 6 Jun 2017 11:16:15 +0200
Subject: Fix prometheus service tests

---
 spec/models/project_services/prometheus_service_spec.rb |  5 +++--
 spec/support/prometheus_helpers.rb                      | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index 1f9d3c07b51..b761567ad76 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -61,7 +61,7 @@ describe PrometheusService, models: true, caching: true do
       end
 
       it 'returns reactive data' do
-        is_expected.to eq(prometheus_data)
+        is_expected.to eq(prometheus_metrics_data)
       end
     end
   end
@@ -82,7 +82,7 @@ describe PrometheusService, models: true, caching: true do
       end
 
       it 'returns reactive data' do
-        is_expected.to eq(prometheus_data.merge(deployment_time: deployment.created_at.to_i))
+        is_expected.to eq(prometheus_metrics_data.merge(deployment_time: deployment.created_at.to_i))
       end
     end
   end
@@ -112,6 +112,7 @@ describe PrometheusService, models: true, caching: true do
       end
 
       it { expect(subject.to_json).to eq(prometheus_data.to_json) }
+      it { expect(subject.to_json).to eq(prometheus_data.to_json) }
     end
 
     [404, 500].each do |status|
diff --git a/spec/support/prometheus_helpers.rb b/spec/support/prometheus_helpers.rb
index e49902475da..4212be2cc88 100644
--- a/spec/support/prometheus_helpers.rb
+++ b/spec/support/prometheus_helpers.rb
@@ -96,6 +96,19 @@ module PrometheusHelpers
   end
 
   def prometheus_data(last_update: Time.now.utc)
+    {
+      success: true,
+      data: {
+        memory_values: prometheus_values_body('matrix').dig(:data, :result),
+        memory_current: prometheus_value_body('vector').dig(:data, :result),
+        cpu_values: prometheus_values_body('matrix').dig(:data, :result),
+        cpu_current: prometheus_value_body('vector').dig(:data, :result)
+      },
+      last_update: last_update
+    }
+  end
+
+  def prometheus_metrics_data(last_update: Time.now.utc)
     {
       success: true,
       metrics: {
-- 
cgit v1.2.1


From c7a1da800ff6fa16db5de796a8f8d715ddd3b582 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 6 Jun 2017 14:40:03 +0200
Subject: Explicitly require format.json in prometheus_controller

+ add missing prometheus_controller tests!
---
 app/controllers/projects/deployments_controller.rb |  5 +-
 app/controllers/projects/prometheus_controller.rb  | 18 +++++--
 .../projects/prometheus_controller_spec.rb         | 60 ++++++++++++++++++++++
 3 files changed, 76 insertions(+), 7 deletions(-)
 create mode 100644 spec/controllers/projects/prometheus_controller_spec.rb

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index 29d94e2760a..acf5573935a 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -24,10 +24,11 @@ class Projects::DeploymentsController < Projects::ApplicationController
 
   def additional_metrics
     return render_404 unless deployment.has_additional_metrics?
+
     metrics = deployment.additional_metrics
 
-    if metrics&.any?
-      render json: metrics, status: :ok
+    if metrics.any?
+      render json: metrics
     else
       head :no_content
     end
diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
index 0402be6f85c..4a39d13881e 100644
--- a/app/controllers/projects/prometheus_controller.rb
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -3,17 +3,25 @@ class Projects::PrometheusController < Projects::ApplicationController
   before_action :require_prometheus_metrics!
 
   def active_metrics
-    matched_metrics = prometheus_service.reactive_query(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
+    matched_metrics = prometheus_service.reactive_query(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself) || {}
 
-    if matched_metrics
-      render json: matched_metrics, status: :ok
-    else
-      head :no_content
+    respond_to do |format|
+      format.json do
+        if matched_metrics.any?
+          render json: matched_metrics
+        else
+          head :no_content
+        end
+      end
     end
   end
 
   private
 
+  rescue_from(ActionController::UnknownFormat) do |e|
+    render_404
+  end
+
   def prometheus_service
     project.monitoring_service
   end
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb
new file mode 100644
index 00000000000..5e57b19e042
--- /dev/null
+++ b/spec/controllers/projects/prometheus_controller_spec.rb
@@ -0,0 +1,60 @@
+require('spec_helper')
+
+describe Projects::PrometheusController do
+  let(:user) { create(:user) }
+  let!(:project) { create(:empty_project) }
+
+  let(:prometheus_service) { double('prometheus_service') }
+
+  before do
+    allow(controller).to receive(:project).and_return(project)
+    allow(project).to receive(:monitoring_service).and_return(prometheus_service)
+
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  describe 'GET #active_metrics' do
+    context 'when prometheus metrics are enabled' do
+      before do
+        allow(prometheus_service).to receive(:reactive_query)
+      end
+
+      context 'when data is not present' do
+        it 'returns no content response' do
+          get :active_metrics, project_params(format: :json)
+
+          expect(response).to have_http_status(204)
+        end
+      end
+
+      context 'when data is available' do
+        let(:sample_response) { { some_data: 1 } }
+
+        before do
+          allow(prometheus_service).to receive(:reactive_query).with(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name)
+                                         .and_return(sample_response)
+        end
+
+        it 'returns no content response' do
+          get :active_metrics, project_params(format: :json)
+
+          expect(response).to have_http_status(200)
+          expect(json_response).to eq(sample_response.deep_stringify_keys)
+        end
+      end
+
+      context 'when requesting non json response' do
+        it 'returns not found response' do
+          get :active_metrics, project_params
+
+          expect(response).to have_http_status(404)
+        end
+      end
+    end
+  end
+
+  def project_params(opts = {})
+    opts.reverse_merge(namespace_id: project.namespace, project_id: project)
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.1


From ccf89acc7145bb129f5666108854daa71a022827 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 6 Jun 2017 16:07:33 +0200
Subject: expand Namespaces:: and refactoring yaml parsing out of MetricGroup
 class

---
 app/models/environment.rb                          |   2 +-
 lib/gitlab/prometheus/additional_metrics_parser.rb |  36 +++++++
 lib/gitlab/prometheus/metric.rb                    |  33 +++---
 lib/gitlab/prometheus/metric_group.rb              |  41 +++-----
 lib/gitlab/prometheus/parsing_error.rb             |   6 +-
 .../queries/additional_metrics_deployment_query.rb |  28 +++--
 .../additional_metrics_environment_query.rb        |  21 ++++
 .../prometheus/queries/additional_metrics_query.rb |  82 ---------------
 lib/gitlab/prometheus/queries/deployment_query.rb  |  42 ++++----
 lib/gitlab/prometheus/queries/environment_query.rb |  34 +++---
 .../prometheus/queries/matched_metrics_query.rb    | 116 +++++++++++----------
 .../prometheus/queries/query_additional_metrics.rb |  72 +++++++++++++
 .../projects/prometheus_controller_spec.rb         |   2 +-
 .../additional_metrics_environment_query_spec.rb   |  21 ++++
 .../queries/additional_metrics_query_spec.rb       |  21 ----
 spec/models/environment_spec.rb                    |   2 +-
 spec/support/prometheus/metric_builders.rb         |   2 +-
 17 files changed, 302 insertions(+), 259 deletions(-)
 create mode 100644 lib/gitlab/prometheus/additional_metrics_parser.rb
 create mode 100644 lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
 delete mode 100644 lib/gitlab/prometheus/queries/additional_metrics_query.rb
 create mode 100644 lib/gitlab/prometheus/queries/query_additional_metrics.rb
 create mode 100644 spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
 delete mode 100644 spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb

diff --git a/app/models/environment.rb b/app/models/environment.rb
index 7ab4a23ab16..8d98b02c05a 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -159,7 +159,7 @@ class Environment < ActiveRecord::Base
 
   def additional_metrics
     if has_additional_metrics?
-      project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsQuery.name, self.id, &:itself)
+      project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery.name, self.id, &:itself)
     end
   end
 
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
new file mode 100644
index 00000000000..eb168ce8f9c
--- /dev/null
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -0,0 +1,36 @@
+module Gitlab
+  module Prometheus
+    module AdditionalMetricsParser
+      extend self
+
+      def load_groups_from_yaml
+        additional_metrics_raw.map(&method(:new))
+      end
+
+      private
+
+      def metrics_from_list(list)
+        list.map { |entry| metric_from_entry(entry) }
+      end
+
+      def metric_from_entry(entry)
+        missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.has_key?(key) }
+        raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
+
+        Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
+      end
+
+      def group_from_entry(entry)
+        missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
+        raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
+
+        group = MetricGroup.new(entry[:group], entry[:priority])
+        group.tap { |g| g.metrics = Metric.metrics_from_list(entry[:metrics]) }
+      end
+
+      def additional_metrics_raw
+        @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml'))&.map(&:deep_symbolize_keys).freeze
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
index d7cd4237a7b..5155064317c 100644
--- a/lib/gitlab/prometheus/metric.rb
+++ b/lib/gitlab/prometheus/metric.rb
@@ -1,24 +1,15 @@
-module Gitlab::Prometheus
-  class Metric
-    attr_reader :group, :title, :required_metrics, :weight, :y_label, :queries
-
-    def initialize(title, required_metrics, weight, y_label, queries = [])
-      @title = title
-      @required_metrics = required_metrics
-      @weight = weight
-      @y_label = y_label || 'Values'
-      @queries = queries
-    end
-
-    def self.metric_from_entry(entry)
-      missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.has_key?(key) }
-      raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
-
-      Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
-    end
-
-    def self.metrics_from_list(list)
-      list.map { |entry| metric_from_entry(entry) }
+module Gitlab
+  module Prometheus
+    class Metric
+      attr_reader :group, :title, :required_metrics, :weight, :y_label, :queries
+
+      def initialize(title, required_metrics, weight, y_label, queries = [])
+        @title = title
+        @required_metrics = required_metrics
+        @weight = weight
+        @y_label = y_label || 'Values'
+        @queries = queries
+      end
     end
   end
 end
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 0dcd9dc0f36..c3b24dc1fa5 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -1,33 +1,18 @@
-module Gitlab::Prometheus
-  class MetricGroup
-    attr_reader :priority, :name
-    attr_accessor :metrics
+module Gitlab
+  module Prometheus
+    class MetricGroup
+      attr_reader :priority, :name
+      attr_accessor :metrics
 
-    def initialize(name, priority, metrics = [])
-      @name = name
-      @priority = priority
-      @metrics = metrics
-    end
-
-    def self.all
-      load_groups_from_yaml
-    end
-
-    def self.load_groups_from_yaml
-      additional_metrics_raw.map(&method(:group_from_entry))
-    end
-
-    def self.group_from_entry(entry)
-      missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
-      raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
-
-      group = MetricGroup.new(entry[:group], entry[:priority])
-      group.metrics = Metric.metrics_from_list(entry[:metrics])
-      group
-    end
+      def initialize(name:, priority:, metrics: [])
+        @name = name
+        @priority = priority
+        @metrics = metrics
+      end
 
-    def self.additional_metrics_raw
-      @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml'))&.map(&:deep_symbolize_keys).freeze
+      def self.all
+        AdditionalMetricsParser.load_groups_from_yaml
+      end
     end
   end
 end
diff --git a/lib/gitlab/prometheus/parsing_error.rb b/lib/gitlab/prometheus/parsing_error.rb
index 067ea7f878a..49cc0e16080 100644
--- a/lib/gitlab/prometheus/parsing_error.rb
+++ b/lib/gitlab/prometheus/parsing_error.rb
@@ -1,3 +1,5 @@
-module Gitlab::Prometheus
-  ParsingError = Class.new(StandardError)
+module Gitlab
+  module Prometheus
+    ParsingError = Class.new(StandardError)
+  end
 end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
index 7693772bf81..cfe6bed188b 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -1,15 +1,21 @@
-module Gitlab::Prometheus::Queries
-  class AdditionalMetricsDeploymentQuery < AdditionalMetricsQuery
-    def query(deployment_id)
-      deployment = Deployment.find_by(id: deployment_id)
-      query_context = {
-        environment_slug: deployment.environment.slug,
-        environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
-        timeframe_start: (deployment.created_at - 30.minutes).to_f,
-        timeframe_end: (deployment.created_at + 30.minutes).to_f
-      }
+module Gitlab
+  module Prometheus
+    module Queries
+      class AdditionalMetricsDeploymentQuery < BaseQuery
+        include QueryAdditionalMetrics
 
-      query_metrics(query_context)
+        def query(deployment_id)
+          deployment = Deployment.find_by(id: deployment_id)
+          query_context = {
+            environment_slug: deployment.environment.slug,
+            environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
+            timeframe_start: (deployment.created_at - 30.minutes).to_f,
+            timeframe_end: (deployment.created_at + 30.minutes).to_f
+          }
+
+          query_metrics(query_context)
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
new file mode 100644
index 00000000000..e261988b234
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
@@ -0,0 +1,21 @@
+module Gitlab
+  module Prometheus
+    module Queries
+      class AdditionalMetricsEnvironmentQuery < BaseQuery
+        include QueryAdditionalMetrics
+
+        def query(environment_id)
+          environment = Environment.find_by(id: environment_id)
+          query_context = {
+            environment_slug: environment.slug,
+            environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
+            timeframe_start: 8.hours.ago.to_f,
+            timeframe_end: Time.now.to_f
+          }
+
+          query_metrics(query_context)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
deleted file mode 100644
index 7ef4ee3a91a..00000000000
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-module Gitlab::Prometheus::Queries
-  class AdditionalMetricsQuery < BaseQuery
-    def query(environment_id)
-      environment = Environment.find_by(id: environment_id)
-      query_context = {
-        environment_slug: environment.slug,
-        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
-        timeframe_start: 8.hours.ago.to_f,
-        timeframe_end: Time.now.to_f
-      }
-
-      query_metrics(query_context)
-    end
-
-    protected
-
-    def query_metrics(query_context)
-      query_processor = method(:process_query).curry[query_context]
-
-      groups = matched_metrics.map do |group|
-        metrics = group.metrics.map do |metric|
-          {
-            title: metric.title,
-            weight: metric.weight,
-            y_label: metric.y_label,
-            queries: metric.queries.map(&query_processor).select(&method(:query_with_result))
-          }
-        end
-
-        {
-          group: group.name,
-          priority: group.priority,
-          metrics: metrics.select(&method(:metric_with_any_queries))
-        }
-      end
-
-      groups.select(&method(:group_with_any_metrics))
-    end
-
-    private
-
-    def metric_with_any_queries(metric)
-      metric[:queries]&.count&.> 0
-    end
-
-    def group_with_any_metrics(group)
-      group[:metrics]&.count&.> 0
-    end
-
-    def query_with_result(query)
-      query[:result]&.any? do |item|
-        item&.[](:values)&.any? || item&.[](:value)&.any?
-      end
-    end
-
-    def process_query(context, query)
-      query_with_result = query.dup
-      query_with_result[:result] =
-        if query.has_key?(:query_range)
-          client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
-        else
-          client_query(query[:query] % context, time: context[:timeframe_end])
-        end
-      query_with_result
-    end
-
-    def available_metrics
-      @available_metrics ||= client_label_values || []
-    end
-
-    def matched_metrics
-      result = Gitlab::Prometheus::MetricGroup.all.map do |group|
-        group.metrics.select! do |metric|
-          metric.required_metrics.all?(&available_metrics.method(:include?))
-        end
-        group
-      end
-
-      result.select { |group| group.metrics.any? }
-    end
-  end
-end
diff --git a/lib/gitlab/prometheus/queries/deployment_query.rb b/lib/gitlab/prometheus/queries/deployment_query.rb
index 2cc08731f8d..be3527f0f72 100644
--- a/lib/gitlab/prometheus/queries/deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/deployment_query.rb
@@ -1,26 +1,30 @@
-module Gitlab::Prometheus::Queries
-  class DeploymentQuery < BaseQuery
-    def query(deployment_id)
-      deployment = Deployment.find_by(id: deployment_id)
-      environment_slug = deployment.environment.slug
+module Gitlab
+  module Prometheus
+    module Queries
+      class DeploymentQuery < BaseQuery
+        def query(deployment_id)
+          deployment = Deployment.find_by(id: deployment_id)
+          environment_slug = deployment.environment.slug
 
-      memory_query = raw_memory_usage_query(environment_slug)
-      memory_avg_query = %{avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}[30m]))}
-      cpu_query = raw_cpu_usage_query(environment_slug)
-      cpu_avg_query = %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[30m])) * 100}
+          memory_query = raw_memory_usage_query(environment_slug)
+          memory_avg_query = %{avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}[30m]))}
+          cpu_query = raw_cpu_usage_query(environment_slug)
+          cpu_avg_query = %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[30m])) * 100}
 
-      timeframe_start = (deployment.created_at - 30.minutes).to_f
-      timeframe_end = (deployment.created_at + 30.minutes).to_f
+          timeframe_start = (deployment.created_at - 30.minutes).to_f
+          timeframe_end = (deployment.created_at + 30.minutes).to_f
 
-      {
-        memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
-        memory_before: client_query(memory_avg_query, time: deployment.created_at.to_f),
-        memory_after: client_query(memory_avg_query, time: timeframe_end),
+          {
+            memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
+            memory_before: client_query(memory_avg_query, time: deployment.created_at.to_f),
+            memory_after: client_query(memory_avg_query, time: timeframe_end),
 
-        cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
-        cpu_before: client_query(cpu_avg_query, time: deployment.created_at.to_f),
-        cpu_after: client_query(cpu_avg_query, time: timeframe_end)
-      }
+            cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
+            cpu_before: client_query(cpu_avg_query, time: deployment.created_at.to_f),
+            cpu_after: client_query(cpu_avg_query, time: timeframe_end)
+          }
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/prometheus/queries/environment_query.rb b/lib/gitlab/prometheus/queries/environment_query.rb
index 01d756d7284..9aa9da6d858 100644
--- a/lib/gitlab/prometheus/queries/environment_query.rb
+++ b/lib/gitlab/prometheus/queries/environment_query.rb
@@ -1,20 +1,24 @@
-module Gitlab::Prometheus::Queries
-  class EnvironmentQuery < BaseQuery
-    def query(environment_id)
-      environment = Environment.find_by(id: environment_id)
-      environment_slug = environment.slug
-      timeframe_start = 8.hours.ago.to_f
-      timeframe_end = Time.now.to_f
+module Gitlab
+  module Prometheus
+    module Queries
+      class EnvironmentQuery < BaseQuery
+        def query(environment_id)
+          environment = Environment.find_by(id: environment_id)
+          environment_slug = environment.slug
+          timeframe_start = 8.hours.ago.to_f
+          timeframe_end = Time.now.to_f
 
-      memory_query = raw_memory_usage_query(environment_slug)
-      cpu_query = raw_cpu_usage_query(environment_slug)
+          memory_query = raw_memory_usage_query(environment_slug)
+          cpu_query = raw_cpu_usage_query(environment_slug)
 
-      {
-        memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
-        memory_current: client_query(memory_query, time: timeframe_end),
-        cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
-        cpu_current: client_query(cpu_query, time: timeframe_end)
-      }
+          {
+            memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
+            memory_current: client_query(memory_query, time: timeframe_end),
+            cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
+            cpu_current: client_query(cpu_query, time: timeframe_end)
+          }
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
index fc97bca486c..d4894c87f8d 100644
--- a/lib/gitlab/prometheus/queries/matched_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb
@@ -1,74 +1,78 @@
-module Gitlab::Prometheus::Queries
-  class MatchedMetricsQuery < BaseQuery
-    MAX_QUERY_ITEMS = 40.freeze
+module Gitlab
+  module Prometheus
+    module Queries
+      class MatchedMetricsQuery < BaseQuery
+        MAX_QUERY_ITEMS = 40.freeze
 
-    def query
-      groups_data.map do |group, data|
-        {
-          group: group.name,
-          priority: group.priority,
-          active_metrics: data[:active_metrics],
-          metrics_missing_requirements: data[:metrics_missing_requirements]
-        }
-      end
-    end
+        def query
+          groups_data.map do |group, data|
+            {
+              group: group.name,
+              priority: group.priority,
+              active_metrics: data[:active_metrics],
+              metrics_missing_requirements: data[:metrics_missing_requirements]
+            }
+          end
+        end
 
-    private
+        private
 
-    def groups_data
-      metrics_groups = groups_with_active_metrics(Gitlab::Prometheus::MetricGroup.all)
-      lookup = active_series_lookup(metrics_groups)
+        def groups_data
+          metrics_groups = groups_with_active_metrics(Gitlab::Prometheus::MetricGroup.all)
+          lookup = active_series_lookup(metrics_groups)
 
-      groups = {}
+          groups = {}
 
-      metrics_groups.each do |group|
-        groups[group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
-        active_metrics = group.metrics.count { |metric| metric.required_metrics.all?(&lookup.method(:has_key?)) }
+          metrics_groups.each do |group|
+            groups[group] ||= { active_metrics: 0, metrics_missing_requirements: 0 }
+            active_metrics = group.metrics.count { |metric| metric.required_metrics.all?(&lookup.method(:has_key?)) }
 
-        groups[group][:active_metrics] += active_metrics
-        groups[group][:metrics_missing_requirements] += group.metrics.count - active_metrics
-      end
+            groups[group][:active_metrics] += active_metrics
+            groups[group][:metrics_missing_requirements] += group.metrics.count - active_metrics
+          end
 
-      groups
-    end
+          groups
+        end
 
-    def active_series_lookup(metric_groups)
-      timeframe_start = 8.hours.ago
-      timeframe_end = Time.now
+        def active_series_lookup(metric_groups)
+          timeframe_start = 8.hours.ago
+          timeframe_end = Time.now
 
-      series = metric_groups.flat_map(&:metrics).flat_map(&:required_metrics).uniq
+          series = metric_groups.flat_map(&:metrics).flat_map(&:required_metrics).uniq
 
-      lookup = series.each_slice(MAX_QUERY_ITEMS).flat_map do |batched_series|
-        client_series(*batched_series, start: timeframe_start, stop: timeframe_end)
-          .select(&method(:has_matching_label))
-          .map { |series_info| [series_info['__name__'], true] }
-      end
-      lookup.to_h
-    end
+          lookup = series.each_slice(MAX_QUERY_ITEMS).flat_map do |batched_series|
+            client_series(*batched_series, start: timeframe_start, stop: timeframe_end)
+              .select(&method(:has_matching_label))
+              .map { |series_info| [series_info['__name__'], true] }
+          end
+          lookup.to_h
+        end
 
-    def has_matching_label(series_info)
-      series_info.key?('environment')
-    end
+        def has_matching_label(series_info)
+          series_info.key?('environment')
+        end
 
-    def available_metrics
-      @available_metrics ||= client_label_values || []
-    end
+        def available_metrics
+          @available_metrics ||= client_label_values || []
+        end
 
-    def filter_active_metrics(metric_group)
-      metric_group.metrics.select! do |metric|
-        metric.required_metrics.all?(&available_metrics.method(:include?))
-      end
-      metric_group
-    end
+        def filter_active_metrics(metric_group)
+          metric_group.metrics.select! do |metric|
+            metric.required_metrics.all?(&available_metrics.method(:include?))
+          end
+          metric_group
+        end
 
-    def groups_with_active_metrics(metric_groups)
-      metric_groups.map(&method(:filter_active_metrics)).select { |group| group.metrics.any? }
-    end
+        def groups_with_active_metrics(metric_groups)
+          metric_groups.map(&method(:filter_active_metrics)).select { |group| group.metrics.any? }
+        end
 
-    def metrics_with_required_series(metric_groups)
-      metric_groups.flat_map do |group|
-        group.metrics.select do |metric|
-          metric.required_metrics.all?(&available_metrics.method(:include?))
+        def metrics_with_required_series(metric_groups)
+          metric_groups.flat_map do |group|
+            group.metrics.select do |metric|
+              metric.required_metrics.all?(&available_metrics.method(:include?))
+            end
+          end
         end
       end
     end
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
new file mode 100644
index 00000000000..46029a1889a
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -0,0 +1,72 @@
+module Gitlab
+  module Prometheus
+    module Queries
+      module QueryAdditionalMetrics
+        def query_metrics(query_context)
+          query_processor = method(:process_query).curry[query_context]
+
+          groups = matched_metrics.map do |group|
+            metrics = group.metrics.map do |metric|
+              {
+                title: metric.title,
+                weight: metric.weight,
+                y_label: metric.y_label,
+                queries: metric.queries.map(&query_processor).select(&method(:query_with_result))
+              }
+            end
+
+            {
+              group: group.name,
+              priority: group.priority,
+              metrics: metrics.select(&method(:metric_with_any_queries))
+            }
+          end
+
+          groups.select(&method(:group_with_any_metrics))
+        end
+
+        private
+
+        def metric_with_any_queries(metric)
+          metric[:queries]&.count&.> 0
+        end
+
+        def group_with_any_metrics(group)
+          group[:metrics]&.count&.> 0
+        end
+
+        def query_with_result(query)
+          query[:result]&.any? do |item|
+            item&.[](:values)&.any? || item&.[](:value)&.any?
+          end
+        end
+
+        def process_query(context, query)
+          query_with_result = query.dup
+          query_with_result[:result] =
+            if query.has_key?(:query_range)
+              client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
+            else
+              client_query(query[:query] % context, time: context[:timeframe_end])
+            end
+          query_with_result
+        end
+
+        def available_metrics
+          @available_metrics ||= client_label_values || []
+        end
+
+        def matched_metrics
+          result = Gitlab::Prometheus::MetricGroup.all.map do |group|
+            group.metrics.select! do |metric|
+              metric.required_metrics.all?(&available_metrics.method(:include?))
+            end
+            group
+          end
+
+          result.select { |group| group.metrics.any? }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb
index 5e57b19e042..7c976cfad83 100644
--- a/spec/controllers/projects/prometheus_controller_spec.rb
+++ b/spec/controllers/projects/prometheus_controller_spec.rb
@@ -57,4 +57,4 @@ describe Projects::PrometheusController do
   def project_params(opts = {})
     opts.reverse_merge(namespace_id: project.namespace, project_id: project)
   end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
new file mode 100644
index 00000000000..8e6e3bb5946
--- /dev/null
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery, lib: true do
+  include Prometheus::MetricBuilders
+
+  let(:client) { double('prometheus_client') }
+  let(:environment) { create(:environment, slug: 'environment-slug') }
+
+  subject(:query_result) { described_class.new(client).query(environment.id) }
+
+  around do |example|
+    Timecop.freeze { example.run }
+  end
+
+  include_examples 'additional metrics query' do
+    it 'queries using specific time' do
+      expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
+      expect(query_result).not_to be_nil
+    end
+  end
+end
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
deleted file mode 100644
index 6fbd2fd17d6..00000000000
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_query_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Prometheus::Queries::AdditionalMetricsQuery, lib: true do
-  include Prometheus::MetricBuilders
-
-  let(:client) { double('prometheus_client') }
-  let(:environment) { create(:environment, slug: 'environment-slug') }
-
-  subject(:query_result) { described_class.new(client).query(environment.id) }
-
-  around do |example|
-    Timecop.freeze { example.run }
-  end
-
-  include_examples 'additional metrics query' do
-    it 'queries using specific time' do
-      expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
-      expect(query_result).not_to be_nil
-    end
-  end
-end
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 12de9c9111b..e25d2bb6955 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -453,7 +453,7 @@ describe Environment, models: true do
 
       it 'returns the additional metrics from the deployment service' do
         expect(project.monitoring_service).to receive(:reactive_query)
-                                                .with(Gitlab::Prometheus::Queries::AdditionalMetricsQuery.name, environment.id)
+                                                .with(Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery.name, environment.id)
                                                 .and_return(:fake_metrics)
 
         is_expected.to eq(:fake_metrics)
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index 4c0e01bd5f6..cc733bfe1b4 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -21,7 +21,7 @@ module Prometheus
     end
 
     def simple_metric_group(name: 'name', metrics: simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new(name, 1, metrics)
+      Gitlab::Prometheus::MetricGroup.new(name: name, priority: 1, metrics: metrics)
     end
   end
 end
-- 
cgit v1.2.1


From 969b812433b6030b15b591ec5862daae1b707025 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 6 Jun 2017 19:35:28 +0200
Subject: Add schema matcher for non response objects + use schema to test
 additional metrics compliance

---
 .../additional_metrics_query_result.json           | 58 +++++++++++++++
 spec/support/api/schema_matcher.rb                 | 14 +++-
 .../additional_metrics_shared_examples.rb          | 85 +++++-----------------
 spec/support/prometheus/metric_builders.rb         |  2 +-
 4 files changed, 88 insertions(+), 71 deletions(-)
 create mode 100644 spec/fixtures/api/schemas/prometheus/additional_metrics_query_result.json

diff --git a/spec/fixtures/api/schemas/prometheus/additional_metrics_query_result.json b/spec/fixtures/api/schemas/prometheus/additional_metrics_query_result.json
new file mode 100644
index 00000000000..47b5d283b8c
--- /dev/null
+++ b/spec/fixtures/api/schemas/prometheus/additional_metrics_query_result.json
@@ -0,0 +1,58 @@
+{
+  "items": {
+    "properties": {
+      "group": {
+        "type": "string"
+      },
+      "metrics": {
+        "items": {
+          "properties": {
+            "queries": {
+              "items": {
+                "properties": {
+                  "query_range": {
+                    "type": "string"
+                  },
+                  "query": {
+                    "type": "string"
+                  },
+                  "result": {
+                    "type": "any"
+                  }
+                },
+                "type": "object"
+              },
+              "type": "array"
+            },
+            "title": {
+              "type": "string"
+            },
+            "weight": {
+              "type": "integer"
+            },
+            "y_label": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "required": [
+          "metrics",
+          "title",
+          "weight"
+        ],
+        "type": "array"
+      },
+      "priority": {
+        "type": "integer"
+      }
+    },
+    "type": "object"
+  },
+  "required": [
+    "group",
+    "priority",
+    "metrics"
+  ],
+  "type": "array"
+}
\ No newline at end of file
diff --git a/spec/support/api/schema_matcher.rb b/spec/support/api/schema_matcher.rb
index e42d727672b..dff0dfba675 100644
--- a/spec/support/api/schema_matcher.rb
+++ b/spec/support/api/schema_matcher.rb
@@ -1,8 +1,16 @@
+def schema_path(schema)
+  schema_directory = "#{Dir.pwd}/spec/fixtures/api/schemas"
+  "#{schema_directory}/#{schema}.json"
+end
+
 RSpec::Matchers.define :match_response_schema do |schema, **options|
   match do |response|
-    schema_directory = "#{Dir.pwd}/spec/fixtures/api/schemas"
-    schema_path = "#{schema_directory}/#{schema}.json"
+    JSON::Validator.validate!(schema_path(schema), response.body, options)
+  end
+end
 
-    JSON::Validator.validate!(schema_path, response.body, options)
+RSpec::Matchers.define :match_schema do |schema, **options|
+  match do |data|
+    JSON::Validator.validate!(schema_path(schema), data, options)
   end
 end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index 0581eab95a0..016e16fc8d4 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -34,7 +34,7 @@ RSpec.shared_examples 'additional metrics query' do
             priority: 1,
             metrics: [
               {
-                title: 'title', weight: nil, y_label: 'Values', queries: [
+                title: 'title', weight: 1, y_label: 'Values', queries: [
                 { query_range: 'query_range_a', result: query_range_result },
                 { query_range: 'query_range_b', label: 'label', unit: 'unit', result: query_range_result }
               ]
@@ -43,6 +43,7 @@ RSpec.shared_examples 'additional metrics query' do
           }
         ]
 
+        expect(query_result).to match_schema('prometheus/additional_metrics_query_result')
         expect(query_result).to eq(expected)
       end
     end
@@ -66,53 +67,16 @@ RSpec.shared_examples 'additional metrics query' do
       end
 
       it 'return group data both queries' do
-        expected = [
-          {
-            group: 'group_a',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_a',
-                    result: [
-                      {
-                        metric: {},
-                        values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            group: 'group_b',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title_b',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_b', result: [
-                    {
-                      metric: {},
-                      values: [[1488758662.506, '0.00002996364761904785'], [1488758722.506, '0.00003090239047619091']]
-                    }
-                  ]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
+        queries_with_result_a = { queries: [{ query_range: 'query_range_a', result: query_range_result }] }
+        queries_with_result_b = { queries: [{ query_range: 'query_range_b', result: query_range_result }] }
 
-        expect(query_result).to eq(expected)
+        expect(query_result).to match_schema('prometheus/additional_metrics_query_result')
+
+        expect(query_result.count).to eq(2)
+        expect(query_result).to all(satisfy { |r| r[:metrics].count == 1 })
+
+        expect(query_result[0][:metrics].first).to include(queries_with_result_a)
+        expect(query_result[1][:metrics].first).to include(queries_with_result_b)
       end
     end
 
@@ -123,27 +87,14 @@ RSpec.shared_examples 'additional metrics query' do
       end
 
       it 'return group data only for query with results' do
-        expected = [
-          {
-            group: 'group_a',
-            priority: 1,
-            metrics: [
-              {
-                title: 'title',
-                weight: nil,
-                y_label: 'Values',
-                queries: [
-                  {
-                    query_range: 'query_range_a',
-                    result: query_range_result
-                  }
-                ]
-              }
-            ]
-          }
-        ]
+        queries_with_result = { queries: [{ query_range: 'query_range_a', result: query_range_result }] }
 
-        expect(query_result).to eq(expected)
+        expect(query_result).to match_schema('prometheus/additional_metrics_query_result')
+
+        expect(query_result.count).to eq(1)
+        expect(query_result).to all(satisfy { |r| r[:metrics].count == 1 })
+
+        expect(query_result.first[:metrics].first).to include(queries_with_result)
       end
     end
   end
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index cc733bfe1b4..18378ec0145 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -9,7 +9,7 @@ module Prometheus
     end
 
     def simple_metric(title: 'title', required_metrics: [], queries: [simple_query])
-      Gitlab::Prometheus::Metric.new(title, required_metrics, nil, nil, queries)
+      Gitlab::Prometheus::Metric.new(title, required_metrics, 1, nil, queries)
     end
 
     def simple_metrics(added_metric_name: 'metric_a')
-- 
cgit v1.2.1


From a7e1205219387a6d24c8579994f73a33b3028010 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 7 Jun 2017 02:36:59 +0200
Subject: Use explicit instance of prometheus service and add access methods to
 it

---
 app/controllers/projects/deployments_controller.rb |  2 +-
 app/controllers/projects/prometheus_controller.rb  | 14 ++---
 app/models/deployment.rb                           | 13 ++---
 app/models/environment.rb                          | 14 +++--
 app/models/project_services/prometheus_service.rb  | 12 ++++-
 .../projects/deployments_controller_spec.rb        | 62 ++++++++++++++++++++++
 .../projects/prometheus_controller_spec.rb         | 13 +++--
 spec/models/deployment_spec.rb                     | 29 ++++++++++
 spec/models/environment_spec.rb                    | 10 ++--
 9 files changed, 136 insertions(+), 33 deletions(-)

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index acf5573935a..e7d95e46b06 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -23,7 +23,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
   end
 
   def additional_metrics
-    return render_404 unless deployment.has_additional_metrics?
+    return render_404 unless deployment.prometheus_service.present?
 
     metrics = deployment.additional_metrics
 
diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
index 4a39d13881e..9609fa44945 100644
--- a/app/controllers/projects/prometheus_controller.rb
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -3,10 +3,10 @@ class Projects::PrometheusController < Projects::ApplicationController
   before_action :require_prometheus_metrics!
 
   def active_metrics
-    matched_metrics = prometheus_service.reactive_query(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself) || {}
-
     respond_to do |format|
       format.json do
+        matched_metrics = prometheus_service.matched_metrics || {}
+
         if matched_metrics.any?
           render json: matched_metrics
         else
@@ -18,19 +18,15 @@ class Projects::PrometheusController < Projects::ApplicationController
 
   private
 
-  rescue_from(ActionController::UnknownFormat) do |e|
+  rescue_from(ActionController::UnknownFormat) do
     render_404
   end
 
   def prometheus_service
-    project.monitoring_service
-  end
-
-  def has_prometheus_metrics?
-    prometheus_service&.respond_to?(:reactive_query)
+    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
   end
 
   def require_prometheus_metrics!
-    render_404 unless has_prometheus_metrics?
+    render_404 unless prometheus_service.present?
   end
 end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index f49410f18ae..fbb97de4af6 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -103,10 +103,6 @@ class Deployment < ActiveRecord::Base
     project.monitoring_service.present?
   end
 
-  def has_additional_metrics?
-    has_metrics? && project.monitoring_service&.respond_to?(:reactive_query)
-  end
-
   def metrics
     return {} unless has_metrics?
 
@@ -114,11 +110,16 @@ class Deployment < ActiveRecord::Base
   end
 
   def additional_metrics
-    return {} unless has_additional_metrics?
-    metrics = project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery.name, id, &:itself)
+    return {} unless prometheus_service.present?
+
+    metrics = prometheus_service.additional_deployment_metrics(self)
     metrics&.merge(deployment_time: created_at.to_i) || {}
   end
 
+  def prometheus_service
+    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
+  end
+
   private
 
   def ref_path
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 8d98b02c05a..9b7dc7f807e 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -149,20 +149,24 @@ class Environment < ActiveRecord::Base
     project.monitoring_service.present? && available? && last_deployment.present?
   end
 
-  def has_additional_metrics?
-    has_metrics? && project.monitoring_service&.respond_to?(:reactive_query)
-  end
-
   def metrics
     project.monitoring_service.environment_metrics(self) if has_metrics?
   end
 
+  def has_additional_metrics?
+    prometheus_service.present? && available? && last_deployment.present?
+  end
+
   def additional_metrics
     if has_additional_metrics?
-      project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery.name, self.id, &:itself)
+      prometheus_service.additional_environment_metrics(self)
     end
   end
 
+  def prometheus_service
+    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
+  end
+
   # An environment name is not necessarily suitable for use in URLs, DNS
   # or other third-party contexts, so provide a slugified version. A slug has
   # the following properties:
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index d4d6611fd3b..9d736cb5dec 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -62,8 +62,16 @@ class PrometheusService < MonitoringService
     metrics&.merge(deployment_time: created_at.to_i) || {}
   end
 
-  def reactive_query(query_class, *args, &block)
-    with_reactive_cache(query_class, *args, &block)
+  def additional_environment_metrics(environment)
+    with_reactive_cache(Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery.name, environment.id, &:itself)
+  end
+
+  def additional_deployment_metrics(deployment)
+    with_reactive_cache(Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery.name, deployment.id, &:itself)
+  end
+
+  def matched_metrics
+    additional_deployment_metrics(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
   end
 
   # Cache metrics for specific environment
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 4c69443314d..26d92e787c4 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -108,6 +108,68 @@ describe Projects::DeploymentsController do
     end
   end
 
+  describe 'GET #additional_metrics' do
+    let(:deployment) { create(:deployment, project: project, environment: environment) }
+
+    before do
+      allow(controller).to receive(:deployment).and_return(deployment)
+    end
+    context 'when metrics are disabled' do
+      before do
+        allow(deployment).to receive(:has_metrics?).and_return false
+      end
+
+      it 'responds with not found' do
+        get :metrics, deployment_params(id: deployment.id)
+
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'when metrics are enabled' do
+      let(:prometheus_service) { double('prometheus_service') }
+
+      before do
+        allow(deployment).to receive(:prometheus_service).and_return(prometheus_service)
+      end
+
+      context 'when environment has no metrics' do
+        before do
+          expect(deployment).to receive(:additional_metrics).and_return({})
+        end
+
+        it 'returns a empty response 204 response' do
+          get :additional_metrics, deployment_params(id: deployment.id)
+          expect(response).to have_http_status(204)
+          expect(response.body).to eq('')
+        end
+      end
+
+      context 'when environment has some metrics' do
+        let(:empty_metrics) do
+          {
+            success: true,
+            metrics: {},
+            last_update: 42
+          }
+        end
+
+        before do
+          expect(deployment).to receive(:additional_metrics).and_return(empty_metrics)
+        end
+
+        it 'returns a metrics JSON document' do
+          get :additional_metrics, deployment_params(id: deployment.id)
+
+          expect(response).to be_ok
+          expect(json_response['success']).to be(true)
+          expect(json_response['metrics']).to eq({})
+          expect(json_response['last_update']).to eq(42)
+        end
+      end
+    end
+  end
+
   def deployment_params(opts = {})
     opts.reverse_merge(namespace_id: project.namespace,
                        project_id: project,
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb
index 7c976cfad83..a994ac6409f 100644
--- a/spec/controllers/projects/prometheus_controller_spec.rb
+++ b/spec/controllers/projects/prometheus_controller_spec.rb
@@ -8,7 +8,7 @@ describe Projects::PrometheusController do
 
   before do
     allow(controller).to receive(:project).and_return(project)
-    allow(project).to receive(:monitoring_service).and_return(prometheus_service)
+    allow(controller).to receive(:prometheus_service).and_return(prometheus_service)
 
     project.add_master(user)
     sign_in(user)
@@ -16,11 +16,11 @@ describe Projects::PrometheusController do
 
   describe 'GET #active_metrics' do
     context 'when prometheus metrics are enabled' do
-      before do
-        allow(prometheus_service).to receive(:reactive_query)
-      end
-
       context 'when data is not present' do
+        before do
+          allow(prometheus_service).to receive(:matched_metrics).and_return({})
+        end
+
         it 'returns no content response' do
           get :active_metrics, project_params(format: :json)
 
@@ -32,8 +32,7 @@ describe Projects::PrometheusController do
         let(:sample_response) { { some_data: 1 } }
 
         before do
-          allow(prometheus_service).to receive(:reactive_query).with(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name)
-                                         .and_return(sample_response)
+          allow(prometheus_service).to receive(:matched_metrics).and_return(sample_response)
         end
 
         it 'returns no content response' do
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 4bda7d4314a..bbb7dbf0922 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -77,6 +77,35 @@ describe Deployment, models: true do
     end
   end
 
+  describe '#additional_metrics' do
+    let(:deployment) { create(:deployment) }
+
+    subject { deployment.additional_metrics }
+
+    context 'metrics are disabled' do
+      it { is_expected.to eq({}) }
+    end
+
+    context 'metrics are enabled' do
+      let(:simple_metrics) do
+        {
+          success: true,
+          metrics: {},
+          last_update: 42
+        }
+      end
+
+      let(:prometheus_service) { double('prometheus_service') }
+
+      before do
+        allow(deployment).to receive(:prometheus_service).and_return(prometheus_service)
+        allow(prometheus_service).to receive(:additional_deployment_metrics).and_return(simple_metrics)
+      end
+
+      it { is_expected.to eq(simple_metrics.merge({ deployment_time: deployment.created_at.to_i })) }
+    end
+  end
+
   describe '#stop_action' do
     let(:build) { create(:ci_build) }
 
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index e25d2bb6955..8c9d093fc48 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -452,8 +452,8 @@ describe Environment, models: true do
       end
 
       it 'returns the additional metrics from the deployment service' do
-        expect(project.monitoring_service).to receive(:reactive_query)
-                                                .with(Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery.name, environment.id)
+        expect(environment.prometheus_service).to receive(:additional_environment_metrics)
+                                                .with(environment)
                                                 .and_return(:fake_metrics)
 
         is_expected.to eq(:fake_metrics)
@@ -470,7 +470,11 @@ describe Environment, models: true do
   end
 
   describe '#has_additional_metrics??' do
-    subject { environment.has_metrics? }
+    subject { environment.has_additional_metrics? }
+
+    before do
+
+    end
 
     context 'when the enviroment is available' do
       context 'with a deployment service' do
-- 
cgit v1.2.1


From a924152219c1367bf494f3f387d050ac3ff2d7d3 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 7 Jun 2017 04:07:47 +0200
Subject: Remove unecessary before block

---
 spec/models/environment_spec.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 8c9d093fc48..c8709409cea 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -472,10 +472,6 @@ describe Environment, models: true do
   describe '#has_additional_metrics??' do
     subject { environment.has_additional_metrics? }
 
-    before do
-
-    end
-
     context 'when the enviroment is available' do
       context 'with a deployment service' do
         let(:project) { create(:prometheus_project) }
-- 
cgit v1.2.1


From 6eb96b2019d392d906a64108dbe83b3ce7cce758 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 7 Jun 2017 12:41:06 +0200
Subject: Use `key?` instead of `has_key?`

---
 lib/gitlab/prometheus/additional_metrics_parser.rb        | 4 ++--
 lib/gitlab/prometheus/queries/query_additional_metrics.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index eb168ce8f9c..18eb79a44be 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -14,14 +14,14 @@ module Gitlab
       end
 
       def metric_from_entry(entry)
-        missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.has_key?(key) }
+        missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.key?(key) }
         raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
         Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
       end
 
       def group_from_entry(entry)
-        missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
+        missing_fields = [:group, :priority, :metrics].select { |key| !entry.key?(key) }
         raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
         group = MetricGroup.new(entry[:group], entry[:priority])
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index 46029a1889a..dd888b2bc1d 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -44,7 +44,7 @@ module Gitlab
         def process_query(context, query)
           query_with_result = query.dup
           query_with_result[:result] =
-            if query.has_key?(:query_range)
+            if query.key?(:query_range)
               client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
             else
               client_query(query[:query] % context, time: context[:timeframe_end])
-- 
cgit v1.2.1


From f78fd3de5d55830c84f25cfd50d399e7ddaddf30 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 8 Jun 2017 12:29:53 +0200
Subject: Fix Additional metrics filtering

+ remove test button that was leftover after a bad merge
---
 app/models/project_services/prometheus_service.rb         | 6 +++++-
 app/views/projects/services/_form.html.haml               | 1 -
 lib/gitlab/prometheus/additional_metrics_parser.rb        | 4 ++--
 lib/gitlab/prometheus/metric_group.rb                     | 2 +-
 lib/gitlab/prometheus/queries/query_additional_metrics.rb | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index 1c4ae18c6ca..d81fec3514f 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -72,7 +72,11 @@ class PrometheusService < MonitoringService
   end
 
   def matched_metrics
-    additional_deployment_metrics(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
+    with_reactive_cache(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
+  end
+
+  def with_reactive_cache(*args, &block)
+    yield calculate_reactive_cache(*args)
   end
 
   # Cache metrics for specific environment
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index cb3e1543fde..6dffc026392 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -22,7 +22,6 @@
             - disabled_class = 'disabled'
             - disabled_title = @service.disabled_title
 
-          = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title
         = link_to 'Cancel', namespace_project_settings_integrations_path(@project.namespace, @project), class: 'btn btn-cancel'
 
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index 18eb79a44be..694001605ef 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -4,7 +4,7 @@ module Gitlab
       extend self
 
       def load_groups_from_yaml
-        additional_metrics_raw.map(&method(:new))
+        additional_metrics_raw.map(&method(:group_from_entry))
       end
 
       private
@@ -25,7 +25,7 @@ module Gitlab
         raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
         group = MetricGroup.new(entry[:group], entry[:priority])
-        group.tap { |g| g.metrics = Metric.metrics_from_list(entry[:metrics]) }
+        group.tap { |g| g.metrics = metrics_from_list(entry[:metrics]) }
       end
 
       def additional_metrics_raw
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index c3b24dc1fa5..12bdf407ce0 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -4,7 +4,7 @@ module Gitlab
       attr_reader :priority, :name
       attr_accessor :metrics
 
-      def initialize(name:, priority:, metrics: [])
+      def initialize(name, priority, metrics = [])
         @name = name
         @priority = priority
         @metrics = metrics
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index dd888b2bc1d..a5a401f84cd 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -37,7 +37,7 @@ module Gitlab
 
         def query_with_result(query)
           query[:result]&.any? do |item|
-            item&.[](:values)&.any? || item&.[](:value)&.any?
+            item&.[]('values')&.any? || item&.[]('value')&.any?
           end
         end
 
-- 
cgit v1.2.1


From 0e7e7c2f2bd0e9c913cda438826a60e761130271 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 9 Jun 2017 12:43:12 +0200
Subject: Test Additional metrics parser and fix query checking tests

---
 app/models/project_services/prometheus_service.rb  |   4 -
 lib/gitlab/prometheus/additional_metrics_parser.rb |  15 +-
 .../prometheus/queries/query_additional_metrics.rb |   5 +-
 .../prometheus/additional_metrics_parser_spec.rb   | 250 +++++++++++++++++++++
 spec/support/prometheus/metric_builders.rb         |   2 +-
 5 files changed, 265 insertions(+), 11 deletions(-)
 create mode 100644 spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index d81fec3514f..c9df678f97e 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -75,10 +75,6 @@ class PrometheusService < MonitoringService
     with_reactive_cache(Gitlab::Prometheus::Queries::MatchedMetricsQuery.name, &:itself)
   end
 
-  def with_reactive_cache(*args, &block)
-    yield calculate_reactive_cache(*args)
-  end
-
   # Cache metrics for specific environment
   def calculate_reactive_cache(query_class_name, *args)
     return unless active? && project && !project.pending_delete?
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index 694001605ef..9bd41b99d81 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -14,22 +14,29 @@ module Gitlab
       end
 
       def metric_from_entry(entry)
-        missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.key?(key) }
+        required_fields = [:title, :required_metrics, :weight, :queries]
+        missing_fields = required_fields.select { |key| entry[key].nil? }
         raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
         Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
       end
 
       def group_from_entry(entry)
-        missing_fields = [:group, :priority, :metrics].select { |key| !entry.key?(key) }
-        raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
+        required_fields = [:group, :priority, :metrics]
+        missing_fields = required_fields.select { |key| entry[key].nil? }
+
+        raise ParsingError.new("entry missing required fields #{missing_fields.map(&:to_s)}") unless missing_fields.empty?
 
         group = MetricGroup.new(entry[:group], entry[:priority])
         group.tap { |g| g.metrics = metrics_from_list(entry[:metrics]) }
       end
 
       def additional_metrics_raw
-        @additional_metrics_raw ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml'))&.map(&:deep_symbolize_keys).freeze
+        @additional_metrics_raw ||= load_yaml_file&.map(&:deep_symbolize_keys).freeze
+      end
+
+      def load_yaml_file
+        YAML.load_file(Rails.root.join('config/additional_metrics.yml'))
       end
     end
   end
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index a5a401f84cd..e44be770544 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -37,18 +37,19 @@ module Gitlab
 
         def query_with_result(query)
           query[:result]&.any? do |item|
-            item&.[]('values')&.any? || item&.[]('value')&.any?
+            item&.[](:values)&.any? || item&.[](:value)&.any?
           end
         end
 
         def process_query(context, query)
           query_with_result = query.dup
-          query_with_result[:result] =
+          result =
             if query.key?(:query_range)
               client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
             else
               client_query(query[:query] % context, time: context[:timeframe_end])
             end
+          query_with_result[:result] = result&.map(&:deep_symbolize_keys)
           query_with_result
         end
 
diff --git a/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
new file mode 100644
index 00000000000..97280de173e
--- /dev/null
+++ b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
@@ -0,0 +1,250 @@
+require 'spec_helper'
+
+describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
+  include Prometheus::MetricBuilders
+
+  let(:parser_error_class) { Gitlab::Prometheus::ParsingError }
+
+  describe '#load_groups_from_yaml' do
+    subject { described_class.load_groups_from_yaml }
+
+    describe 'parsing sample yaml' do
+      let(:sample_yaml) do
+        <<-EOF.strip_heredoc
+          - group: group_a
+            priority: 1
+            metrics:
+              - title: "title"
+                required_metrics: [ metric_a, metric_b ]
+                weight: 1
+                queries: [{ query_range: 'query_range_a', label: label, unit: unit }]
+              - title: "title"
+                required_metrics: [metric_a]
+                weight: 1
+                queries: [{ query_range: 'query_range_empty' }]
+          - group: group_b
+            priority: 1
+            metrics: 
+              - title: title
+                required_metrics: []
+                weight: 1
+                queries: [{query_range: query_range_a}]
+        EOF
+      end
+
+      before do
+        described_class.instance_variable_set :@additional_metrics_raw, nil
+        allow(described_class).to receive(:load_yaml_file) { YAML.load(sample_yaml) }
+      end
+
+      it 'parses to two metric groups with 2 and 1 metric respectively' do
+        expect(subject.count).to eq(2)
+        expect(subject[0].metrics.count).to eq(2)
+        expect(subject[1].metrics.count).to eq(1)
+      end
+
+      it 'provide group data' do
+        expect(subject[0]).to have_attributes(name: 'group_a', priority: 1)
+        expect(subject[1]).to have_attributes(name: 'group_b', priority: 1)
+      end
+
+      it 'provides metrics data' do
+        metrics = subject.flat_map(&:metrics)
+
+        expect(metrics.count).to eq(3)
+        expect(metrics[0]).to have_attributes(title: 'title', required_metrics: %w(metric_a metric_b), weight: 1)
+        expect(metrics[1]).to have_attributes(title: 'title', required_metrics: %w(metric_a), weight: 1)
+        expect(metrics[2]).to have_attributes(title: 'title', required_metrics: [], weight: 1)
+      end
+
+      it 'provides query data' do
+        queries = subject.flat_map(&:metrics).flat_map(&:queries)
+
+        expect(queries.count).to eq(3)
+        expect(queries[0]).to eq(query_range: 'query_range_a', label: 'label', unit: 'unit')
+        expect(queries[1]).to eq(query_range: 'query_range_empty')
+        expect(queries[2]).to eq(query_range: 'query_range_a')
+      end
+    end
+
+    shared_examples 'required field' do |field_name|
+      before do
+        described_class.instance_variable_set :@additional_metrics_raw, nil
+      end
+
+      context "when #{field_name} is nil" do
+        before do
+          allow(described_class).to receive(:load_yaml_file) { YAML.load(field_missing) }
+        end
+
+        it 'throws parsing error' do
+          expect { subject }.to raise_error(parser_error_class, /missing.*#{field_name}/)
+        end
+      end
+
+      context "when #{field_name} are not specified" do
+        before do
+          allow(described_class).to receive(:load_yaml_file) { YAML.load(field_nil) }
+        end
+
+        it 'throws parsing error' do
+          expect { subject }.to raise_error(parser_error_class, /missing.*#{field_name}/)
+        end
+      end
+    end
+
+    describe 'group required fields' do
+      it_behaves_like 'required field', :metrics do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+          EOF
+        end
+      end
+
+      it_behaves_like 'required field', :group do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - priority: 1
+              metrics: []
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - priority: 1
+              metrics: []
+          EOF
+        end
+      end
+
+      it_behaves_like 'required field', :priority do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority:
+              metrics: []
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              metrics: []
+          EOF
+        end
+      end
+    end
+
+    describe 'metrics fields parsing' do
+      it_behaves_like 'required field', :title do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: 
+                required_metrics: []
+                weight: 1
+                queries: []
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - required_metrics: []
+                weight: 1
+                queries: []
+          EOF
+        end
+      end
+
+      it_behaves_like 'required field', :required_metrics do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                required_metrics:
+                weight: 1
+                queries: []
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                weight: 1
+                queries: []
+          EOF
+        end
+      end
+
+      it_behaves_like 'required field', :weight do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                required_metrics: []
+                weight:
+                queries: []
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                required_metrics: []
+                queries: []
+          EOF
+        end
+      end
+
+      it_behaves_like 'required field', :queries do
+        let(:field_nil) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                required_metrics: []
+                weight: 1
+                queries:
+          EOF
+        end
+
+        let(:field_missing) do
+          <<-EOF.strip_heredoc
+            - group: group_a
+              priority: 1
+              metrics:
+              - title: title
+                required_metrics: []
+                weight: 1
+          EOF
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index 18378ec0145..e4b55c22acd 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -21,7 +21,7 @@ module Prometheus
     end
 
     def simple_metric_group(name: 'name', metrics: simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new(name: name, priority: 1, metrics: metrics)
+      Gitlab::Prometheus::MetricGroup.new( name, 1, metrics)
     end
   end
 end
-- 
cgit v1.2.1


From 56b14667ed502cf62dee984c5754a8ef833ba103 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 15 Jun 2017 17:46:15 +1000
Subject: hot reloading for .vue files

---
 config/webpack.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 3c2455ebf35..8f2c2f332c5 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -249,6 +249,7 @@ if (IS_DEV_SERVER) {
     port: DEV_SERVER_PORT,
     headers: { 'Access-Control-Allow-Origin': '*' },
     stats: 'errors-only',
+    hot: DEV_SERVER_LIVERELOAD,
     inline: DEV_SERVER_LIVERELOAD
   };
   config.output.publicPath = '//' + DEV_SERVER_HOST + ':' + DEV_SERVER_PORT + config.output.publicPath;
@@ -256,6 +257,9 @@ if (IS_DEV_SERVER) {
     // watch node_modules for changes if we encounter a missing module compile error
     new WatchMissingNodeModulesPlugin(path.join(ROOT_PATH, 'node_modules'))
   );
+  if (DEV_SERVER_LIVERELOAD) {
+    config.plugins.push(new webpack.HotModuleReplacementPlugin());
+  }
 }
 
 if (WEBPACK_REPORT) {
-- 
cgit v1.2.1


From b97d5b65dd40fb5d8753c0677534e82cb5636f2d Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 14:23:33 +0200
Subject: Use include ActiveModel::Model to hold metrics data parsed from yaml.

---
 lib/gitlab/prometheus/additional_metrics_parser.rb | 23 +++++++---------------
 lib/gitlab/prometheus/metric.rb                    | 15 +++++++-------
 lib/gitlab/prometheus/metric_group.rb              | 10 +++-------
 .../prometheus/additional_metrics_parser_spec.rb   | 23 +++++++++++-----------
 spec/support/prometheus/metric_builders.rb         |  4 ++--
 5 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index 9bd41b99d81..70151e8c6ad 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -9,26 +9,17 @@ module Gitlab
 
       private
 
-      def metrics_from_list(list)
-        list.map { |entry| metric_from_entry(entry) }
-      end
-
-      def metric_from_entry(entry)
-        required_fields = [:title, :required_metrics, :weight, :queries]
-        missing_fields = required_fields.select { |key| entry[key].nil? }
-        raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
-
-        Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
+      def validate!(obj)
+        raise ParsingError.new(obj.errors.full_messages.join('\n')) unless obj.valid?
       end
 
       def group_from_entry(entry)
-        required_fields = [:group, :priority, :metrics]
-        missing_fields = required_fields.select { |key| entry[key].nil? }
-
-        raise ParsingError.new("entry missing required fields #{missing_fields.map(&:to_s)}") unless missing_fields.empty?
+        entry[:name] = entry.delete(:group)
+        entry[:metrics]&.map! do |entry|
+          Metric.new(entry).tap(&method(:validate!))
+        end
 
-        group = MetricGroup.new(entry[:group], entry[:priority])
-        group.tap { |g| g.metrics = metrics_from_list(entry[:metrics]) }
+        MetricGroup.new(entry).tap(&method(:validate!))
       end
 
       def additional_metrics_raw
diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
index 5155064317c..f54b2c6aaff 100644
--- a/lib/gitlab/prometheus/metric.rb
+++ b/lib/gitlab/prometheus/metric.rb
@@ -1,14 +1,15 @@
 module Gitlab
   module Prometheus
     class Metric
-      attr_reader :group, :title, :required_metrics, :weight, :y_label, :queries
+      include ActiveModel::Model
 
-      def initialize(title, required_metrics, weight, y_label, queries = [])
-        @title = title
-        @required_metrics = required_metrics
-        @weight = weight
-        @y_label = y_label || 'Values'
-        @queries = queries
+      attr_accessor :title, :required_metrics, :weight, :y_label, :queries
+
+      validates :title, :required_metrics, :weight, :y_label, :queries, presence: true
+
+      def initialize(params = {})
+        super(params)
+        @y_label ||= 'Values'
       end
     end
   end
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 12bdf407ce0..729fef34b35 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -1,14 +1,10 @@
 module Gitlab
   module Prometheus
     class MetricGroup
-      attr_reader :priority, :name
-      attr_accessor :metrics
+      include ActiveModel::Model
 
-      def initialize(name, priority, metrics = [])
-        @name = name
-        @priority = priority
-        @metrics = metrics
-      end
+      attr_accessor :name, :priority, :metrics
+      validates :name, :priority, :metrics, presence: true
 
       def self.all
         AdditionalMetricsParser.load_groups_from_yaml
diff --git a/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
index 97280de173e..f8b2746b43d 100644
--- a/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
+++ b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
@@ -26,7 +26,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
             priority: 1
             metrics: 
               - title: title
-                required_metrics: []
+                required_metrics: ['metric_a']
                 weight: 1
                 queries: [{query_range: query_range_a}]
         EOF
@@ -54,7 +54,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         expect(metrics.count).to eq(3)
         expect(metrics[0]).to have_attributes(title: 'title', required_metrics: %w(metric_a metric_b), weight: 1)
         expect(metrics[1]).to have_attributes(title: 'title', required_metrics: %w(metric_a), weight: 1)
-        expect(metrics[2]).to have_attributes(title: 'title', required_metrics: [], weight: 1)
+        expect(metrics[2]).to have_attributes(title: 'title', required_metrics: %w{metric_a}, weight: 1)
       end
 
       it 'provides query data' do
@@ -78,7 +78,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
 
         it 'throws parsing error' do
-          expect { subject }.to raise_error(parser_error_class, /missing.*#{field_name}/)
+          expect { subject }.to raise_error(parser_error_class, /#{field_name} can't be blank/i)
         end
       end
 
@@ -88,13 +88,13 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
 
         it 'throws parsing error' do
-          expect { subject }.to raise_error(parser_error_class, /missing.*#{field_name}/)
+          expect { subject }.to raise_error(parser_error_class, /#{field_name} can't be blank/i)
         end
       end
     end
 
     describe 'group required fields' do
-      it_behaves_like 'required field', :metrics do
+      it_behaves_like 'required field', 'metrics' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
             - group: group_a
@@ -111,10 +111,11 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
       end
 
-      it_behaves_like 'required field', :group do
+      it_behaves_like 'required field', 'name' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
-            - priority: 1
+            - group:
+              priority: 1
               metrics: []
           EOF
         end
@@ -127,7 +128,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
       end
 
-      it_behaves_like 'required field', :priority do
+      it_behaves_like 'required field', 'priority' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
             - group: group_a
@@ -146,7 +147,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
     end
 
     describe 'metrics fields parsing' do
-      it_behaves_like 'required field', :title do
+      it_behaves_like 'required field', 'title' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
             - group: group_a
@@ -171,7 +172,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
       end
 
-      it_behaves_like 'required field', :required_metrics do
+      it_behaves_like 'required field', 'required metrics' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
             - group: group_a
@@ -196,7 +197,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
         end
       end
 
-      it_behaves_like 'required field', :weight do
+      it_behaves_like 'required field', 'weight' do
         let(:field_nil) do
           <<-EOF.strip_heredoc
             - group: group_a
diff --git a/spec/support/prometheus/metric_builders.rb b/spec/support/prometheus/metric_builders.rb
index e4b55c22acd..c8d056d3fc8 100644
--- a/spec/support/prometheus/metric_builders.rb
+++ b/spec/support/prometheus/metric_builders.rb
@@ -9,7 +9,7 @@ module Prometheus
     end
 
     def simple_metric(title: 'title', required_metrics: [], queries: [simple_query])
-      Gitlab::Prometheus::Metric.new(title, required_metrics, 1, nil, queries)
+      Gitlab::Prometheus::Metric.new(title: title, required_metrics: required_metrics, weight: 1, queries: queries)
     end
 
     def simple_metrics(added_metric_name: 'metric_a')
@@ -21,7 +21,7 @@ module Prometheus
     end
 
     def simple_metric_group(name: 'name', metrics: simple_metrics)
-      Gitlab::Prometheus::MetricGroup.new( name, 1, metrics)
+      Gitlab::Prometheus::MetricGroup.new(name: name, priority: 1, metrics: metrics)
     end
   end
 end
-- 
cgit v1.2.1


From 64bb0d37d4ef1f8574355019f198e40bc9b70224 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 16:53:02 +0200
Subject: cleanup wip

---
 spec/controllers/projects/deployments_controller_spec.rb  |  2 ++
 spec/controllers/projects/environments_controller_spec.rb | 12 +++++++-----
 spec/javascripts/fixtures/prometheus_service.rb           |  1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 26d92e787c4..c3b4f812db9 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -42,6 +42,7 @@ describe Projects::DeploymentsController do
     before do
       allow(controller).to receive(:deployment).and_return(deployment)
     end
+
     context 'when metrics are disabled' do
       before do
         allow(deployment).to receive(:has_metrics?).and_return false
@@ -114,6 +115,7 @@ describe Projects::DeploymentsController do
     before do
       allow(controller).to receive(:deployment).and_return(deployment)
     end
+
     context 'when metrics are disabled' do
       before do
         allow(deployment).to receive(:has_metrics?).and_return false
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index ab171cde6bf..749b090d6e0 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -338,11 +338,13 @@ describe Projects::EnvironmentsController do
 
     context 'when environment has some metrics' do
       before do
-        expect(environment).to receive(:additional_metrics).and_return({
-                                                              success: true,
-                                                              data: {},
-                                                              last_update: 42
-                                                            })
+        expect(environment)
+          .to receive(:additional_metrics)
+                .and_return({
+                              success: true,
+                              data: {},
+                              last_update: 42
+                            })
       end
 
       it 'returns a metrics JSON document' do
diff --git a/spec/javascripts/fixtures/prometheus_service.rb b/spec/javascripts/fixtures/prometheus_service.rb
index 7dfbf885fbd..4aa6ea3cdfc 100644
--- a/spec/javascripts/fixtures/prometheus_service.rb
+++ b/spec/javascripts/fixtures/prometheus_service.rb
@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
   let(:project)   { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
   let!(:service)  { create(:prometheus_service, project: project) }
   
-
   render_views
 
   before(:all) do
-- 
cgit v1.2.1


From be5f665557fc4f5b10d34f407545486746af54b8 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 18:26:40 +0200
Subject: Fix prometheus service frontend fixture

---
 spec/javascripts/fixtures/prometheus_service.rb                | 4 ++--
 spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/javascripts/fixtures/prometheus_service.rb b/spec/javascripts/fixtures/prometheus_service.rb
index 4aa6ea3cdfc..3200577b326 100644
--- a/spec/javascripts/fixtures/prometheus_service.rb
+++ b/spec/javascripts/fixtures/prometheus_service.rb
@@ -11,14 +11,14 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
   render_views
 
   before(:all) do
-    clean_frontend_fixtures('services/')
+    clean_frontend_fixtures('services/prometheus')
   end
 
   before(:each) do
     sign_in(admin)
   end
 
-  it 'services/prometheus_service.html.raw' do |example|
+  it 'services/prometheus/prometheus_service.html.raw' do |example|
     get :edit,
       namespace_id: namespace,
       project_id: project,
diff --git a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
index e7187a8a5e0..2b3a821dbd9 100644
--- a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
+++ b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
@@ -3,7 +3,7 @@ import PANEL_STATE from '~/prometheus_metrics/constants';
 import { metrics, missingVarMetrics } from './mock_data';
 
 describe('PrometheusMetrics', () => {
-  const FIXTURE = 'services/prometheus_service.html.raw';
+  const FIXTURE = 'services/prometheus/prometheus_service.html.raw';
   preloadFixtures(FIXTURE);
 
   beforeEach(() => {
-- 
cgit v1.2.1


From 6e4d5334211d73dd731cb8757b2ef10e8ea428b7 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 20:48:34 +0200
Subject: Move Prometheus service to project model

---
 app/controllers/projects/deployments_controller.rb       |  2 +-
 app/controllers/projects/prometheus_controller.rb        |  8 ++------
 app/models/deployment.rb                                 | 12 ++++++------
 app/models/environment.rb                                |  8 ++------
 app/models/project.rb                                    |  4 ++++
 spec/controllers/projects/deployments_controller_spec.rb |  2 +-
 spec/controllers/projects/prometheus_controller_spec.rb  |  2 +-
 spec/models/deployment_spec.rb                           |  7 ++++---
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index e7d95e46b06..acf5573935a 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -23,7 +23,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
   end
 
   def additional_metrics
-    return render_404 unless deployment.prometheus_service.present?
+    return render_404 unless deployment.has_additional_metrics?
 
     metrics = deployment.additional_metrics
 
diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
index 9609fa44945..7b828981dd8 100644
--- a/app/controllers/projects/prometheus_controller.rb
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -5,7 +5,7 @@ class Projects::PrometheusController < Projects::ApplicationController
   def active_metrics
     respond_to do |format|
       format.json do
-        matched_metrics = prometheus_service.matched_metrics || {}
+        matched_metrics = project.prometheus_service.matched_metrics || {}
 
         if matched_metrics.any?
           render json: matched_metrics
@@ -22,11 +22,7 @@ class Projects::PrometheusController < Projects::ApplicationController
     render_404
   end
 
-  def prometheus_service
-    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
-  end
-
   def require_prometheus_metrics!
-    render_404 unless prometheus_service.present?
+    render_404 unless project.prometheus_service.present?
   end
 end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 04d08f2cfd5..00bf0c118ae 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -114,17 +114,17 @@ class Deployment < ActiveRecord::Base
     project.monitoring_service.deployment_metrics(self)
   end
 
+  def has_additional_metrics?
+    project.prometheus_service.present?
+  end
+
   def additional_metrics
-    return {} unless prometheus_service.present?
+    return {} unless project.prometheus_service.present?
 
-    metrics = prometheus_service.additional_deployment_metrics(self)
+    metrics = project.prometheus_service.additional_deployment_metrics(self)
     metrics&.merge(deployment_time: created_at.to_i) || {}
   end
 
-  def prometheus_service
-    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
-  end
-
   private
 
   def ref_path
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 62db7e958ab..b391a487b30 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -158,19 +158,15 @@ class Environment < ActiveRecord::Base
   end
 
   def has_additional_metrics?
-    prometheus_service.present? && available? && last_deployment.present?
+    project.prometheus_service.present? && available? && last_deployment.present?
   end
 
   def additional_metrics
     if has_additional_metrics?
-      prometheus_service.additional_environment_metrics(self)
+      project.prometheus_service.additional_environment_metrics(self)
     end
   end
 
-  def prometheus_service
-    @prometheus_service ||= project.monitoring_services.reorder(nil).find_by(active: true, type: PrometheusService.name)
-  end
-
   # An environment name is not necessarily suitable for use in URLs, DNS
   # or other third-party contexts, so provide a slugified version. A slug has
   # the following properties:
diff --git a/app/models/project.rb b/app/models/project.rb
index 4c394646787..f6338b92b9f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -798,6 +798,10 @@ class Project < ActiveRecord::Base
     @monitoring_service ||= monitoring_services.reorder(nil).find_by(active: true)
   end
 
+  def prometheus_service
+    @prometheus_service ||= monitoring_services.find_by(active: true, type: PrometheusService.name)
+  end
+
   def jira_tracker?
     issues_tracker.to_param == 'jira'
   end
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index c3b4f812db9..4a77d4d8289 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -132,7 +132,7 @@ describe Projects::DeploymentsController do
       let(:prometheus_service) { double('prometheus_service') }
 
       before do
-        allow(deployment).to receive(:prometheus_service).and_return(prometheus_service)
+        allow(deployment.project).to receive(:prometheus_service).and_return(prometheus_service)
       end
 
       context 'when environment has no metrics' do
diff --git a/spec/controllers/projects/prometheus_controller_spec.rb b/spec/controllers/projects/prometheus_controller_spec.rb
index a994ac6409f..eddf7275975 100644
--- a/spec/controllers/projects/prometheus_controller_spec.rb
+++ b/spec/controllers/projects/prometheus_controller_spec.rb
@@ -8,7 +8,7 @@ describe Projects::PrometheusController do
 
   before do
     allow(controller).to receive(:project).and_return(project)
-    allow(controller).to receive(:prometheus_service).and_return(prometheus_service)
+    allow(project).to receive(:prometheus_service).and_return(prometheus_service)
 
     project.add_master(user)
     sign_in(user)
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index eba0175c54c..bb84d3fc13d 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -30,7 +30,7 @@ describe Deployment, models: true do
   end
 
   describe '#includes_commit?' do
-    let(:project)     { create(:project, :repository) }
+    let(:project) { create(:project, :repository) }
     let(:environment) { create(:environment, project: project) }
     let(:deployment) do
       create(:deployment, environment: environment, sha: project.commit.id)
@@ -91,7 +91,8 @@ describe Deployment, models: true do
   end
 
   describe '#additional_metrics' do
-    let(:deployment) { create(:deployment) }
+    let(:project) { create(:project) }
+    let(:deployment) { create(:deployment, project: project) }
 
     subject { deployment.additional_metrics }
 
@@ -111,7 +112,7 @@ describe Deployment, models: true do
       let(:prometheus_service) { double('prometheus_service') }
 
       before do
-        allow(deployment).to receive(:prometheus_service).and_return(prometheus_service)
+        allow(project).to receive(:prometheus_service).and_return(prometheus_service)
         allow(prometheus_service).to receive(:additional_deployment_metrics).and_return(simple_metrics)
       end
 
-- 
cgit v1.2.1


From 8b69523b014c9557bcb03bf0e695331ea9621312 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 20:54:15 +0200
Subject: move additional_metrics.yaml into prometheus/ config folder

---
 config/additional_metrics.yml                      | 32 ----------------------
 config/prometheus/additional_metrics.yml           | 32 ++++++++++++++++++++++
 lib/gitlab/prometheus/additional_metrics_parser.rb |  2 +-
 spec/models/environment_spec.rb                    |  2 +-
 4 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 config/additional_metrics.yml
 create mode 100644 config/prometheus/additional_metrics.yml

diff --git a/config/additional_metrics.yml b/config/additional_metrics.yml
deleted file mode 100644
index daecde49570..00000000000
--- a/config/additional_metrics.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- group: Kubernetes
-  priority: 1
-  metrics:
-  - title: "Memory usage"
-    y_label: "Values"
-    required_metrics:
-      - container_memory_usage_bytes
-    weight: 1
-    queries:
-    - query_range: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
-      label: Container memory
-      unit: MiB
-  - title: "Current memory usage"
-    required_metrics:
-     - container_memory_usage_bytes
-    weight: 1
-    queries:
-    - query: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
-      display_empty: false
-      unit: MiB
-  - title: "CPU usage"
-    required_metrics:
-     - container_cpu_usage_seconds_total
-    weight: 1
-    queries:
-    - query_range: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
-  - title: "Current CPU usage"
-    required_metrics:
-     - container_cpu_usage_seconds_total
-    weight: 1
-    queries:
-    - query: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
new file mode 100644
index 00000000000..daecde49570
--- /dev/null
+++ b/config/prometheus/additional_metrics.yml
@@ -0,0 +1,32 @@
+- group: Kubernetes
+  priority: 1
+  metrics:
+  - title: "Memory usage"
+    y_label: "Values"
+    required_metrics:
+      - container_memory_usage_bytes
+    weight: 1
+    queries:
+    - query_range: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
+      label: Container memory
+      unit: MiB
+  - title: "Current memory usage"
+    required_metrics:
+     - container_memory_usage_bytes
+    weight: 1
+    queries:
+    - query: 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20'
+      display_empty: false
+      unit: MiB
+  - title: "CPU usage"
+    required_metrics:
+     - container_cpu_usage_seconds_total
+    weight: 1
+    queries:
+    - query_range: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
+  - title: "Current CPU usage"
+    required_metrics:
+     - container_cpu_usage_seconds_total
+    weight: 1
+    queries:
+    - query: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100'
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index 70151e8c6ad..c07afbac9ea 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -27,7 +27,7 @@ module Gitlab
       end
 
       def load_yaml_file
-        YAML.load_file(Rails.root.join('config/additional_metrics.yml'))
+        YAML.load_file(Rails.root.join('config/prometheus/additional_metrics.yml'))
       end
     end
   end
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index f36c165ef7d..b0635c6a90a 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -475,7 +475,7 @@ describe Environment, models: true do
       end
 
       it 'returns the additional metrics from the deployment service' do
-        expect(environment.prometheus_service).to receive(:additional_environment_metrics)
+        expect(project.prometheus_service).to receive(:additional_environment_metrics)
                                                 .with(environment)
                                                 .and_return(:fake_metrics)
 
-- 
cgit v1.2.1


From 13902e40a8c11ca8d19bd7dc7e7c44fc62ee31dc Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 16 Jun 2017 20:58:18 +0200
Subject: Memoize only yaml loading method

---
 lib/gitlab/prometheus/additional_metrics_parser.rb           | 4 ++--
 spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index c07afbac9ea..cb95daf2260 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -23,11 +23,11 @@ module Gitlab
       end
 
       def additional_metrics_raw
-        @additional_metrics_raw ||= load_yaml_file&.map(&:deep_symbolize_keys).freeze
+        load_yaml_file&.map(&:deep_symbolize_keys).freeze
       end
 
       def load_yaml_file
-        YAML.load_file(Rails.root.join('config/prometheus/additional_metrics.yml'))
+        @loaded_yaml_file ||= YAML.load_file(Rails.root.join('config/prometheus/additional_metrics.yml'))
       end
     end
   end
diff --git a/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
index f8b2746b43d..61d48b05454 100644
--- a/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
+++ b/spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb
@@ -33,7 +33,6 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
       end
 
       before do
-        described_class.instance_variable_set :@additional_metrics_raw, nil
         allow(described_class).to receive(:load_yaml_file) { YAML.load(sample_yaml) }
       end
 
@@ -68,10 +67,6 @@ describe Gitlab::Prometheus::AdditionalMetricsParser, lib: true do
     end
 
     shared_examples 'required field' do |field_name|
-      before do
-        described_class.instance_variable_set :@additional_metrics_raw, nil
-      end
-
       context "when #{field_name} is nil" do
         before do
           allow(described_class).to receive(:load_yaml_file) { YAML.load(field_missing) }
-- 
cgit v1.2.1


From 3b4c07ac5fd173786d3e587a5af9ea27bfd0a707 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 16 Jun 2017 16:56:32 -0500
Subject: refactor AwardsHandler into es class syntax

---
 app/assets/javascripts/awards_handler.js | 753 +++++++++++++++----------------
 1 file changed, 374 insertions(+), 379 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index adb45b0606d..ebe722061d7 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -1,3 +1,4 @@
+/* eslint-disable class-methods-use-this */
 /* global Flash */
 
 import Cookies from 'js-cookie';
@@ -68,141 +69,140 @@ function renderCategory(name, emojiList, opts = {}) {
   `;
 }
 
-function AwardsHandler() {
-  this.eventListeners = [];
-  this.aliases = emojiAliases;
-  // If the user shows intent let's pre-build the menu
-  this.registerEventListener('one', $(document), 'mouseenter focus', '.js-add-award', 'mouseenter focus', () => {
-    const $menu = $('.emoji-menu');
-    if ($menu.length === 0) {
-      requestAnimationFrame(() => {
-        this.createEmojiMenu();
-      });
-    }
-    // Prebuild the categoryMap
-    categoryMap = categoryMap || buildCategoryMap();
-  });
-  this.registerEventListener('on', $(document), 'click', '.js-add-award', (e) => {
-    e.stopPropagation();
-    e.preventDefault();
-    this.showEmojiMenu($(e.currentTarget));
-  });
+export default class AwardsHandler {
+  constructor() {
+    this.eventListeners = [];
+    this.aliases = emojiAliases;
+    // If the user shows intent let's pre-build the menu
+    this.registerEventListener('one', $(document), 'mouseenter focus', '.js-add-award', 'mouseenter focus', () => {
+      const $menu = $('.emoji-menu');
+      if ($menu.length === 0) {
+        requestAnimationFrame(() => {
+          this.createEmojiMenu();
+        });
+      }
+      // Prebuild the categoryMap
+      categoryMap = categoryMap || buildCategoryMap();
+    });
+    this.registerEventListener('on', $(document), 'click', '.js-add-award', (e) => {
+      e.stopPropagation();
+      e.preventDefault();
+      this.showEmojiMenu($(e.currentTarget));
+    });
 
-  this.registerEventListener('on', $('html'), 'click', (e) => {
-    const $target = $(e.target);
-    if (!$target.closest('.emoji-menu-content').length) {
-      $('.js-awards-block.current').removeClass('current');
-    }
-    if (!$target.closest('.emoji-menu').length) {
-      if ($('.emoji-menu').is(':visible')) {
-        $('.js-add-award.is-active').removeClass('is-active');
-        $('.emoji-menu').removeClass('is-visible');
+    this.registerEventListener('on', $('html'), 'click', (e) => {
+      const $target = $(e.target);
+      if (!$target.closest('.emoji-menu-content').length) {
+        $('.js-awards-block.current').removeClass('current');
       }
-    }
-  });
-  this.registerEventListener('on', $(document), 'click', '.js-emoji-btn', (e) => {
-    e.preventDefault();
-    const $target = $(e.currentTarget);
-    const $glEmojiElement = $target.find('gl-emoji');
-    const $spriteIconElement = $target.find('.icon');
-    const emoji = ($glEmojiElement.length ? $glEmojiElement : $spriteIconElement).data('name');
-
-    $target.closest('.js-awards-block').addClass('current');
-    this.addAward(this.getVotesBlock(), this.getAwardUrl(), emoji);
-  });
-}
+      if (!$target.closest('.emoji-menu').length) {
+        if ($('.emoji-menu').is(':visible')) {
+          $('.js-add-award.is-active').removeClass('is-active');
+          $('.emoji-menu').removeClass('is-visible');
+        }
+      }
+    });
+    this.registerEventListener('on', $(document), 'click', '.js-emoji-btn', (e) => {
+      e.preventDefault();
+      const $target = $(e.currentTarget);
+      const $glEmojiElement = $target.find('gl-emoji');
+      const $spriteIconElement = $target.find('.icon');
+      const emoji = ($glEmojiElement.length ? $glEmojiElement : $spriteIconElement).data('name');
+
+      $target.closest('.js-awards-block').addClass('current');
+      this.addAward(this.getVotesBlock(), this.getAwardUrl(), emoji);
+    });
+  }
 
-AwardsHandler.prototype.registerEventListener = function registerEventListener(method = 'on', element, ...args) {
-  element[method].call(element, ...args);
-  this.eventListeners.push({
-    element,
-    args,
-  });
-};
+  registerEventListener(method = 'on', element, ...args) {
+    element[method].call(element, ...args);
+    this.eventListeners.push({
+      element,
+      args,
+    });
+  }
 
-AwardsHandler.prototype.showEmojiMenu = function showEmojiMenu($addBtn) {
-  if ($addBtn.hasClass('js-note-emoji')) {
-    $addBtn.closest('.note').find('.js-awards-block').addClass('current');
-  } else {
-    $addBtn.closest('.js-awards-block').addClass('current');
-  }
-
-  const $menu = $('.emoji-menu');
-  const $thumbsBtn = $menu.find('[data-name="thumbsup"], [data-name="thumbsdown"]').parent();
-  const $userAuthored = this.isUserAuthored($addBtn);
-  if ($menu.length) {
-    if ($menu.is('.is-visible')) {
-      $addBtn.removeClass('is-active');
-      $menu.removeClass('is-visible');
-      $('.js-emoji-menu-search').blur();
+  showEmojiMenu($addBtn) {
+    if ($addBtn.hasClass('js-note-emoji')) {
+      $addBtn.closest('.note').find('.js-awards-block').addClass('current');
     } else {
-      $addBtn.addClass('is-active');
-      this.positionMenu($menu, $addBtn);
-      $menu.addClass('is-visible');
-      $('.js-emoji-menu-search').focus();
+      $addBtn.closest('.js-awards-block').addClass('current');
     }
-  } else {
-    $addBtn.addClass('is-loading is-active');
-    this.createEmojiMenu(() => {
-      const $createdMenu = $('.emoji-menu');
-      $addBtn.removeClass('is-loading');
-      this.positionMenu($createdMenu, $addBtn);
-      return setTimeout(() => {
-        $createdMenu.addClass('is-visible');
+
+    const $menu = $('.emoji-menu');
+    const $thumbsBtn = $menu.find('[data-name="thumbsup"], [data-name="thumbsdown"]').parent();
+    const $userAuthored = this.isUserAuthored($addBtn);
+    if ($menu.length) {
+      if ($menu.is('.is-visible')) {
+        $addBtn.removeClass('is-active');
+        $menu.removeClass('is-visible');
+        $('.js-emoji-menu-search').blur();
+      } else {
+        $addBtn.addClass('is-active');
+        this.positionMenu($menu, $addBtn);
+        $menu.addClass('is-visible');
         $('.js-emoji-menu-search').focus();
-      }, 200);
-    });
+      }
+    } else {
+      $addBtn.addClass('is-loading is-active');
+      this.createEmojiMenu(() => {
+        const $createdMenu = $('.emoji-menu');
+        $addBtn.removeClass('is-loading');
+        this.positionMenu($createdMenu, $addBtn);
+        return setTimeout(() => {
+          $createdMenu.addClass('is-visible');
+          $('.js-emoji-menu-search').focus();
+        }, 200);
+      });
+    }
+
+    $thumbsBtn.toggleClass('disabled', $userAuthored);
   }
 
-  $thumbsBtn.toggleClass('disabled', $userAuthored);
-};
+  // Create the emoji menu with the first category of emojis.
+  // Then render the remaining categories of emojis one by one to avoid jank.
+  createEmojiMenu(callback) {
+    if (this.isCreatingEmojiMenu) {
+      return;
+    }
+    this.isCreatingEmojiMenu = true;
 
-// Create the emoji menu with the first category of emojis.
-// Then render the remaining categories of emojis one by one to avoid jank.
-AwardsHandler.prototype.createEmojiMenu = function createEmojiMenu(callback) {
-  if (this.isCreatingEmojiMenu) {
-    return;
-  }
-  this.isCreatingEmojiMenu = true;
-
-  // Render the first category
-  categoryMap = categoryMap || buildCategoryMap();
-  const categoryNameKey = Object.keys(categoryMap)[0];
-  const emojisInCategory = categoryMap[categoryNameKey];
-  const firstCategory = renderCategory(categoryLabelMap[categoryNameKey], emojisInCategory);
-
-  // Render the frequently used
-  const frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
-  let frequentlyUsedCatgegory = '';
-  if (frequentlyUsedEmojis.length > 0) {
-    frequentlyUsedCatgegory = renderCategory('Frequently used', frequentlyUsedEmojis, {
-      menuListClass: 'frequent-emojis',
-    });
-  }
+    // Render the first category
+    categoryMap = categoryMap || buildCategoryMap();
+    const categoryNameKey = Object.keys(categoryMap)[0];
+    const emojisInCategory = categoryMap[categoryNameKey];
+    const firstCategory = renderCategory(categoryLabelMap[categoryNameKey], emojisInCategory);
+
+    // Render the frequently used
+    const frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
+    let frequentlyUsedCatgegory = '';
+    if (frequentlyUsedEmojis.length > 0) {
+      frequentlyUsedCatgegory = renderCategory('Frequently used', frequentlyUsedEmojis, {
+        menuListClass: 'frequent-emojis',
+      });
+    }
 
-  const emojiMenuMarkup = `
-    <div class="emoji-menu">
-      <input type="text" name="emoji-menu-search" value="" class="js-emoji-menu-search emoji-search search-input form-control" placeholder="Search emoji" />
+    const emojiMenuMarkup = `
+      <div class="emoji-menu">
+        <input type="text" name="emoji-menu-search" value="" class="js-emoji-menu-search emoji-search search-input form-control" placeholder="Search emoji" />
 
-      <div class="emoji-menu-content">
-        ${frequentlyUsedCatgegory}
-        ${firstCategory}
+        <div class="emoji-menu-content">
+          ${frequentlyUsedCatgegory}
+          ${firstCategory}
+        </div>
       </div>
-    </div>
-  `;
+    `;
 
-  document.body.insertAdjacentHTML('beforeend', emojiMenuMarkup);
+    document.body.insertAdjacentHTML('beforeend', emojiMenuMarkup);
 
-  this.addRemainingEmojiMenuCategories();
-  this.setupSearch();
-  if (callback) {
-    callback();
+    this.addRemainingEmojiMenuCategories();
+    this.setupSearch();
+    if (callback) {
+      callback();
+    }
   }
-};
 
-AwardsHandler
-  .prototype
-  .addRemainingEmojiMenuCategories = function addRemainingEmojiMenuCategories() {
+  addRemainingEmojiMenuCategories() {
     if (this.isAddingRemainingEmojiMenuCategories) {
       return;
     }
@@ -243,176 +243,174 @@ AwardsHandler
       emojiContentElement.insertAdjacentHTML('beforeend', '<p>We encountered an error while adding the remaining categories</p>');
       throw new Error(`Error occurred in addRemainingEmojiMenuCategories: ${err.message}`);
     });
-  };
-
-AwardsHandler.prototype.positionMenu = function positionMenu($menu, $addBtn) {
-  const position = $addBtn.data('position');
-  // The menu could potentially be off-screen or in a hidden overflow element
-  // So we position the element absolute in the body
-  const css = {
-    top: `${$addBtn.offset().top + $addBtn.outerHeight()}px`,
-  };
-  if (position === 'right') {
-    css.left = `${($addBtn.offset().left - $menu.outerWidth()) + 20}px`;
-    $menu.addClass('is-aligned-right');
-  } else {
-    css.left = `${$addBtn.offset().left}px`;
-    $menu.removeClass('is-aligned-right');
-  }
-  return $menu.css(css);
-};
-
-AwardsHandler.prototype.addAward = function addAward(
-  votesBlock,
-  awardUrl,
-  emoji,
-  checkMutuality,
-  callback,
-) {
-  const normalizedEmoji = this.normalizeEmojiName(emoji);
-  const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent();
-  this.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => {
-    this.addAwardToEmojiBar(votesBlock, normalizedEmoji, checkMutuality);
-    return typeof callback === 'function' ? callback() : undefined;
-  });
-  $('.emoji-menu').removeClass('is-visible');
-  $('.js-add-award.is-active').removeClass('is-active');
-};
+  }
 
-AwardsHandler.prototype.addAwardToEmojiBar = function addAwardToEmojiBar(
-  votesBlock,
-  emoji,
-  checkForMutuality,
-) {
-  if (checkForMutuality || checkForMutuality === null) {
-    this.checkMutuality(votesBlock, emoji);
-  }
-  this.addEmojiToFrequentlyUsedList(emoji);
-  const normalizedEmoji = this.normalizeEmojiName(emoji);
-  const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent();
-  if ($emojiButton.length > 0) {
-    if (this.isActive($emojiButton)) {
-      this.decrementCounter($emojiButton, normalizedEmoji);
+  positionMenu($menu, $addBtn) {
+    const position = $addBtn.data('position');
+    // The menu could potentially be off-screen or in a hidden overflow element
+    // So we position the element absolute in the body
+    const css = {
+      top: `${$addBtn.offset().top + $addBtn.outerHeight()}px`,
+    };
+    if (position === 'right') {
+      css.left = `${($addBtn.offset().left - $menu.outerWidth()) + 20}px`;
+      $menu.addClass('is-aligned-right');
     } else {
-      const counter = $emojiButton.find('.js-counter');
-      counter.text(parseInt(counter.text(), 10) + 1);
-      $emojiButton.addClass('active');
-      this.addYouToUserList(votesBlock, normalizedEmoji);
-      this.animateEmoji($emojiButton);
+      css.left = `${$addBtn.offset().left}px`;
+      $menu.removeClass('is-aligned-right');
     }
-  } else {
-    votesBlock.removeClass('hidden');
-    this.createEmoji(votesBlock, normalizedEmoji);
+    return $menu.css(css);
   }
-};
 
-AwardsHandler.prototype.getVotesBlock = function getVotesBlock() {
-  const currentBlock = $('.js-awards-block.current');
-  let resultantVotesBlock = currentBlock;
-  if (currentBlock.length === 0) {
-    resultantVotesBlock = $('.js-awards-block').eq(0);
+  addAward(
+    votesBlock,
+    awardUrl,
+    emoji,
+    checkMutuality,
+    callback,
+  ) {
+    const normalizedEmoji = this.normalizeEmojiName(emoji);
+    const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent();
+    this.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => {
+      this.addAwardToEmojiBar(votesBlock, normalizedEmoji, checkMutuality);
+      return typeof callback === 'function' ? callback() : undefined;
+    });
+    $('.emoji-menu').removeClass('is-visible');
+    $('.js-add-award.is-active').removeClass('is-active');
   }
 
-  return resultantVotesBlock;
-};
+  addAwardToEmojiBar(
+    votesBlock,
+    emoji,
+    checkForMutuality,
+  ) {
+    if (checkForMutuality || checkForMutuality === null) {
+      this.checkMutuality(votesBlock, emoji);
+    }
+    this.addEmojiToFrequentlyUsedList(emoji);
+    const normalizedEmoji = this.normalizeEmojiName(emoji);
+    const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent();
+    if ($emojiButton.length > 0) {
+      if (this.isActive($emojiButton)) {
+        this.decrementCounter($emojiButton, normalizedEmoji);
+      } else {
+        const counter = $emojiButton.find('.js-counter');
+        counter.text(parseInt(counter.text(), 10) + 1);
+        $emojiButton.addClass('active');
+        this.addYouToUserList(votesBlock, normalizedEmoji);
+        this.animateEmoji($emojiButton);
+      }
+    } else {
+      votesBlock.removeClass('hidden');
+      this.createEmoji(votesBlock, normalizedEmoji);
+    }
+  }
 
-AwardsHandler.prototype.getAwardUrl = function getAwardUrl() {
-  return this.getVotesBlock().data('award-url');
-};
+  getVotesBlock() {
+    const currentBlock = $('.js-awards-block.current');
+    let resultantVotesBlock = currentBlock;
+    if (currentBlock.length === 0) {
+      resultantVotesBlock = $('.js-awards-block').eq(0);
+    }
+
+    return resultantVotesBlock;
+  }
 
-AwardsHandler.prototype.checkMutuality = function checkMutuality(votesBlock, emoji) {
-  const awardUrl = this.getAwardUrl();
-  if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
-    const mutualVote = emoji === 'thumbsup' ? 'thumbsdown' : 'thumbsup';
-    const $emojiButton = votesBlock.find(`[data-name="${mutualVote}"]`).parent();
-    const isAlreadyVoted = $emojiButton.hasClass('active');
-    if (isAlreadyVoted) {
-      this.addAward(votesBlock, awardUrl, mutualVote, false);
+  getAwardUrl() {
+    return this.getVotesBlock().data('award-url');
+  }
+
+  checkMutuality(votesBlock, emoji) {
+    const awardUrl = this.getAwardUrl();
+    if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
+      const mutualVote = emoji === 'thumbsup' ? 'thumbsdown' : 'thumbsup';
+      const $emojiButton = votesBlock.find(`[data-name="${mutualVote}"]`).parent();
+      const isAlreadyVoted = $emojiButton.hasClass('active');
+      if (isAlreadyVoted) {
+        this.addAward(votesBlock, awardUrl, mutualVote, false);
+      }
     }
   }
-};
 
-AwardsHandler.prototype.isActive = function isActive($emojiButton) {
-  return $emojiButton.hasClass('active');
-};
+  isActive($emojiButton) {
+    return $emojiButton.hasClass('active');
+  }
 
-AwardsHandler.prototype.isUserAuthored = function isUserAuthored($button) {
-  return $button.hasClass('js-user-authored');
-};
+  isUserAuthored($button) {
+    return $button.hasClass('js-user-authored');
+  }
 
-AwardsHandler.prototype.decrementCounter = function decrementCounter($emojiButton, emoji) {
-  const counter = $('.js-counter', $emojiButton);
-  const counterNumber = parseInt(counter.text(), 10);
-  if (counterNumber > 1) {
-    counter.text(counterNumber - 1);
-    this.removeYouFromUserList($emojiButton);
-  } else if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
-    $emojiButton.tooltip('destroy');
-    counter.text('0');
-    this.removeYouFromUserList($emojiButton);
-    if ($emojiButton.parents('.note').length) {
+  decrementCounter($emojiButton, emoji) {
+    const counter = $('.js-counter', $emojiButton);
+    const counterNumber = parseInt(counter.text(), 10);
+    if (counterNumber > 1) {
+      counter.text(counterNumber - 1);
+      this.removeYouFromUserList($emojiButton);
+    } else if (emoji === 'thumbsup' || emoji === 'thumbsdown') {
+      $emojiButton.tooltip('destroy');
+      counter.text('0');
+      this.removeYouFromUserList($emojiButton);
+      if ($emojiButton.parents('.note').length) {
+        this.removeEmoji($emojiButton);
+      }
+    } else {
       this.removeEmoji($emojiButton);
     }
-  } else {
-    this.removeEmoji($emojiButton);
+    return $emojiButton.removeClass('active');
   }
-  return $emojiButton.removeClass('active');
-};
 
-AwardsHandler.prototype.removeEmoji = function removeEmoji($emojiButton) {
-  $emojiButton.tooltip('destroy');
-  $emojiButton.remove();
-  const $votesBlock = this.getVotesBlock();
-  if ($votesBlock.find('.js-emoji-btn').length === 0) {
-    $votesBlock.addClass('hidden');
+  removeEmoji($emojiButton) {
+    $emojiButton.tooltip('destroy');
+    $emojiButton.remove();
+    const $votesBlock = this.getVotesBlock();
+    if ($votesBlock.find('.js-emoji-btn').length === 0) {
+      $votesBlock.addClass('hidden');
+    }
   }
-};
-
-AwardsHandler.prototype.getAwardTooltip = function getAwardTooltip($awardBlock) {
-  return $awardBlock.attr('data-original-title') || $awardBlock.attr('data-title') || '';
-};
 
-AwardsHandler.prototype.toSentence = function toSentence(list) {
-  let sentence;
-  if (list.length <= 2) {
-    sentence = list.join(' and ');
-  } else {
-    sentence = `${list.slice(0, -1).join(', ')}, and ${list[list.length - 1]}`;
+  getAwardTooltip($awardBlock) {
+    return $awardBlock.attr('data-original-title') || $awardBlock.attr('data-title') || '';
   }
 
-  return sentence;
-};
+  toSentence(list) {
+    let sentence;
+    if (list.length <= 2) {
+      sentence = list.join(' and ');
+    } else {
+      sentence = `${list.slice(0, -1).join(', ')}, and ${list[list.length - 1]}`;
+    }
 
-AwardsHandler.prototype.removeYouFromUserList = function removeYouFromUserList($emojiButton) {
-  const awardBlock = $emojiButton;
-  const originalTitle = this.getAwardTooltip(awardBlock);
-  const authors = originalTitle.split(FROM_SENTENCE_REGEX);
-  authors.splice(authors.indexOf('You'), 1);
-  return awardBlock
-    .closest('.js-emoji-btn')
-    .removeData('title')
-    .removeAttr('data-title')
-    .removeAttr('data-original-title')
-    .attr('title', this.toSentence(authors))
-    .tooltip('fixTitle');
-};
+    return sentence;
+  }
 
-AwardsHandler.prototype.addYouToUserList = function addYouToUserList(votesBlock, emoji) {
-  const awardBlock = this.findEmojiIcon(votesBlock, emoji).parent();
-  const origTitle = this.getAwardTooltip(awardBlock);
-  let users = [];
-  if (origTitle) {
-    users = origTitle.trim().split(FROM_SENTENCE_REGEX);
-  }
-  users.unshift('You');
-  return awardBlock
-    .attr('title', this.toSentence(users))
-    .tooltip('fixTitle');
-};
+  removeYouFromUserList($emojiButton) {
+    const awardBlock = $emojiButton;
+    const originalTitle = this.getAwardTooltip(awardBlock);
+    const authors = originalTitle.split(FROM_SENTENCE_REGEX);
+    authors.splice(authors.indexOf('You'), 1);
+    return awardBlock
+      .closest('.js-emoji-btn')
+      .removeData('title')
+      .removeAttr('data-title')
+      .removeAttr('data-original-title')
+      .attr('title', this.toSentence(authors))
+      .tooltip('fixTitle');
+  }
+
+  addYouToUserList(votesBlock, emoji) {
+    const awardBlock = this.findEmojiIcon(votesBlock, emoji).parent();
+    const origTitle = this.getAwardTooltip(awardBlock);
+    let users = [];
+    if (origTitle) {
+      users = origTitle.trim().split(FROM_SENTENCE_REGEX);
+    }
+    users.unshift('You');
+    return awardBlock
+      .attr('title', this.toSentence(users))
+      .tooltip('fixTitle');
+  }
 
-AwardsHandler
-  .prototype
-  .createAwardButtonForVotesBlock = function createAwardButtonForVotesBlock(votesBlock, emojiName) {
+  createAwardButtonForVotesBlock(votesBlock, emojiName) {
     const buttonHtml = `
       <button class="btn award-control js-emoji-btn has-tooltip active" title="You" data-placement="bottom">
         ${glEmojiTag(emojiName)}
@@ -424,144 +422,141 @@ AwardsHandler
     this.animateEmoji($emojiButton);
     $('.award-control').tooltip();
     votesBlock.removeClass('current');
-  };
+  }
 
-AwardsHandler.prototype.animateEmoji = function animateEmoji($emoji) {
-  const className = 'pulse animated once short';
-  $emoji.addClass(className);
+  animateEmoji($emoji) {
+    const className = 'pulse animated once short';
+    $emoji.addClass(className);
 
-  this.registerEventListener('on', $emoji, animationEndEventString, (e) => {
-    $(e.currentTarget).removeClass(className);
-  });
-};
+    this.registerEventListener('on', $emoji, animationEndEventString, (e) => {
+      $(e.currentTarget).removeClass(className);
+    });
+  }
 
-AwardsHandler.prototype.createEmoji = function createEmoji(votesBlock, emoji) {
-  if ($('.emoji-menu').length) {
-    this.createAwardButtonForVotesBlock(votesBlock, emoji);
+  createEmoji(votesBlock, emoji) {
+    if ($('.emoji-menu').length) {
+      this.createAwardButtonForVotesBlock(votesBlock, emoji);
+    }
+    this.createEmojiMenu(() => {
+      this.createAwardButtonForVotesBlock(votesBlock, emoji);
+    });
   }
-  this.createEmojiMenu(() => {
-    this.createAwardButtonForVotesBlock(votesBlock, emoji);
-  });
-};
 
-AwardsHandler.prototype.postEmoji = function postEmoji($emojiButton, awardUrl, emoji, callback) {
-  if (this.isUserAuthored($emojiButton)) {
-    this.userAuthored($emojiButton);
-  } else {
-    $.post(awardUrl, {
-      name: emoji,
-    }, (data) => {
-      if (data.ok) {
-        callback();
-      }
-    }).fail(() => new Flash('Something went wrong on our end.'));
+  postEmoji($emojiButton, awardUrl, emoji, callback) {
+    if (this.isUserAuthored($emojiButton)) {
+      this.userAuthored($emojiButton);
+    } else {
+      $.post(awardUrl, {
+        name: emoji,
+      }, (data) => {
+        if (data.ok) {
+          callback();
+        }
+      }).fail(() => new Flash('Something went wrong on our end.'));
+    }
   }
-};
 
-AwardsHandler.prototype.findEmojiIcon = function findEmojiIcon(votesBlock, emoji) {
-  return votesBlock.find(`.js-emoji-btn [data-name="${emoji}"]`);
-};
+  findEmojiIcon(votesBlock, emoji) {
+    return votesBlock.find(`.js-emoji-btn [data-name="${emoji}"]`);
+  }
 
-AwardsHandler.prototype.userAuthored = function userAuthored($emojiButton) {
-  const oldTitle = this.getAwardTooltip($emojiButton);
-  const newTitle = 'You cannot vote on your own issue, MR and note';
-  gl.utils.updateTooltipTitle($emojiButton, newTitle).tooltip('show');
-  // Restore tooltip back to award list
-  return setTimeout(() => {
-    $emojiButton.tooltip('hide');
-    gl.utils.updateTooltipTitle($emojiButton, oldTitle);
-  }, 2800);
-};
+  userAuthored($emojiButton) {
+    const oldTitle = this.getAwardTooltip($emojiButton);
+    const newTitle = 'You cannot vote on your own issue, MR and note';
+    gl.utils.updateTooltipTitle($emojiButton, newTitle).tooltip('show');
+    // Restore tooltip back to award list
+    return setTimeout(() => {
+      $emojiButton.tooltip('hide');
+      gl.utils.updateTooltipTitle($emojiButton, oldTitle);
+    }, 2800);
+  }
 
-AwardsHandler.prototype.scrollToAwards = function scrollToAwards() {
-  const options = {
-    scrollTop: $('.awards').offset().top - 110,
-  };
-  return $('body, html').animate(options, 200);
-};
+  scrollToAwards() {
+    const options = {
+      scrollTop: $('.awards').offset().top - 110,
+    };
+    return $('body, html').animate(options, 200);
+  }
 
-AwardsHandler.prototype.normalizeEmojiName = function normalizeEmojiName(emoji) {
-  return Object.prototype.hasOwnProperty.call(this.aliases, emoji) ? this.aliases[emoji] : emoji;
-};
+  normalizeEmojiName(emoji) {
+    return Object.prototype.hasOwnProperty.call(this.aliases, emoji) ? this.aliases[emoji] : emoji;
+  }
 
-AwardsHandler
-  .prototype
-  .addEmojiToFrequentlyUsedList = function addEmojiToFrequentlyUsedList(emoji) {
+  addEmojiToFrequentlyUsedList(emoji) {
     if (isEmojiNameValid(emoji)) {
       this.frequentlyUsedEmojis = _.uniq(this.getFrequentlyUsedEmojis().concat(emoji));
       Cookies.set('frequently_used_emojis', this.frequentlyUsedEmojis.join(','), { expires: 365 });
     }
-  };
-
-AwardsHandler.prototype.getFrequentlyUsedEmojis = function getFrequentlyUsedEmojis() {
-  return this.frequentlyUsedEmojis || (() => {
-    const frequentlyUsedEmojis = _.uniq((Cookies.get('frequently_used_emojis') || '').split(','));
-    this.frequentlyUsedEmojis = frequentlyUsedEmojis.filter(
-      inputName => isEmojiNameValid(inputName),
-    );
+  }
 
-    return this.frequentlyUsedEmojis;
-  })();
-};
+  getFrequentlyUsedEmojis() {
+    return this.frequentlyUsedEmojis || (() => {
+      const frequentlyUsedEmojis = _.uniq((Cookies.get('frequently_used_emojis') || '').split(','));
+      this.frequentlyUsedEmojis = frequentlyUsedEmojis.filter(
+        inputName => isEmojiNameValid(inputName),
+      );
 
-AwardsHandler.prototype.setupSearch = function setupSearch() {
-  const $search = $('.js-emoji-menu-search');
+      return this.frequentlyUsedEmojis;
+    })();
+  }
 
-  this.registerEventListener('on', $search, 'input', (e) => {
-    const term = $(e.target).val().trim();
-    this.searchEmojis(term);
-  });
+  setupSearch() {
+    const $search = $('.js-emoji-menu-search');
 
-  const $menu = $('.emoji-menu');
-  this.registerEventListener('on', $menu, transitionEndEventString, (e) => {
-    if (e.target === e.currentTarget) {
-      // Clear the search
-      this.searchEmojis('');
-    }
-  });
-};
+    this.registerEventListener('on', $search, 'input', (e) => {
+      const term = $(e.target).val().trim();
+      this.searchEmojis(term);
+    });
 
-AwardsHandler.prototype.searchEmojis = function searchEmojis(term) {
-  const $search = $('.js-emoji-menu-search');
-  $search.val(term);
-
-  // Clean previous search results
-  $('ul.emoji-menu-search, h5.emoji-search-title').remove();
-  if (term.length > 0) {
-    // Generate a search result block
-    const h5 = $('<h5 class="emoji-search-title"/>').text('Search results');
-    const foundEmojis = this.findMatchingEmojiElements(term).show();
-    const ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis);
-    $('.emoji-menu-content ul, .emoji-menu-content h5').hide();
-    $('.emoji-menu-content').append(h5).append(ul);
-  } else {
-    $('.emoji-menu-content').children().show();
+    const $menu = $('.emoji-menu');
+    this.registerEventListener('on', $menu, transitionEndEventString, (e) => {
+      if (e.target === e.currentTarget) {
+        // Clear the search
+        this.searchEmojis('');
+      }
+    });
   }
-};
-
-AwardsHandler.prototype.findMatchingEmojiElements = function findMatchingEmojiElements(term) {
-  const safeTerm = term.toLowerCase();
 
-  const namesMatchingAlias = [];
-  Object.keys(emojiAliases).forEach((alias) => {
-    if (alias.indexOf(safeTerm) >= 0) {
-      namesMatchingAlias.push(emojiAliases[alias]);
+  searchEmojis(term) {
+    const $search = $('.js-emoji-menu-search');
+    $search.val(term);
+
+    // Clean previous search results
+    $('ul.emoji-menu-search, h5.emoji-search-title').remove();
+    if (term.length > 0) {
+      // Generate a search result block
+      const h5 = $('<h5 class="emoji-search-title"/>').text('Search results');
+      const foundEmojis = this.findMatchingEmojiElements(term).show();
+      const ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis);
+      $('.emoji-menu-content ul, .emoji-menu-content h5').hide();
+      $('.emoji-menu-content').append(h5).append(ul);
+    } else {
+      $('.emoji-menu-content').children().show();
     }
-  });
-  const $matchingElements = namesMatchingAlias.concat(safeTerm)
-    .reduce(
-      ($result, searchTerm) =>
-        $result.add($(`.emoji-menu-list:not(.frequent-emojis) [data-name*="${searchTerm}"]`)),
-      $([]),
-    );
-  return $matchingElements.closest('li').clone();
-};
+  }
 
-AwardsHandler.prototype.destroy = function destroy() {
-  this.eventListeners.forEach((entry) => {
-    entry.element.off.call(entry.element, ...entry.args);
-  });
-  $('.emoji-menu').remove();
-};
+  findMatchingEmojiElements(term) {
+    const safeTerm = term.toLowerCase();
+
+    const namesMatchingAlias = [];
+    Object.keys(emojiAliases).forEach((alias) => {
+      if (alias.indexOf(safeTerm) >= 0) {
+        namesMatchingAlias.push(emojiAliases[alias]);
+      }
+    });
+    const $matchingElements = namesMatchingAlias.concat(safeTerm)
+      .reduce(
+        ($result, searchTerm) =>
+          $result.add($(`.emoji-menu-list:not(.frequent-emojis) [data-name*="${searchTerm}"]`)),
+        $([]),
+      );
+    return $matchingElements.closest('li').clone();
+  }
 
-export default AwardsHandler;
+  destroy() {
+    this.eventListeners.forEach((entry) => {
+      entry.element.off.call(entry.element, ...entry.args);
+    });
+    $('.emoji-menu').remove();
+  }
+}
-- 
cgit v1.2.1


From b21995c633e9841b40a38388eb316f22d8760cd4 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Mon, 19 Jun 2017 03:58:23 +0000
Subject: clarify NFS option details

---
 doc/administration/high_availability/nfs.md | 46 ++++++++++++++++-------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index d8e76d6ab94..bd6b7327aed 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -1,12 +1,35 @@
 # NFS
 
-## Required NFS Server features
+You can view information and options set for each of the mounted NFS file
+systems by running `sudo nfsstat -m`.
+
+## NFS Server features
+
+### Required features
 
 **File locking**: GitLab **requires** advisory file locking, which is only
 supported natively in NFS version 4. NFSv3 also supports locking as long as
 Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not
 specifically test NFSv3.
 
+### Recommended options
+
+When you define your NFS exports, we recommend you also add the following
+options:
+
+- `no_root_squash` - NFS normally changes the `root` user to `nobody`. This is
+  a good security measure when NFS shares will be accessed by many different
+  users. However, in this case only GitLab will use the NFS share so it
+  is safe. GitLab recommends the `no_root_squash` setting because we need to
+  manage file permissions automatically. Without the setting you may receive
+  errors when the Omnibus package tries to alter permissions. Note that GitLab
+  and other bundled components do **not** run as `root` but as non-privileged
+  users. The recommendation for `no_root_squash` is to allow the Omnibus package
+  to set ownership and permissions on files, as needed.
+- `sync` - Force synchronous behavior. Default is asynchronous and under certain
+  circumstances it could lead to data loss if a failure occurs before data has
+  synced.
+
 ## AWS Elastic File System
 
 GitLab does not recommend using AWS Elastic File System (EFS).
@@ -26,27 +49,10 @@ GitLab does not recommend using EFS with GitLab.
 For more details on another person's experience with EFS, see
 [Amazon's Elastic File System: Burst Credits](https://www.rawkode.io/2017/04/amazons-elastic-file-system-burst-credits/)
 
-### Recommended options
-
-When you define your NFS exports, we recommend you also add the following
-options:
-
-- `no_root_squash` - NFS normally changes the `root` user to `nobody`. This is
-  a good security measure when NFS shares will be accessed by many different
-  users. However, in this case only GitLab will use the NFS share so it
-  is safe. GitLab recommends the `no_root_squash` setting because we need to
-  manage file permissions automatically. Without the setting you may receive
-  errors when the Omnibus package tries to alter permissions. Note that GitLab
-  and other bundled components do **not** run as `root` but as non-privileged
-  users. The recommendation for `no_root_squash` is to allow the Omnibus package
-  to set ownership and permissions on files, as needed.
-- `sync` - Force synchronous behavior. Default is asynchronous and under certain
-  circumstances it could lead to data loss if a failure occurs before data has
-  synced.
-
 ## NFS Client mount options
 
-Below is an example of an NFS mount point we use on GitLab.com:
+Below is an example of an NFS mount point defined in `/etc/fstab` we use on
+GitLab.com:
 
 ```
 10.1.1.1:/var/opt/gitlab/git-data /var/opt/gitlab/git-data nfs4 defaults,soft,rsize=1048576,wsize=1048576,noatime,nobootwait,lookupcache=positive 0 2
-- 
cgit v1.2.1


From 57ff963129a37b27f3944f0ec2d0212da9b23e84 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 20 Jun 2017 01:03:55 +0200
Subject: Remove unnecessary prometheus_service method, that is now handled by
 new automagic within Project model

---
 app/models/project.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index f6338b92b9f..4c394646787 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -798,10 +798,6 @@ class Project < ActiveRecord::Base
     @monitoring_service ||= monitoring_services.reorder(nil).find_by(active: true)
   end
 
-  def prometheus_service
-    @prometheus_service ||= monitoring_services.find_by(active: true, type: PrometheusService.name)
-  end
-
   def jira_tracker?
     issues_tracker.to_param == 'jira'
   end
-- 
cgit v1.2.1


From c1cc700584559034b5334ba8f965324401d5ccec Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Jun 2017 12:06:35 +0100
Subject: Added limited width container to project settings

---
 app/assets/stylesheets/pages/members.scss          |  4 --
 app/views/projects/edit.html.haml                  | 66 +++++++++++-----------
 app/views/projects/hooks/_index.html.haml          |  4 +-
 .../projects/pipelines_settings/_badge.html.haml   |  4 +-
 .../projects/pipelines_settings/_show.html.haml    |  4 +-
 .../projects/project_members/_index.html.haml      |  4 +-
 app/views/projects/services/_index.html.haml       |  4 +-
 app/views/projects/settings/ci_cd/show.html.haml   |  1 +
 .../projects/settings/integrations/show.html.haml  |  1 +
 app/views/projects/settings/members/show.html.haml |  2 +
 app/views/projects/triggers/_index.html.haml       |  4 +-
 app/views/projects/variables/_index.html.haml      |  4 +-
 12 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 4be0e133b69..f21005895e4 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -136,10 +136,6 @@
       width: 250px;
     }
 
-    @media (min-width: $screen-md-min) {
-      width: 350px;
-    }
-
     &.input-short {
       @media (min-width: $screen-md-min) {
         width: 170px;
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 296e37e20e6..78057facde7 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,10 +1,12 @@
+- @content_class = "limit-container-width" unless fluid_layout
+
 = render "projects/settings/head"
 .project-edit-container
   .row.prepend-top-default
-    .col-lg-3.profile-settings-sidebar
+    .col-lg-4.profile-settings-sidebar
       %h4.prepend-top-0
         Project settings
-    .col-lg-9
+    .col-lg-8
       .project-edit-errors
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
         %fieldset
@@ -39,66 +41,66 @@
             Sharing &amp; Permissions
           .form_group.prepend-top-20.sharing-and-permissions
             .row.js-visibility-select
-              .col-md-9
+              .col-md-8
                 .label-light
                   = label_tag :project_visibility, 'Project Visibility', class: 'label-light', for: :project_visibility_level
                   = link_to icon('question-circle'), help_page_path("public_access/public_access")
                 %span.help-block
-              .col-md-3.visibility-select-container
+              .col-md-4.visibility-select-container
                 = render('projects/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
             = f.fields_for :project_feature do |feature_fields|
               %fieldset.features
                 .row
-                  .col-md-9.project-feature
+                  .col-md-8.project-feature
                     = feature_fields.label :repository_access_level, "Repository", class: 'label-light'
                     %span.help-block View and edit files in this project
-                  .col-md-3.js-repo-access-level
+                  .col-md-4.js-repo-access-level
                     = project_feature_access_select(:repository_access_level)
 
                 .row
-                  .col-md-9.project-feature.nested
+                  .col-md-8.project-feature.nested
                     = feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
                     %span.help-block Submit changes to be merged upstream
-                  .col-md-3
+                  .col-md-4
                     = project_feature_access_select(:merge_requests_access_level)
 
                 .row
-                  .col-md-9.project-feature.nested
+                  .col-md-8.project-feature.nested
                     = feature_fields.label :builds_access_level, "Pipelines", class: 'label-light'
                     %span.help-block Build, test, and deploy your changes
-                  .col-md-3
+                  .col-md-4
                     = project_feature_access_select(:builds_access_level)
 
                 .row
-                  .col-md-9.project-feature
+                  .col-md-8.project-feature
                     = feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
                     %span.help-block Share code pastes with others out of Git repository
-                  .col-md-3
+                  .col-md-4
                     = project_feature_access_select(:snippets_access_level)
 
                 .row
-                  .col-md-9.project-feature
+                  .col-md-8.project-feature
                     = feature_fields.label :issues_access_level, "Issues", class: 'label-light'
                     %span.help-block Lightweight issue tracking system for this project
-                  .col-md-3
+                  .col-md-4
                     = project_feature_access_select(:issues_access_level)
 
                 .row
-                  .col-md-9.project-feature
+                  .col-md-8.project-feature
                     = feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
                     %span.help-block Pages for project documentation
-                  .col-md-3
+                  .col-md-4
                     = project_feature_access_select(:wiki_access_level)
           .form-group
             = render 'shared/allow_request_access', form: f
           - if Gitlab.config.lfs.enabled && current_user.admin?
             .row.js-lfs-enabled
-              .col-md-9
+              .col-md-8
                 = f.label :lfs_enabled, 'LFS', class: 'label-light'
                 %span.help-block
                   Git Large File Storage
                   = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
-              .col-md-3
+              .col-md-4
                 .select-wrapper
                   = f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control project-repo-select select-control', data: { field: 'lfs_enabled' }
                   = icon('chevron-down')
@@ -138,19 +140,19 @@
   .row.prepend-top-default
   %hr
   .row.prepend-top-default
-    .col-lg-3
+    .col-lg-4
       %h4.prepend-top-0
         Housekeeping
       %p.append-bottom-0
         %p
           Runs a number of housekeeping tasks within the current repository,
           such as compressing file revisions and removing unreachable objects.
-    .col-lg-9
+    .col-lg-8
       = link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
           method: :post, class: "btn btn-default"
   %hr
   .row.prepend-top-default
-    .col-lg-3
+    .col-lg-4
       %h4.prepend-top-0
         Export project
       %p.append-bottom-0
@@ -159,7 +161,7 @@
         %p
           Once the exported file is ready, you will receive a notification email with a download link.
 
-    .col-lg-9
+    .col-lg-8
 
       - if @project.export_project_path
         = link_to 'Download export',  download_export_namespace_project_path(@project.namespace, @project),
@@ -190,7 +192,7 @@
   - if can? current_user, :archive_project, @project
     %hr
     .row.prepend-top-default
-      .col-lg-3
+      .col-lg-4
         %h4.warning-title.prepend-top-0
           - if @project.archived?
             Unarchive project
@@ -201,7 +203,7 @@
             Unarchiving the project will mark its repository as active. The project can be committed to.
           - else
             Archiving the project will mark its repository as read-only. It is hidden from the dashboard and doesn't show up in searches.
-      .col-lg-9
+      .col-lg-8
         - if @project.archived?
           %p
             %strong Once active this project shows up in the search and on the dashboard.
@@ -216,10 +218,10 @@
               method: :post, class: "btn btn-warning"
   %hr
   .row.prepend-top-default
-    .col-lg-3
+    .col-lg-4
       %h4.prepend-top-0.warning-title
         Rename repository
-    .col-lg-9
+    .col-lg-8
       = render 'projects/errors'
       = form_for([@project.namespace.becomes(Namespace), @project]) do |f|
         .form-group.project_name_holder
@@ -244,12 +246,12 @@
   - if can?(current_user, :change_namespace, @project)
     %hr
     .row.prepend-top-default
-      .col-lg-3
+      .col-lg-4
         %h4.prepend-top-0.danger-title
           Transfer project to new group
         %p.append-bottom-0
           Please select the group you want to transfer this project to in the dropdown to the right.
-      .col-lg-9
+      .col-lg-8
         = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f|
           .form-group
             = label_tag :new_namespace_id, nil, class: 'label-light' do
@@ -265,7 +267,7 @@
   - if @project.forked? && can?(current_user, :remove_fork_project, @project)
     %hr
     .row.prepend-top-default.append-bottom-default
-      .col-lg-3
+      .col-lg-4
         %h4.prepend-top-0.danger-title
           Remove fork relationship
         %p.append-bottom-0
@@ -273,7 +275,7 @@
             This will remove the fork relationship to source project
             = succeed "." do
               = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project)
-      .col-lg-9
+      .col-lg-8
         = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_namespace_project_path(@project.namespace, @project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f|
           %p
             %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
@@ -281,12 +283,12 @@
   - if can?(current_user, :remove_project, @project)
     %hr
     .row.prepend-top-default.append-bottom-default
-      .col-lg-3
+      .col-lg-4
         %h4.prepend-top-0.danger-title
           Remove project
         %p.append-bottom-0
           Removing the project will delete its repository and all related resources including issues, merge requests etc.
-      .col-lg-9
+      .col-lg-8
         = form_tag(namespace_project_path(@project.namespace, @project), method: :delete) do
           %p
             %strong Removed projects cannot be restored!
diff --git a/app/views/projects/hooks/_index.html.haml b/app/views/projects/hooks/_index.html.haml
index 676b7c345bc..776681ea09a 100644
--- a/app/views/projects/hooks/_index.html.haml
+++ b/app/views/projects/hooks/_index.html.haml
@@ -1,12 +1,12 @@
 .row.prepend-top-default
-  .col-lg-3
+  .col-lg-4
     %h4.prepend-top-0
       = page_title
     %p
       #{link_to 'Webhooks', help_page_path('user/project/integrations/webhooks')} can be
       used for binding events when something is happening within the project.
 
-  .col-lg-9.append-bottom-default
+  .col-lg-8.append-bottom-default
     = form_for @hook, as: :hook, url: polymorphic_path([@project.namespace.becomes(Namespace), @project, :hooks]) do |f|
       = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
       = f.submit 'Add webhook', class: 'btn btn-create'
diff --git a/app/views/projects/pipelines_settings/_badge.html.haml b/app/views/projects/pipelines_settings/_badge.html.haml
index 43bbd735059..3de518c8b9a 100644
--- a/app/views/projects/pipelines_settings/_badge.html.haml
+++ b/app/views/projects/pipelines_settings/_badge.html.haml
@@ -1,8 +1,8 @@
 %div{ class: badge.title.gsub(' ', '-') }
-  .col-lg-3.profile-settings-sidebar
+  .col-lg-4.profile-settings-sidebar
     %h4.prepend-top-0
       = badge.title.capitalize
-  .col-lg-9
+  .col-lg-8
     .prepend-top-10
       .panel.panel-default
         .panel-heading
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml
index 3b17daeb6da..580129ca809 100644
--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -1,8 +1,8 @@
 .row.prepend-top-default
-  .col-lg-3.profile-settings-sidebar
+  .col-lg-4.profile-settings-sidebar
     %h4.prepend-top-0
       Pipelines
-  .col-lg-9
+  .col-lg-8
     = form_for @project, url: namespace_project_pipelines_settings_path(@project.namespace.becomes(Namespace), @project) do |f|
       %fieldset.builds-feature
         - unless @repository.gitlab_ci_yml
diff --git a/app/views/projects/project_members/_index.html.haml b/app/views/projects/project_members/_index.html.haml
index cfae371e169..fa99610c0be 100644
--- a/app/views/projects/project_members/_index.html.haml
+++ b/app/views/projects/project_members/_index.html.haml
@@ -1,5 +1,5 @@
 .row.prepend-top-default
-  .col-lg-3.settings-sidebar
+  .col-lg-4.settings-sidebar
     %h4.prepend-top-0
       Project members
     - if can?(current_user, :admin_project_member, @project)
@@ -13,7 +13,7 @@
         %i Masters
         or
         %i Owners
-  .col-lg-9
+  .col-lg-8
     .light
       - if can?(current_user, :admin_project_member, @project)
         %ul.nav-links.project-member-tabs{ role: 'tablist' }
diff --git a/app/views/projects/services/_index.html.haml b/app/views/projects/services/_index.html.haml
index 86d5a0ec7b8..997b702da33 100644
--- a/app/views/projects/services/_index.html.haml
+++ b/app/views/projects/services/_index.html.haml
@@ -1,9 +1,9 @@
 .row.prepend-top-default.append-bottom-default
-  .col-lg-3
+  .col-lg-4
     %h4.prepend-top-0
       Project services
     %p Project services allow you to integrate GitLab with other applications
-  .col-lg-9
+  .col-lg-8
     %table.table
       %colgroup
         %col
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index e8d2e91bd76..00ccc3ec41e 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -1,3 +1,4 @@
+- @content_class = "limit-container-width" unless fluid_layout
 - page_title "Pipelines"
 = render "projects/settings/head"
 
diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml
index f69992566b5..1d1d0849289 100644
--- a/app/views/projects/settings/integrations/show.html.haml
+++ b/app/views/projects/settings/integrations/show.html.haml
@@ -1,3 +1,4 @@
+- @content_class = "limit-container-width" unless fluid_layout
 - page_title 'Integrations'
 = render "projects/settings/head"
 = render 'projects/hooks/index'
diff --git a/app/views/projects/settings/members/show.html.haml b/app/views/projects/settings/members/show.html.haml
index 343807b87cd..1e7695ac397 100644
--- a/app/views/projects/settings/members/show.html.haml
+++ b/app/views/projects/settings/members/show.html.haml
@@ -1,3 +1,5 @@
+- @content_class = "limit-container-width" unless fluid_layout
+
 - page_title "Members"
 = render "projects/settings/head"
 
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml
index cc74e50a5e3..e9a2f803edd 100644
--- a/app/views/projects/triggers/_index.html.haml
+++ b/app/views/projects/triggers/_index.html.haml
@@ -1,7 +1,7 @@
 .row.prepend-top-default.append-bottom-default.triggers-container
-  .col-lg-3
+  .col-lg-4
     = render "projects/triggers/content"
-  .col-lg-9
+  .col-lg-8
     .panel.panel-default
       .panel-heading
         %h4.panel-title
diff --git a/app/views/projects/variables/_index.html.haml b/app/views/projects/variables/_index.html.haml
index 1b852a9c5b3..5e6786f6698 100644
--- a/app/views/projects/variables/_index.html.haml
+++ b/app/views/projects/variables/_index.html.haml
@@ -1,7 +1,7 @@
 .row.prepend-top-default.append-bottom-default
-  .col-lg-3
+  .col-lg-4
     = render "projects/variables/content"
-  .col-lg-9
+  .col-lg-8
     %h5.prepend-top-0
       Add a variable
     = render "projects/variables/form", btn_text: "Add new variable"
-- 
cgit v1.2.1


From 64e09a1b35cc1897df7e46e73989c6e7013f6196 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 May 2017 12:47:21 +0200
Subject: Fix pipeline status when allowed to fail jobs present

---
 app/models/concerns/has_status.rb                 | 4 +++-
 spec/services/ci/process_pipeline_service_spec.rb | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 3c9c6584e02..692bd1f9317 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -37,7 +37,9 @@ module HasStatus
     end
 
     def status
-      all.pluck(status_sql).first
+      all.pluck(status_sql).first.tap do |status|
+        return 'success' if status == 'skipped' && all.failed_but_allowed.any?
+      end
     end
 
     def started_at
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index 1557cb3c938..efcaccc254e 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -62,6 +62,10 @@ describe Ci::ProcessPipelineService, '#execute', :services do
       fail_running_or_pending
 
       expect(builds_statuses).to eq %w(failed pending)
+
+      fail_running_or_pending
+
+      expect(pipeline.reload).to be_success
     end
   end
 
-- 
cgit v1.2.1


From 21f3e9ce2617b8869583bdae60cc619bcd0a29bd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 May 2017 14:26:08 +0200
Subject: Move custom compound status method to commit status

---
 app/models/commit_status.rb       |  6 ++++++
 app/models/concerns/has_status.rb |  4 +---
 spec/models/commit_status_spec.rb | 24 ++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 07cec63b939..500d05fd840 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -103,6 +103,12 @@ class CommitStatus < ActiveRecord::Base
     end
   end
 
+  def self.status
+    super.tap do |status|
+      return 'success' if status == 'skipped' && all.failed_but_allowed.any?
+    end
+  end
+
   def locking_enabled?
     status_changed?
   end
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 692bd1f9317..3c9c6584e02 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -37,9 +37,7 @@ module HasStatus
     end
 
     def status
-      all.pluck(status_sql).first.tap do |status|
-        return 'success' if status == 'skipped' && all.failed_but_allowed.any?
-      end
+      all.pluck(status_sql).first
     end
 
     def started_at
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 9262ce08987..2ee9620228c 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -284,6 +284,30 @@ describe CommitStatus, :models do
     end
   end
 
+  describe '.status' do
+    context 'when there are multiple statuses present' do
+      before do
+        create_status(status: 'running')
+        create_status(status: 'success')
+        create_status(allow_failure: true, status: 'failed')
+      end
+
+      it 'returns a correct compound status' do
+        expect(described_class.all.status).to eq 'running'
+      end
+    end
+
+    context 'when there are only allowed to fail commit statuses present' do
+      before do
+        create_status(allow_failure: true, status: 'failed')
+      end
+
+      it 'returns status that indicates success' do
+        expect(described_class.all.status).to eq 'success'
+      end
+    end
+  end
+
   describe '#before_sha' do
     subject { commit_status.before_sha }
 
-- 
cgit v1.2.1


From 26092b5158d61f353b66a38d5034f3cb6e567ffa Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 May 2017 14:28:01 +0200
Subject: Add changelog entry for pipeline status fix

---
 .../fix-gb-fix-skipped-pipeline-with-allowed-to-fail-jobs.yml         | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/fix-gb-fix-skipped-pipeline-with-allowed-to-fail-jobs.yml

diff --git a/changelogs/unreleased/fix-gb-fix-skipped-pipeline-with-allowed-to-fail-jobs.yml b/changelogs/unreleased/fix-gb-fix-skipped-pipeline-with-allowed-to-fail-jobs.yml
new file mode 100644
index 00000000000..f59c6ecd90c
--- /dev/null
+++ b/changelogs/unreleased/fix-gb-fix-skipped-pipeline-with-allowed-to-fail-jobs.yml
@@ -0,0 +1,4 @@
+---
+title: Fix CI/CD status in case there are only allowed to failed jobs in the pipeline
+merge_request: 11166
+author:
-- 
cgit v1.2.1


From e538963d80872e3844ba345967cfa0bf3821c82a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 May 2017 14:32:14 +0200
Subject: Add test for using overridden status method with scopes

---
 spec/models/commit_status_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 2ee9620228c..dc348f6cd33 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -306,6 +306,17 @@ describe CommitStatus, :models do
         expect(described_class.all.status).to eq 'success'
       end
     end
+
+    context 'when using a scope to select latest statuses' do
+      before do
+        create_status(name: 'test', status: 'failed')
+        create_status(allow_failure: true, name: 'test', status: 'failed')
+      end
+
+      it 'returns status according to the scope' do
+        expect(described_class.latest.status).to eq 'success'
+      end
+    end
   end
 
   describe '#before_sha' do
-- 
cgit v1.2.1


From 51ce9a6caa15b5619b486b8ea81d834ec1206561 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 May 2017 15:14:41 +0200
Subject: Fix specs for a concern that implements CI/CD statuses

---
 spec/models/concerns/has_status_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/concerns/has_status_spec.rb b/spec/models/concerns/has_status_spec.rb
index 67dae7cf4c0..bcee293d876 100644
--- a/spec/models/concerns/has_status_spec.rb
+++ b/spec/models/concerns/has_status_spec.rb
@@ -48,7 +48,7 @@ describe HasStatus do
           [create(type, status: :failed, allow_failure: true)]
         end
 
-        it { is_expected.to eq 'skipped' }
+        it { is_expected.to eq 'success' }
       end
 
       context 'success and canceled' do
-- 
cgit v1.2.1


From caf6b9918e3f7a79c9ffcffd1880f29422d50eb5 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 15 Jun 2017 14:43:47 +0200
Subject: Check warnings when building compound status SQL query

---
 app/models/commit_status.rb       |  6 ------
 app/models/concerns/has_status.rb | 23 +++++++++++++----------
 spec/models/commit_status_spec.rb |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 500d05fd840..07cec63b939 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -103,12 +103,6 @@ class CommitStatus < ActiveRecord::Base
     end
   end
 
-  def self.status
-    super.tap do |status|
-      return 'success' if status == 'skipped' && all.failed_but_allowed.any?
-    end
-  end
-
   def locking_enabled?
     status_changed?
   end
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 3c9c6584e02..32af5566135 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -11,18 +11,21 @@ module HasStatus
 
   class_methods do
     def status_sql
-      scope = respond_to?(:exclude_ignored) ? exclude_ignored : all
-
-      builds = scope.select('count(*)').to_sql
-      created = scope.created.select('count(*)').to_sql
-      success = scope.success.select('count(*)').to_sql
-      manual = scope.manual.select('count(*)').to_sql
-      pending = scope.pending.select('count(*)').to_sql
-      running = scope.running.select('count(*)').to_sql
-      skipped = scope.skipped.select('count(*)').to_sql
-      canceled = scope.canceled.select('count(*)').to_sql
+      scope_relevant = respond_to?(:exclude_ignored) ? exclude_ignored : all
+      scope_warnings = respond_to?(:failed_but_allowed) ? failed_but_allowed : none
+
+      builds = scope_relevant.select('count(*)').to_sql
+      created = scope_relevant.created.select('count(*)').to_sql
+      success = scope_relevant.success.select('count(*)').to_sql
+      manual = scope_relevant.manual.select('count(*)').to_sql
+      pending = scope_relevant.pending.select('count(*)').to_sql
+      running = scope_relevant.running.select('count(*)').to_sql
+      skipped = scope_relevant.skipped.select('count(*)').to_sql
+      canceled = scope_relevant.canceled.select('count(*)').to_sql
+      warnings = scope_warnings.select('count(*) > 0').to_sql.presence || 'false'
 
       "(CASE
+        WHEN (#{builds})=(#{skipped}) AND (#{warnings}) THEN 'success'
         WHEN (#{builds})=(#{skipped}) THEN 'skipped'
         WHEN (#{builds})=(#{success}) THEN 'success'
         WHEN (#{builds})=(#{created}) THEN 'created'
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index dc348f6cd33..1e074c7ad26 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -309,7 +309,7 @@ describe CommitStatus, :models do
 
     context 'when using a scope to select latest statuses' do
       before do
-        create_status(name: 'test', status: 'failed')
+        create_status(name: 'test', retried: true, status: 'failed')
         create_status(allow_failure: true, name: 'test', status: 'failed')
       end
 
-- 
cgit v1.2.1


From 0337b20dbecfbe847387b69508868317269eb8ef Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 20 Jun 2017 14:33:39 +0100
Subject: Fixed commit list system not gradient

Closes #33896
---
 app/assets/stylesheets/framework/timeline.scss | 4 ++++
 app/assets/stylesheets/pages/notes.scss        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 10881987038..3d68a50f91f 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -44,6 +44,10 @@
   &:target,
   &.target {
     background: $line-target-blue;
+
+    &.system-note .note-body .note-text.system-note-commit-list::after {
+      background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%);
+    }
   }
 
   .avatar {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8b7df4dd72b..b6988c01b4a 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -250,7 +250,7 @@ ul.notes {
           &::after {
             content: '';
             width: 100%;
-            height: 67px;
+            height: 70px;
             position: absolute;
             left: 0;
             bottom: 0;
-- 
cgit v1.2.1


From 15b7b9ec4117bf19168ea0f923ea11e926edcc5c Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 20 Jun 2017 15:53:05 +0200
Subject: Add  rescue_from(ActionController::UnknownFormat) in Application
 Controller

---
 app/controllers/application_controller.rb          |  4 +++
 app/controllers/projects/deployments_controller.rb | 16 +++++++-----
 .../projects/environments_controller.rb            |  8 ++++--
 app/controllers/projects/prometheus_controller.rb  |  4 ---
 spec/controllers/application_controller_spec.rb    | 30 ++++++++++++++++++++++
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 91694ebcd1d..824ce845706 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -40,6 +40,10 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
+  rescue_from(ActionController::UnknownFormat) do
+    render_404
+  end
+
   rescue_from Gitlab::Access::AccessDeniedError do |exception|
     render_403
   end
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index acf5573935a..47c312ffddf 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -25,12 +25,16 @@ class Projects::DeploymentsController < Projects::ApplicationController
   def additional_metrics
     return render_404 unless deployment.has_additional_metrics?
 
-    metrics = deployment.additional_metrics
-
-    if metrics.any?
-      render json: metrics
-    else
-      head :no_content
+    respond_to do |format|
+      format.json do
+        metrics = deployment.additional_metrics
+
+        if metrics.any?
+          render json: metrics
+        else
+          head :no_content
+        end
+      end
     end
   end
 
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 557049c0b22..3869d4b2d56 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -132,9 +132,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 
   def additional_metrics
-    additional_metrics = environment.additional_metrics || {}
+    respond_to do |format|
+      format.json do
+        additional_metrics = environment.additional_metrics || {}
 
-    render json: additional_metrics, status: additional_metrics.any? ? :ok : :no_content
+        render json: additional_metrics, status: additional_metrics.any? ? :ok : :no_content
+      end
+    end
   end
 
   private
diff --git a/app/controllers/projects/prometheus_controller.rb b/app/controllers/projects/prometheus_controller.rb
index 7b828981dd8..507468d7102 100644
--- a/app/controllers/projects/prometheus_controller.rb
+++ b/app/controllers/projects/prometheus_controller.rb
@@ -18,10 +18,6 @@ class Projects::PrometheusController < Projects::ApplicationController
 
   private
 
-  rescue_from(ActionController::UnknownFormat) do
-    render_404
-  end
-
   def require_prometheus_metrics!
     render_404 unless project.prometheus_service.present?
   end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 3f99e2ff596..a2720c9b81e 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -99,6 +99,36 @@ describe ApplicationController do
     end
   end
 
+  describe 'response format' do
+    controller(described_class) do
+      def index
+        respond_to do |format|
+          format.json do
+            head :ok
+          end
+        end
+      end
+    end
+
+    context 'when format is handled' do
+      let(:requested_format) { :json }
+
+      it 'returns 200 response' do
+        get :index, private_token: user.private_token, format: requested_format
+
+        expect(response).to have_http_status 200
+      end
+    end
+
+    context 'when format is not handled' do
+      it 'returns 404 response' do
+        get :index, private_token: user.private_token
+
+        expect(response).to have_http_status 404
+      end
+    end
+  end
+
   describe '#authenticate_user_from_rss_token' do
     describe "authenticating a user from an RSS token" do
       controller(described_class) do
-- 
cgit v1.2.1


From 19812e3eca7be2ffebf63b5ccb97cd7c60781c78 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 20 Jun 2017 15:53:55 +0200
Subject: Make queries not die when underlying data cannot be found

---
 .../queries/additional_metrics_deployment_query.rb | 17 +++++------
 .../additional_metrics_environment_query.rb        | 17 +++++------
 lib/gitlab/prometheus/queries/deployment_query.rb  | 33 +++++++++++-----------
 lib/gitlab/prometheus/queries/environment_query.rb | 25 ++++++++--------
 .../projects/deployments_controller_spec.rb        |  4 +--
 5 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
index cfe6bed188b..67c69d9ccf3 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -5,15 +5,16 @@ module Gitlab
         include QueryAdditionalMetrics
 
         def query(deployment_id)
-          deployment = Deployment.find_by(id: deployment_id)
-          query_context = {
-            environment_slug: deployment.environment.slug,
-            environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
-            timeframe_start: (deployment.created_at - 30.minutes).to_f,
-            timeframe_end: (deployment.created_at + 30.minutes).to_f
-          }
+          Deployment.find_by(id: deployment_id).try do |deployment|
+            query_context = {
+              environment_slug: deployment.environment.slug,
+              environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
+              timeframe_start: (deployment.created_at - 30.minutes).to_f,
+              timeframe_end: (deployment.created_at + 30.minutes).to_f
+            }
 
-          query_metrics(query_context)
+            query_metrics(query_context)
+          end
         end
       end
     end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
index e261988b234..b5a679ddd79 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb
@@ -5,15 +5,16 @@ module Gitlab
         include QueryAdditionalMetrics
 
         def query(environment_id)
-          environment = Environment.find_by(id: environment_id)
-          query_context = {
-            environment_slug: environment.slug,
-            environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
-            timeframe_start: 8.hours.ago.to_f,
-            timeframe_end: Time.now.to_f
-          }
+          Environment.find_by(id: environment_id).try do |environment|
+            query_context = {
+              environment_slug: environment.slug,
+              environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
+              timeframe_start: 8.hours.ago.to_f,
+              timeframe_end: Time.now.to_f
+            }
 
-          query_metrics(query_context)
+            query_metrics(query_context)
+          end
         end
       end
     end
diff --git a/lib/gitlab/prometheus/queries/deployment_query.rb b/lib/gitlab/prometheus/queries/deployment_query.rb
index be3527f0f72..170f483540e 100644
--- a/lib/gitlab/prometheus/queries/deployment_query.rb
+++ b/lib/gitlab/prometheus/queries/deployment_query.rb
@@ -3,26 +3,27 @@ module Gitlab
     module Queries
       class DeploymentQuery < BaseQuery
         def query(deployment_id)
-          deployment = Deployment.find_by(id: deployment_id)
-          environment_slug = deployment.environment.slug
+          Deployment.find_by(id: deployment_id).try do |deployment|
+            environment_slug = deployment.environment.slug
 
-          memory_query = raw_memory_usage_query(environment_slug)
-          memory_avg_query = %{avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}[30m]))}
-          cpu_query = raw_cpu_usage_query(environment_slug)
-          cpu_avg_query = %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[30m])) * 100}
+            memory_query = raw_memory_usage_query(environment_slug)
+            memory_avg_query = %{avg(avg_over_time(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}[30m]))}
+            cpu_query = raw_cpu_usage_query(environment_slug)
+            cpu_avg_query = %{avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[30m])) * 100}
 
-          timeframe_start = (deployment.created_at - 30.minutes).to_f
-          timeframe_end = (deployment.created_at + 30.minutes).to_f
+            timeframe_start = (deployment.created_at - 30.minutes).to_f
+            timeframe_end = (deployment.created_at + 30.minutes).to_f
 
-          {
-            memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
-            memory_before: client_query(memory_avg_query, time: deployment.created_at.to_f),
-            memory_after: client_query(memory_avg_query, time: timeframe_end),
+            {
+              memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
+              memory_before: client_query(memory_avg_query, time: deployment.created_at.to_f),
+              memory_after: client_query(memory_avg_query, time: timeframe_end),
 
-            cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
-            cpu_before: client_query(cpu_avg_query, time: deployment.created_at.to_f),
-            cpu_after: client_query(cpu_avg_query, time: timeframe_end)
-          }
+              cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
+              cpu_before: client_query(cpu_avg_query, time: deployment.created_at.to_f),
+              cpu_after: client_query(cpu_avg_query, time: timeframe_end)
+            }
+          end
         end
       end
     end
diff --git a/lib/gitlab/prometheus/queries/environment_query.rb b/lib/gitlab/prometheus/queries/environment_query.rb
index 9aa9da6d858..66f29d95177 100644
--- a/lib/gitlab/prometheus/queries/environment_query.rb
+++ b/lib/gitlab/prometheus/queries/environment_query.rb
@@ -3,20 +3,21 @@ module Gitlab
     module Queries
       class EnvironmentQuery < BaseQuery
         def query(environment_id)
-          environment = Environment.find_by(id: environment_id)
-          environment_slug = environment.slug
-          timeframe_start = 8.hours.ago.to_f
-          timeframe_end = Time.now.to_f
+          Environment.find_by(id: environment_id).try do |environment|
+            environment_slug = environment.slug
+            timeframe_start = 8.hours.ago.to_f
+            timeframe_end = Time.now.to_f
 
-          memory_query = raw_memory_usage_query(environment_slug)
-          cpu_query = raw_cpu_usage_query(environment_slug)
+            memory_query = raw_memory_usage_query(environment_slug)
+            cpu_query = raw_cpu_usage_query(environment_slug)
 
-          {
-            memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
-            memory_current: client_query(memory_query, time: timeframe_end),
-            cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
-            cpu_current: client_query(cpu_query, time: timeframe_end)
-          }
+            {
+              memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
+              memory_current: client_query(memory_query, time: timeframe_end),
+              cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
+              cpu_current: client_query(cpu_query, time: timeframe_end)
+            }
+          end
         end
       end
     end
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 4a77d4d8289..0dbfcf97f6f 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -141,7 +141,7 @@ describe Projects::DeploymentsController do
         end
 
         it 'returns a empty response 204 response' do
-          get :additional_metrics, deployment_params(id: deployment.id)
+          get :additional_metrics, deployment_params(id: deployment.id, format: :json)
           expect(response).to have_http_status(204)
           expect(response.body).to eq('')
         end
@@ -161,7 +161,7 @@ describe Projects::DeploymentsController do
         end
 
         it 'returns a metrics JSON document' do
-          get :additional_metrics, deployment_params(id: deployment.id)
+          get :additional_metrics, deployment_params(id: deployment.id, format: :json)
 
           expect(response).to be_ok
           expect(json_response['success']).to be(true)
-- 
cgit v1.2.1


From d0ff075d290745c7658d0dfb5ca2fd6dda7d1dc1 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Wed, 21 Jun 2017 09:05:54 +0000
Subject: Update CHANGELOG.md for 9.2.7

[ci skip]
---
 CHANGELOG.md                                                | 4 ++++
 changelogs/unreleased/33260-allow-admins-to-list-admins.yml | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 changelogs/unreleased/33260-allow-admins-to-list-admins.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f43858a00a5..af5f5809c41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 9.2.7 (2017-06-21)
+
+- Reinstate is_admin flag in users api when authenticated user is an admin. !12211 (rickettm)
+
 ## 9.2.6 (2017-06-16)
 
 - Fix the last coverage in trace log should be extracted. !11128 (dosuken123)
diff --git a/changelogs/unreleased/33260-allow-admins-to-list-admins.yml b/changelogs/unreleased/33260-allow-admins-to-list-admins.yml
deleted file mode 100644
index a3b2053e005..00000000000
--- a/changelogs/unreleased/33260-allow-admins-to-list-admins.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Reinstate is_admin flag in users api when authenticated user is an admin
-merge_request: 12211
-author: rickettm
-- 
cgit v1.2.1


From 3833f1dd84dfec844443a5b1d9ba2bd2b911c0bc Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 21 Jun 2017 13:41:10 +0200
Subject: Add Changelog message

---
 changelogs/unreleased/28717-support-additional-prometheus-metrics.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/28717-support-additional-prometheus-metrics.yml

diff --git a/changelogs/unreleased/28717-support-additional-prometheus-metrics.yml b/changelogs/unreleased/28717-support-additional-prometheus-metrics.yml
new file mode 100644
index 00000000000..720a79b8e1c
--- /dev/null
+++ b/changelogs/unreleased/28717-support-additional-prometheus-metrics.yml
@@ -0,0 +1,4 @@
+---
+title: Additional Prometheus metrics support
+merge_request: 11712
+author:
-- 
cgit v1.2.1


From e4d42a62d928d31390ce29fc52891a8973784f2d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 21 Jun 2017 14:31:49 +0200
Subject: Raise if updating columns in batches within a transaction

---
 lib/gitlab/database/migration_helpers.rb           |  6 +++
 spec/lib/gitlab/database/migration_helpers_spec.rb | 56 ++++++++++++++--------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 9181202a091..85a8a44c8d6 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -222,6 +222,12 @@ module Gitlab
       #
       # rubocop: disable Metrics/AbcSize
       def update_column_in_batches(table, column, value)
+        if transaction_open?
+          raise 'update_column_in_batches can not be run inside a transaction, ' \
+            'you can disable transactions by calling disable_ddl_transaction! ' \
+            'in the body of your migration class'
+        end
+
         table = Arel::Table.new(table)
 
         count_arel = table.project(Arel.star.count.as('count'))
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 30aa463faf8..29656667b02 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -262,39 +262,53 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
   end
 
   describe '#update_column_in_batches' do
-    before do
-      create_list(:empty_project, 5)
-    end
+    context 'when running outside of a transaction' do
+      before do
+        expect(model).to receive(:transaction_open?).and_return(false)
 
-    it 'updates all the rows in a table' do
-      model.update_column_in_batches(:projects, :import_error, 'foo')
+        create_list(:empty_project, 5)
+      end
 
-      expect(Project.where(import_error: 'foo').count).to eq(5)
-    end
+      it 'updates all the rows in a table' do
+        model.update_column_in_batches(:projects, :import_error, 'foo')
 
-    it 'updates boolean values correctly' do
-      model.update_column_in_batches(:projects, :archived, true)
+        expect(Project.where(import_error: 'foo').count).to eq(5)
+      end
 
-      expect(Project.where(archived: true).count).to eq(5)
-    end
+      it 'updates boolean values correctly' do
+        model.update_column_in_batches(:projects, :archived, true)
+
+        expect(Project.where(archived: true).count).to eq(5)
+      end
 
-    context 'when a block is supplied' do
-      it 'yields an Arel table and query object to the supplied block' do
-        first_id = Project.first.id
+      context 'when a block is supplied' do
+        it 'yields an Arel table and query object to the supplied block' do
+          first_id = Project.first.id
 
-        model.update_column_in_batches(:projects, :archived, true) do |t, query|
-          query.where(t[:id].eq(first_id))
+          model.update_column_in_batches(:projects, :archived, true) do |t, query|
+            query.where(t[:id].eq(first_id))
+          end
+
+          expect(Project.where(archived: true).count).to eq(1)
         end
+      end
 
-        expect(Project.where(archived: true).count).to eq(1)
+      context 'when the value is Arel.sql (Arel::Nodes::SqlLiteral)' do
+        it 'updates the value as a SQL expression' do
+          model.update_column_in_batches(:projects, :star_count, Arel.sql('1+1'))
+
+          expect(Project.sum(:star_count)).to eq(2 * Project.count)
+        end
       end
     end
 
-    context 'when the value is Arel.sql (Arel::Nodes::SqlLiteral)' do
-      it 'updates the value as a SQL expression' do
-        model.update_column_in_batches(:projects, :star_count, Arel.sql('1+1'))
+    context 'when running inside the transaction' do
+      it 'raises RuntimeError' do
+        expect(model).to receive(:transaction_open?).and_return(true)
 
-        expect(Project.sum(:star_count)).to eq(2 * Project.count)
+        expect do
+          model.update_column_in_batches(:projects, :star_count, Arel.sql('1+1'))
+        end.to raise_error(RuntimeError)
       end
     end
   end
-- 
cgit v1.2.1


From 3fd4a37d588d0b89f402e46ba633366b1a020019 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 21 Jun 2017 14:35:06 +0200
Subject: Disable transactions in migrations that should not use it

---
 db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb            | 2 ++
 .../20160721081015_drop_and_readd_has_external_wiki_in_projects.rb     | 2 ++
 .../20160901141443_set_confidential_issues_events_on_webhooks.rb       | 2 ++
 db/migrate/20160919144305_add_type_to_labels.rb                        | 2 ++
 db/migrate/20161018124658_make_project_owners_masters.rb               | 2 ++
 ...20161227192806_rename_slack_and_mattermost_notification_services.rb | 2 ++
 db/post_migrate/20170309171644_reset_relative_position_for_issue.rb    | 3 +++
 db/post_migrate/20170317162059_update_upload_paths_to_system.rb        | 2 ++
 db/post_migrate/20170406142253_migrate_user_project_view.rb            | 2 ++
 .../20170508170547_add_head_pipeline_for_each_merge_request.rb         | 2 ++
 10 files changed, 21 insertions(+)

diff --git a/db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb b/db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb
index 4d6a61bd614..5336b036bca 100644
--- a/db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb
+++ b/db/migrate/20160615191922_set_missing_stage_on_ci_builds.rb
@@ -2,6 +2,8 @@
 class SetMissingStageOnCiBuilds < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:ci_builds, :stage, :test) do |table, query|
       query.where(table[:stage].eq(nil))
diff --git a/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb b/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb
index b2a2ce41391..abe8e701e23 100644
--- a/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb
+++ b/db/migrate/20160721081015_drop_and_readd_has_external_wiki_in_projects.rb
@@ -5,6 +5,8 @@ class DropAndReaddHasExternalWikiInProjects < ActiveRecord::Migration
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:projects, :has_external_wiki, nil) do |table, query|
       query.where(table[:has_external_wiki].not_eq(nil))
diff --git a/db/migrate/20160901141443_set_confidential_issues_events_on_webhooks.rb b/db/migrate/20160901141443_set_confidential_issues_events_on_webhooks.rb
index febd2c0e65e..f8486e3e1a6 100644
--- a/db/migrate/20160901141443_set_confidential_issues_events_on_webhooks.rb
+++ b/db/migrate/20160901141443_set_confidential_issues_events_on_webhooks.rb
@@ -4,6 +4,8 @@ class SetConfidentialIssuesEventsOnWebhooks < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:web_hooks, :confidential_issues_events, true) do |table, query|
       query.where(table[:issues_events].eq(true))
diff --git a/db/migrate/20160919144305_add_type_to_labels.rb b/db/migrate/20160919144305_add_type_to_labels.rb
index 2d2725ccf59..d08b339cd27 100644
--- a/db/migrate/20160919144305_add_type_to_labels.rb
+++ b/db/migrate/20160919144305_add_type_to_labels.rb
@@ -5,6 +5,8 @@ class AddTypeToLabels < ActiveRecord::Migration
   DOWNTIME = true
   DOWNTIME_REASON = 'Labels will not work as expected until this migration is complete.'
 
+  disable_ddl_transaction!
+
   def change
     add_column :labels, :type, :string
 
diff --git a/db/migrate/20161018124658_make_project_owners_masters.rb b/db/migrate/20161018124658_make_project_owners_masters.rb
index fe11699c196..cb93b449067 100644
--- a/db/migrate/20161018124658_make_project_owners_masters.rb
+++ b/db/migrate/20161018124658_make_project_owners_masters.rb
@@ -4,6 +4,8 @@ class MakeProjectOwnersMasters < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:members, :access_level, 40) do |table, query|
       query.where(table[:access_level].eq(50).and(table[:source_type].eq('Project')))
diff --git a/db/migrate/20161227192806_rename_slack_and_mattermost_notification_services.rb b/db/migrate/20161227192806_rename_slack_and_mattermost_notification_services.rb
index c7cada6dfc5..6b15e5caccf 100644
--- a/db/migrate/20161227192806_rename_slack_and_mattermost_notification_services.rb
+++ b/db/migrate/20161227192806_rename_slack_and_mattermost_notification_services.rb
@@ -4,6 +4,8 @@ class RenameSlackAndMattermostNotificationServices < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:services, :type, 'SlackService') do |table, query|
       query.where(table[:type].eq('SlackNotificationService'))
diff --git a/db/post_migrate/20170309171644_reset_relative_position_for_issue.rb b/db/post_migrate/20170309171644_reset_relative_position_for_issue.rb
index b1c9eed1148..01fff680183 100644
--- a/db/post_migrate/20170309171644_reset_relative_position_for_issue.rb
+++ b/db/post_migrate/20170309171644_reset_relative_position_for_issue.rb
@@ -4,6 +4,8 @@ class ResetRelativePositionForIssue < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:issues, :relative_position, nil) do |table, query|
       query.where(table[:relative_position].not_eq(nil))
@@ -11,5 +13,6 @@ class ResetRelativePositionForIssue < ActiveRecord::Migration
   end
 
   def down
+    # noop
   end
 end
diff --git a/db/post_migrate/20170317162059_update_upload_paths_to_system.rb b/db/post_migrate/20170317162059_update_upload_paths_to_system.rb
index 9a77b0bbdfb..ca2912f8dce 100644
--- a/db/post_migrate/20170317162059_update_upload_paths_to_system.rb
+++ b/db/post_migrate/20170317162059_update_upload_paths_to_system.rb
@@ -7,6 +7,8 @@ class UpdateUploadPathsToSystem < ActiveRecord::Migration
   DOWNTIME = false
   AFFECTED_MODELS = %w(User Project Note Namespace Appearance)
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:uploads, :path, replace_sql(arel_table[:path], base_directory, new_upload_dir)) do |_table, query|
       query.where(uploads_to_switch_to_new_path)
diff --git a/db/post_migrate/20170406142253_migrate_user_project_view.rb b/db/post_migrate/20170406142253_migrate_user_project_view.rb
index 22f0f2ac200..c4e910b3b44 100644
--- a/db/post_migrate/20170406142253_migrate_user_project_view.rb
+++ b/db/post_migrate/20170406142253_migrate_user_project_view.rb
@@ -7,6 +7,8 @@ class MigrateUserProjectView < ActiveRecord::Migration
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     update_column_in_batches(:users, :project_view, 2) do |table, query|
       query.where(table[:project_view].eq(0))
diff --git a/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb b/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
index bc3850c0c23..f742936f122 100644
--- a/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
+++ b/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
@@ -3,6 +3,8 @@ class AddHeadPipelineForEachMergeRequest < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     disable_statement_timeout
 
-- 
cgit v1.2.1


From c5f25f6550a3563507e39b1e5eea5df84a8bba2f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 11:31:39 +0100
Subject: Top navigation redesign

Start of the new navigation by redesigning just the top navigation menu.
This is only shown when a cookie is set.

Part of #32794
---
 app/assets/javascripts/main.js                 |   3 +-
 app/assets/stylesheets/framework/header.scss   |   9 +-
 app/assets/stylesheets/new_nav.scss            | 123 +++++++++++++++++++++++++
 app/helpers/application_helper.rb              |   4 +
 app/views/layouts/_head.html.haml              |   3 +
 app/views/layouts/application.html.haml        |   5 +-
 app/views/layouts/header/_new.html.haml        |  93 +++++++++++++++++++
 app/views/layouts/nav/_new_dashboard.html.haml |  30 ++++++
 config/application.rb                          |   1 +
 9 files changed, 266 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/stylesheets/new_nav.scss
 create mode 100644 app/views/layouts/header/_new.html.haml
 create mode 100644 app/views/layouts/nav/_new_dashboard.html.haml

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ed7629948ca..ee48fcc2139 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -299,9 +299,10 @@ $(function () {
   // Commit show suppressed diff
   });
   $('.navbar-toggle').on('click', function () {
-    $('.header-content .title').toggle();
+    $('.header-content .title, .header-content .navbar-sub-nav').toggle();
     $('.header-content .header-logo').toggle();
     $('.header-content .navbar-collapse').toggle();
+    $('.js-navbar-toggle-left, .js-navbar-toggle-right').toggle();
     return $('.navbar-toggle').toggleClass('active');
   });
   // Show/hide comments on diff
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index d8645afb7da..e7d58449cec 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -34,6 +34,8 @@ header {
     top: 0;
     left: 0;
     right: 0;
+    color: $gl-text-color-secondary;
+    border-radius: 0;
 
     @media (max-width: $screen-xs-min) {
       padding: 0 16px;
@@ -59,7 +61,7 @@ header {
       padding: 0;
 
       .nav > li > a {
-        color: $gl-text-color-secondary;
+        color: currentColor;
         font-size: 18px;
         padding: 0;
         margin: (($header-height - 28) / 2) 3px;
@@ -84,7 +86,7 @@ header {
         &:hover,
         &:focus,
         &:active {
-          background-color: $gray-light;
+          background-color: transparent;
           color: $gl-text-color;
 
           svg {
@@ -102,7 +104,7 @@ header {
           height: 17px;
           // hack to get SVG to line up with FA icons
           width: 23px;
-          fill: $gl-text-color-secondary;
+          fill: currentColor;
         }
       }
 
@@ -346,6 +348,7 @@ header {
     width: auto;
     min-width: 140px;
     margin-top: -5px;
+    color: $gl-text-color;
 
     .current-user {
       padding: 5px 18px;
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
new file mode 100644
index 00000000000..f99604a7913
--- /dev/null
+++ b/app/assets/stylesheets/new_nav.scss
@@ -0,0 +1,123 @@
+@import "framework/variables";
+@import 'framework/tw_bootstrap_variables';
+@import "bootstrap/variables";
+
+header.navbar-gitlab-new {
+  color: #f5f5f5;
+  background-color: #2d2d2d;
+
+  .header-content {
+    padding-left: 0;
+
+    .title-container {
+      padding-top: 0;
+      overflow: visible;
+    }
+
+    .title {
+      padding-top: 14px;
+      padding-right: 10px;
+      color: currentColor;
+
+      @media (min-width: $screen-sm-min) {
+        padding-right: 20px;
+      }
+    }
+
+    .dropdown.open {
+      > a {
+        border-bottom-color: #4180ec;
+      }
+    }
+
+    .dropdown-menu {
+      margin-top: 4px;
+      min-width: 130px;
+    }
+  }
+
+  .navbar-collapse {
+    color: #d5d5d5;
+  }
+
+  .container-fluid {
+    .navbar-toggle {
+      border-left: 1px solid currentColor;
+
+      &:hover,
+      &:focus,
+      &.active {
+        color: currentColor;
+        background-color: transparent;
+      }
+    }
+
+    .navbar-toggle-left {
+      right: 0;
+      border-left: 0;
+      border-right: 1px solid currentColor;
+    }
+
+    .navbar-nav {
+      @media (max-width: $screen-xs-max) {
+        padding-right: 10px;
+      }
+    }
+
+    .nav > li > a:hover,
+    .nav > li > a:focus {
+      color: #f5f5f5;
+
+      > svg {
+        fill: #f5f5f5;
+      }
+    }
+  }
+}
+
+.navbar-sub-nav {
+  display: flex;
+  margin-bottom: 0;
+  color: #d5d5d5;
+
+  > li {
+    &.active > a {
+      border-bottom-color: #4180ec;
+    }
+
+    > a {
+      display: block;
+      padding: 16px 9px 13px;
+      font-size: 13px;
+      color: currentColor;
+      border-bottom: 3px solid transparent;
+
+      @media (min-width: $screen-sm-min) {
+        padding: 15px 15px 12px;
+        font-size: 14px;
+      }
+
+      &:hover,
+      &:focus {
+        color: #f5f5f5;
+        text-decoration: none;
+      }
+    }
+  }
+
+  .dropdown-chevron {
+    font-size: 12px;
+  }
+}
+
+.search {
+  form,
+  .search-input {
+    background-color: #525252;
+  }
+
+  .search-input,
+  .search-input::placeholder {
+    color: #f5f5f5;
+  }
+}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a3b243fccb7..46be72ad81c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -300,4 +300,8 @@ module ApplicationHelper
       "https://www.twitter.com/#{name}"
     end
   end
+
+  def show_new_nav?
+    cookies["new_nav"] == "true"
+  end
 end
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index eea33b5966f..f7a1d7e8844 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -30,6 +30,9 @@
   = stylesheet_link_tag "test",        media: "all" if Rails.env.test?
   = stylesheet_link_tag 'peek' if peek_enabled?
 
+  - if show_new_nav?
+    = stylesheet_link_tag "new_nav", media: "all"
+
   = Gon::Base.render_data
 
   = webpack_bundle_tag "runtime"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 2b07273a0a8..d879df8fc82 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -4,7 +4,10 @@
   %body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}" } }
     = render "layouts/init_auto_complete" if @gfm_form
     = render 'peek/bar'
-    = render "layouts/header/default", title: header_title
+    - if show_new_nav?
+      = render "layouts/header/new"
+    - else
+      = render "layouts/header/default", title: header_title
     = render 'layouts/page', sidebar: sidebar, nav: nav
 
     = yield :scripts_body
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
new file mode 100644
index 00000000000..1ae89f4a4b6
--- /dev/null
+++ b/app/views/layouts/header/_new.html.haml
@@ -0,0 +1,93 @@
+%header.navbar.navbar-gitlab.navbar-gitlab-new{ class: nav_header_class }
+  %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
+  .container-fluid
+    .header-content
+      .header-logo
+        = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do
+          = brand_header_logo
+
+      .title-container
+        %h1.title
+          GitLab
+
+        - if current_user
+          = render "layouts/nav/new_dashboard"
+
+      %button.navbar-toggle.navbar-toggle-left.hide.hidden-sm.hidden-md.hidden-lg.js-navbar-toggle-left{ type: 'button' }
+        %span.sr-only Toggle navigation
+        = icon('chevron-left')
+
+      .navbar-collapse.collapse
+        %ul.nav.navbar-nav
+          %li.hidden-sm.hidden-xs
+            = render 'layouts/search' unless current_controller?(:search)
+          %li.visible-sm-inline-block.visible-xs-inline-block
+            = link_to search_path, title: 'Search', aria: { label: "Search" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+              = icon('search')
+          - if current_user
+            - if session[:impersonator_id]
+              %li.impersonation
+                = link_to admin_impersonation_path, method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+                  = icon('user-secret fw')
+            - if current_user.admin?
+              %li
+                = link_to admin_root_path, title: 'Admin area', aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                  = icon('wrench fw')
+            = render 'layouts/header/new_dropdown'
+            - if Gitlab::Sherlock.enabled?
+              %li
+                = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
+                  data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                  = icon('tachometer fw')
+            %li
+              = link_to assigned_issues_dashboard_path, title: 'Issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = icon('hashtag fw')
+                - issues_count = assigned_issuables_count(:issues)
+                %span.badge.issues-count{ class: ('hidden' if issues_count.zero?) }
+                  = number_with_delimiter(issues_count)
+            %li
+              = link_to assigned_mrs_dashboard_path, title: 'Merge requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = custom_icon('mr_bold')
+                - merge_requests_count = assigned_issuables_count(:merge_requests)
+                %span.badge.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) }
+                  = number_with_delimiter(merge_requests_count)
+            %li
+              = link_to dashboard_todos_path, title: 'Todos', aria: { label: "Todos" }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
+                = icon('check-circle fw')
+                %span.badge.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
+                  = todos_count_format(todos_pending_count)
+            %li.header-user.dropdown
+              = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do
+                = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar"
+                = icon('caret-down')
+              .dropdown-menu-nav.dropdown-menu-align-right
+                %ul
+                  %li.current-user
+                    .user-name.bold
+                      = current_user.name
+                    @#{current_user.username}
+                  %li.divider
+                  %li
+                    = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
+                  %li
+                    = link_to "Settings", profile_path
+                  %li.divider
+                  %li
+                    = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"
+          - else
+            %li
+              %div
+                = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success'
+
+      %button.navbar-toggle.hidden-sm.hidden-md.hidden-lg.js-navbar-toggle-right{ type: 'button' }
+        %span.sr-only Toggle navigation
+        = icon('chevron-right')
+
+      = yield :header_content
+
+= render 'shared/outdated_browser'
+
+- if @project && !@project.empty_repo?
+  - if ref = @ref || @project.repository.root_ref
+    :javascript
+      var findFileURL = "#{namespace_project_find_file_path(@project.namespace, @project, ref)}";
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml
new file mode 100644
index 00000000000..698148d4265
--- /dev/null
+++ b/app/views/layouts/nav/_new_dashboard.html.haml
@@ -0,0 +1,30 @@
+%ul.list-unstyled.navbar-sub-nav
+  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
+    = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
+      Projects
+
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
+    = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do
+      Groups
+
+  = nav_link(path: 'dashboard#activity', html_options: { class: "hidden-xs hidden-sm" }) do
+    = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
+      Activity
+
+  %li.dropdown
+    %a{ href: "#", data: { toggle: "dropdown" } }
+      More
+      = icon("chevron-down", class: "dropdown-chevron")
+    .dropdown-menu
+      %ul
+        = nav_link(path: 'dashboard#activity', html_options: { class: "visible-xs visible-sm" }) do
+          = link_to activity_dashboard_path, title: 'Activity' do
+            Activity
+
+        = nav_link(controller: 'dashboard/milestones') do
+          = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do
+            Milestones
+
+        = nav_link(controller: 'dashboard/snippets') do
+          = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
+            Snippets
diff --git a/config/application.rb b/config/application.rb
index 8bbecf3ed0f..12242c3b0f5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -109,6 +109,7 @@ module Gitlab
     config.assets.precompile << "lib/ace.js"
     config.assets.precompile << "vendor/assets/fonts/*"
     config.assets.precompile << "test.css"
+    config.assets.precompile << "new_nav.css"
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-- 
cgit v1.2.1


From b9ba97f135b8dae6afecf6129a70b3c905333be1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 11:44:50 +0100
Subject: fix scss-lint job

[ci skip]
---
 app/assets/stylesheets/new_nav.scss | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index f99604a7913..e15bdee800b 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -2,9 +2,11 @@
 @import 'framework/tw_bootstrap_variables';
 @import "bootstrap/variables";
 
+$new-navbar-bg: #2d2d2d;
+
 header.navbar-gitlab-new {
-  color: #f5f5f5;
-  background-color: #2d2d2d;
+  color: $gray-normal;
+  background-color: $new-navbar-bg;
 
   .header-content {
     padding-left: 0;
@@ -26,7 +28,7 @@ header.navbar-gitlab-new {
 
     .dropdown.open {
       > a {
-        border-bottom-color: #4180ec;
+        border-bottom-color: $blue-400;
       }
     }
 
@@ -37,7 +39,7 @@ header.navbar-gitlab-new {
   }
 
   .navbar-collapse {
-    color: #d5d5d5;
+    color: $gray-dark;
   }
 
   .container-fluid {
@@ -66,10 +68,10 @@ header.navbar-gitlab-new {
 
     .nav > li > a:hover,
     .nav > li > a:focus {
-      color: #f5f5f5;
+      color: $gray-normal;
 
       > svg {
-        fill: #f5f5f5;
+        fill: $gray-normal;
       }
     }
   }
@@ -78,11 +80,11 @@ header.navbar-gitlab-new {
 .navbar-sub-nav {
   display: flex;
   margin-bottom: 0;
-  color: #d5d5d5;
+  color: $gray-dark;
 
   > li {
     &.active > a {
-      border-bottom-color: #4180ec;
+      border-bottom-color: $blue-400;
     }
 
     > a {
@@ -99,7 +101,7 @@ header.navbar-gitlab-new {
 
       &:hover,
       &:focus {
-        color: #f5f5f5;
+        color: $gray-normal;
         text-decoration: none;
       }
     }
@@ -113,11 +115,11 @@ header.navbar-gitlab-new {
 .search {
   form,
   .search-input {
-    background-color: #525252;
+    background-color: $gl-gray-light;
   }
 
   .search-input,
   .search-input::placeholder {
-    color: #f5f5f5;
+    color: $gray-normal;
   }
 }
-- 
cgit v1.2.1


From 9e6113a293d8a8ea956db160a8b5c74db0f3aa93 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 12:05:23 +0100
Subject: spacing fixes

made the title a link back to the dashboard

[ci skip]
---
 app/assets/stylesheets/framework/header.scss |  2 +-
 app/assets/stylesheets/new_nav.scss          | 30 ++++++++++++++++++++++++++--
 app/views/layouts/header/_new.html.haml      |  3 ++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index e7d58449cec..c2a17c22524 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -227,7 +227,7 @@ header {
       }
 
       a {
-        color: $gl-text-color;
+        color: currentColor;
 
         &:hover {
           text-decoration: underline;
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index e15bdee800b..ae4f78e3053 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -18,11 +18,19 @@ header.navbar-gitlab-new {
 
     .title {
       padding-top: 14px;
-      padding-right: 10px;
+      padding-right: 9px;
       color: currentColor;
 
       @media (min-width: $screen-sm-min) {
-        padding-right: 20px;
+        padding-right: 15px;
+      }
+
+      a {
+        &:hover,
+        &:focus {
+          color: currentColor;
+          text-decoration: none;
+        }
       }
     }
 
@@ -35,6 +43,11 @@ header.navbar-gitlab-new {
     .dropdown-menu {
       margin-top: 4px;
       min-width: 130px;
+
+      @media (max-width: $screen-xs-max) {
+        left: auto;
+        right: 0;
+      }
     }
   }
 
@@ -122,4 +135,17 @@ header.navbar-gitlab-new {
   .search-input::placeholder {
     color: $gray-normal;
   }
+
+  .location-badge {
+    color: $gray-normal;
+    background-color: #2d2d2d;
+  }
+
+  &.search-active {
+    .search-input-wrap {
+      i {
+        color: $gray-normal;
+      }
+    }
+  }
 }
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
index 1ae89f4a4b6..addd58a8fa2 100644
--- a/app/views/layouts/header/_new.html.haml
+++ b/app/views/layouts/header/_new.html.haml
@@ -8,7 +8,8 @@
 
       .title-container
         %h1.title
-          GitLab
+          = link_to root_path, title: 'Dashboard' do
+            GitLab
 
         - if current_user
           = render "layouts/nav/new_dashboard"
-- 
cgit v1.2.1


From 4c01a68fc70cca14868e166361188601dc505d9f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 12:08:28 +0100
Subject: added signed out subnav

also added the help link back into the nav bar
---
 app/views/layouts/header/_new.html.haml        |  2 ++
 app/views/layouts/nav/_new_dashboard.html.haml |  3 +++
 app/views/layouts/nav/_new_explore.html.haml   | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 app/views/layouts/nav/_new_explore.html.haml

diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
index addd58a8fa2..db3650e52a4 100644
--- a/app/views/layouts/header/_new.html.haml
+++ b/app/views/layouts/header/_new.html.haml
@@ -13,6 +13,8 @@
 
         - if current_user
           = render "layouts/nav/new_dashboard"
+        - else
+          = render "layouts/nav/new_explore"
 
       %button.navbar-toggle.navbar-toggle-left.hide.hidden-sm.hidden-md.hidden-lg.js-navbar-toggle-left{ type: 'button' }
         %span.sr-only Toggle navigation
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml
index 698148d4265..35a586d462e 100644
--- a/app/views/layouts/nav/_new_dashboard.html.haml
+++ b/app/views/layouts/nav/_new_dashboard.html.haml
@@ -28,3 +28,6 @@
         = nav_link(controller: 'dashboard/snippets') do
           = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
             Snippets
+        %li.divider
+        %li
+          = link_to "Help", help_path, title: 'About GitLab CE'
diff --git a/app/views/layouts/nav/_new_explore.html.haml b/app/views/layouts/nav/_new_explore.html.haml
new file mode 100644
index 00000000000..40385f251e3
--- /dev/null
+++ b/app/views/layouts/nav/_new_explore.html.haml
@@ -0,0 +1,19 @@
+%ul.list-unstyled.navbar-sub-nav
+  = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
+    = link_to explore_root_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
+      Projects
+  = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
+    = link_to explore_groups_path, title: 'Groups', class: 'dashboard-shortcuts-groups' do
+      Groups
+  %li.dropdown
+    %a{ href: "#", data: { toggle: "dropdown" } }
+      More
+      = icon("chevron-down", class: "dropdown-chevron")
+    .dropdown-menu
+      %ul
+        = nav_link(controller: :snippets) do
+          = link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do
+            Snippets
+        %li.divider
+        %li
+          = link_to "Help", help_path, title: 'About GitLab CE'
-- 
cgit v1.2.1


From 1dafd67010c2e400e25daac7d3ab650826413ef6 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 12:27:06 +0100
Subject: fixed dashboard projects nav item being active

it is now only shown as active when on the dashbord/projects controller

[ci skip]
---
 app/assets/stylesheets/new_nav.scss            | 7 +++++--
 app/views/layouts/nav/_new_dashboard.html.haml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index ae4f78e3053..aa96450ca1e 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -131,11 +131,14 @@ header.navbar-gitlab-new {
     background-color: $gl-gray-light;
   }
 
-  .search-input,
-  .search-input::placeholder {
+  .search-input {
     color: $gray-normal;
   }
 
+  .search-input::placeholder {
+    color: $gray-dark;
+  }
+
   .location-badge {
     color: $gray-normal;
     background-color: #2d2d2d;
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml
index 35a586d462e..7109baa4dad 100644
--- a/app/views/layouts/nav/_new_dashboard.html.haml
+++ b/app/views/layouts/nav/_new_dashboard.html.haml
@@ -1,5 +1,5 @@
 %ul.list-unstyled.navbar-sub-nav
-  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
+  = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "home"}) do
     = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
       Projects
 
-- 
cgit v1.2.1


From 4e1591c035718f77a5e6617ff720f23d8fc3ab89 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 16:38:45 +0100
Subject: added section to profile/preferences

---
 app/assets/images/new_nav.png                 | Bin 0 -> 23771 bytes
 app/assets/images/old_nav.png                 | Bin 0 -> 25617 bytes
 app/assets/javascripts/dispatcher.js          |   4 ++++
 app/assets/javascripts/experimental_flags.js  |  11 +++++++++++
 app/views/layouts/header/_default.html.haml   |   2 ++
 app/views/layouts/header/_new.html.haml       |   2 ++
 app/views/profiles/preferences/show.html.haml |  18 ++++++++++++++++++
 7 files changed, 37 insertions(+)
 create mode 100644 app/assets/images/new_nav.png
 create mode 100644 app/assets/images/old_nav.png
 create mode 100644 app/assets/javascripts/experimental_flags.js

diff --git a/app/assets/images/new_nav.png b/app/assets/images/new_nav.png
new file mode 100644
index 00000000000..8879d26d341
Binary files /dev/null and b/app/assets/images/new_nav.png differ
diff --git a/app/assets/images/old_nav.png b/app/assets/images/old_nav.png
new file mode 100644
index 00000000000..23fae7aa19e
Binary files /dev/null and b/app/assets/images/old_nav.png differ
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 88b4b567fa9..31a86090242 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -55,6 +55,7 @@ import RefSelectDropdown from './ref_select_dropdown';
 import GfmAutoComplete from './gfm_auto_complete';
 import ShortcutsBlob from './shortcuts_blob';
 import initSettingsPanels from './settings_panels';
+import initExperimentalFlags from './experimental_flags';
 
 (function() {
   var Dispatcher;
@@ -120,6 +121,9 @@ import initSettingsPanels from './settings_panels';
       }
 
       switch (page) {
+        case 'profiles:preferences:show':
+          initExperimentalFlags();
+          break;
         case 'sessions:new':
           new UsernameValidator();
           new ActiveTabMemoizer();
diff --git a/app/assets/javascripts/experimental_flags.js b/app/assets/javascripts/experimental_flags.js
new file mode 100644
index 00000000000..5564df25159
--- /dev/null
+++ b/app/assets/javascripts/experimental_flags.js
@@ -0,0 +1,11 @@
+import Cookies from 'js-cookie';
+
+export default () => {
+  $('.js-expirement-feature-toggle').on('change', (e) => {
+    const el = e.target;
+
+    Cookies.set(el.name, el.value, {
+      expires: 365 * 10,
+    });
+  });
+};
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 249253f4906..34dcde38908 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -74,6 +74,8 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
+                  %li
+                    = link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation")
                   %li.divider
                   %li
                     = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
index db3650e52a4..e4b5e5302af 100644
--- a/app/views/layouts/header/_new.html.haml
+++ b/app/views/layouts/header/_new.html.haml
@@ -74,6 +74,8 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
+                  %li
+                    = link_to "Turn off new nav", profile_preferences_path(anchor: "new-navigation")
                   %li.divider
                   %li
                     = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 0ff19b3eab1..8a6dc4a12a8 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -17,6 +17,24 @@
         = scheme.name
   .col-sm-12
     %hr
+  .col-lg-3.profile-settings-sidebar#new-navigation
+    %h4.prepend-top-0
+      New Navigation
+    %p
+      This setting allows you to turn on or off the new upcoming navigation concept.
+      = succeed '.' do
+        = link_to 'Learn more', '', target: '_blank'
+  .col-lg-9.syntax-theme
+    = label_tag do
+      .preview= image_tag "old_nav.png"
+      %input.js-expirement-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
+      Old
+    = label_tag do
+      .preview= image_tag "new_nav.png"
+      %input.js-expirement-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
+      New
+  .col-sm-12
+    %hr
   .col-lg-3.profile-settings-sidebar
     %h4.prepend-top-0
       Behavior
-- 
cgit v1.2.1


From 6ab1c7d737535eafc7009e29bcfca1e967f3f68c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 16 Jun 2017 17:08:50 +0100
Subject: fixed scss-lint job

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

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index aa96450ca1e..e1c32ac8b60 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -141,7 +141,7 @@ header.navbar-gitlab-new {
 
   .location-badge {
     color: $gray-normal;
-    background-color: #2d2d2d;
+    background-color: $new-navbar-bg;
   }
 
   &.search-active {
-- 
cgit v1.2.1


From 2dfc8d0eff9ea84899e6b8f13534c103e6d286ff Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 19 Jun 2017 17:01:18 +0100
Subject: fixed typo in selector :see_no_evil:

---
 app/assets/javascripts/experimental_flags.js  | 2 +-
 app/views/profiles/preferences/show.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/experimental_flags.js b/app/assets/javascripts/experimental_flags.js
index 5564df25159..dbd3843cef7 100644
--- a/app/assets/javascripts/experimental_flags.js
+++ b/app/assets/javascripts/experimental_flags.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie';
 
 export default () => {
-  $('.js-expirement-feature-toggle').on('change', (e) => {
+  $('.js-experiment-feature-toggle').on('change', (e) => {
     const el = e.target;
 
     Cookies.set(el.name, el.value, {
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 8a6dc4a12a8..e25d36222f7 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -27,11 +27,11 @@
   .col-lg-9.syntax-theme
     = label_tag do
       .preview= image_tag "old_nav.png"
-      %input.js-expirement-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
+      %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
       Old
     = label_tag do
       .preview= image_tag "new_nav.png"
-      %input.js-expirement-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
+      %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
       New
   .col-sm-12
     %hr
-- 
cgit v1.2.1


From 1c2547d2a96fc29e7b009e95d69d17c637d11a0a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 21 Jun 2017 09:39:03 +0100
Subject: color changes to navigation

---
 app/assets/stylesheets/new_nav.scss | 57 ++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index e1c32ac8b60..ddcbd6b6f07 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -2,7 +2,7 @@
 @import 'framework/tw_bootstrap_variables';
 @import "bootstrap/variables";
 
-$new-navbar-bg: #2d2d2d;
+$new-navbar-bg: #380D75;
 
 header.navbar-gitlab-new {
   color: $gray-normal;
@@ -36,7 +36,7 @@ header.navbar-gitlab-new {
 
     .dropdown.open {
       > a {
-        border-bottom-color: $blue-400;
+        border-bottom-color: $white-light;
       }
     }
 
@@ -52,7 +52,7 @@ header.navbar-gitlab-new {
   }
 
   .navbar-collapse {
-    color: $gray-dark;
+    color: $white-light;
   }
 
   .container-fluid {
@@ -79,12 +79,18 @@ header.navbar-gitlab-new {
       }
     }
 
+    .nav > li > a {
+      opacity: .9;
+      will-change: opacity;
+    }
+
     .nav > li > a:hover,
     .nav > li > a:focus {
-      color: $gray-normal;
+      color: $white-light;
+      opacity: 1;
 
       > svg {
-        fill: $gray-normal;
+        fill: $white-light;
       }
     }
   }
@@ -93,11 +99,16 @@ header.navbar-gitlab-new {
 .navbar-sub-nav {
   display: flex;
   margin-bottom: 0;
-  color: $gray-dark;
+  color: $white-light;
 
   > li {
-    &.active > a {
-      border-bottom-color: $blue-400;
+    &.active > a,
+    a:hover,
+    a:focus {
+      border-bottom-color: $white-light;
+      text-decoration: none;
+      outline: 0;
+      opacity: 1;
     }
 
     > a {
@@ -106,17 +117,13 @@ header.navbar-gitlab-new {
       font-size: 13px;
       color: currentColor;
       border-bottom: 3px solid transparent;
+      opacity: .9;
+      will-change: opacity;
 
       @media (min-width: $screen-sm-min) {
         padding: 15px 15px 12px;
         font-size: 14px;
       }
-
-      &:hover,
-      &:focus {
-        color: $gray-normal;
-        text-decoration: none;
-      }
     }
   }
 
@@ -126,28 +133,40 @@ header.navbar-gitlab-new {
 }
 
 .search {
+  form {
+    border-color: #2D0573;
+
+    &:hover {
+      border-color: rgba($white-light, .5);
+    }
+  }
+
+  &.search-active form {
+    border-color: $white-light;
+  }
+
   form,
   .search-input {
-    background-color: $gl-gray-light;
+    background-color: #451C7F;
   }
 
   .search-input {
-    color: $gray-normal;
+    color: $white-light;
   }
 
   .search-input::placeholder {
-    color: $gray-dark;
+    color: $white-light;
   }
 
   .location-badge {
-    color: $gray-normal;
+    color: $white-light;
     background-color: $new-navbar-bg;
   }
 
   &.search-active {
     .search-input-wrap {
       i {
-        color: $gray-normal;
+        color: $white-light;
       }
     }
   }
-- 
cgit v1.2.1


From 79a842c53d77e9b5b95c538372ac263c28864659 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 21 Jun 2017 14:45:05 +0100
Subject: fixed scss-lint job

only display the toggle setting in development env for now
---
 app/assets/stylesheets/framework/variables.scss |  4 +++
 app/assets/stylesheets/new_nav.scss             | 10 +++----
 app/helpers/application_helper.rb               |  4 +++
 app/views/layouts/header/_default.html.haml     |  5 ++--
 app/views/profiles/preferences/show.html.haml   | 37 +++++++++++++------------
 5 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 71513199d84..7a40143ad7d 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -74,6 +74,10 @@ $red-700: #a62d19;
 $red-800: #8b2615;
 $red-900: #711e11;
 
+$purple-700: #2d0573;
+$purple-800: #451c7f;
+$purple-900: #380d75;
+
 $black: #000;
 $black-transparent: rgba(0, 0, 0, 0.3);
 
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index ddcbd6b6f07..d24fd3b160d 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -2,11 +2,9 @@
 @import 'framework/tw_bootstrap_variables';
 @import "bootstrap/variables";
 
-$new-navbar-bg: #380D75;
-
 header.navbar-gitlab-new {
   color: $gray-normal;
-  background-color: $new-navbar-bg;
+  background-color: $purple-900;
 
   .header-content {
     padding-left: 0;
@@ -134,7 +132,7 @@ header.navbar-gitlab-new {
 
 .search {
   form {
-    border-color: #2D0573;
+    border-color: $purple-700;
 
     &:hover {
       border-color: rgba($white-light, .5);
@@ -147,7 +145,7 @@ header.navbar-gitlab-new {
 
   form,
   .search-input {
-    background-color: #451C7F;
+    background-color: $purple-800;
   }
 
   .search-input {
@@ -160,7 +158,7 @@ header.navbar-gitlab-new {
 
   .location-badge {
     color: $white-light;
-    background-color: $new-navbar-bg;
+    background-color: $purple-900;
   }
 
   &.search-active {
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 46be72ad81c..dc7ff78f3df 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -301,6 +301,10 @@ module ApplicationHelper
     end
   end
 
+  def can_toggle_new_nav?
+    Rails.env.development?
+  end
+
   def show_new_nav?
     cookies["new_nav"] == "true"
   end
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 34dcde38908..f056c0af968 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -74,8 +74,9 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
-                  %li
-                    = link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation")
+                  - if can_toggle_new_nav?
+                    %li
+                      = link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation")
                   %li.divider
                   %li
                     = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index e25d36222f7..0b5995415e9 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -15,24 +15,25 @@
         .preview= image_tag "#{scheme.css_class}-scheme-preview.png"
         = f.radio_button :color_scheme_id, scheme.id
         = scheme.name
-  .col-sm-12
-    %hr
-  .col-lg-3.profile-settings-sidebar#new-navigation
-    %h4.prepend-top-0
-      New Navigation
-    %p
-      This setting allows you to turn on or off the new upcoming navigation concept.
-      = succeed '.' do
-        = link_to 'Learn more', '', target: '_blank'
-  .col-lg-9.syntax-theme
-    = label_tag do
-      .preview= image_tag "old_nav.png"
-      %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
-      Old
-    = label_tag do
-      .preview= image_tag "new_nav.png"
-      %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
-      New
+  - if can_toggle_new_nav?
+    .col-sm-12
+      %hr
+    .col-lg-3.profile-settings-sidebar#new-navigation
+      %h4.prepend-top-0
+        New Navigation
+      %p
+        This setting allows you to turn on or off the new upcoming navigation concept.
+        = succeed '.' do
+          = link_to 'Learn more', '', target: '_blank'
+    .col-lg-9.syntax-theme
+      = label_tag do
+        .preview= image_tag "old_nav.png"
+        %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
+        Old
+      = label_tag do
+        .preview= image_tag "new_nav.png"
+        %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
+        New
   .col-sm-12
     %hr
   .col-lg-3.profile-settings-sidebar
-- 
cgit v1.2.1


From 9e1951b0678d79c00532dc0de84ac53bd832d5c4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 21 Jun 2017 14:49:59 +0100
Subject: padding updates fixed mobile nav colors

---
 app/assets/stylesheets/new_nav.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index d24fd3b160d..14ff4f75e07 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -20,7 +20,7 @@ header.navbar-gitlab-new {
       color: currentColor;
 
       @media (min-width: $screen-sm-min) {
-        padding-right: 15px;
+        padding-right: $gl-padding;
       }
 
       a {
@@ -55,6 +55,7 @@ header.navbar-gitlab-new {
 
   .container-fluid {
     .navbar-toggle {
+      color: currentColor;
       border-left: 1px solid currentColor;
 
       &:hover,
@@ -119,7 +120,7 @@ header.navbar-gitlab-new {
       will-change: opacity;
 
       @media (min-width: $screen-sm-min) {
-        padding: 15px 15px 12px;
+        padding: 15px $gl-padding 12px;
         font-size: 14px;
       }
     }
-- 
cgit v1.2.1


From 4419289bff21fbb84999f2faf8b6ad213551d561 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 21 Jun 2017 15:36:02 +0200
Subject: Fix migration specs that can not run within transaction

---
 db/post_migrate/20170526185921_migrate_build_stage_reference.rb         | 2 ++
 .../database/rename_reserved_paths_migration/v1/rename_base_spec.rb     | 2 +-
 .../database/rename_reserved_paths_migration/v1/rename_projects_spec.rb | 2 +-
 spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb     | 2 +-
 spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb        | 2 +-
 .../migrate_user_activities_to_users_last_activity_on_spec.rb           | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/db/post_migrate/20170526185921_migrate_build_stage_reference.rb b/db/post_migrate/20170526185921_migrate_build_stage_reference.rb
index 797e106cae4..d2e7fc207f0 100644
--- a/db/post_migrate/20170526185921_migrate_build_stage_reference.rb
+++ b/db/post_migrate/20170526185921_migrate_build_stage_reference.rb
@@ -3,6 +3,8 @@ class MigrateBuildStageReference < ActiveRecord::Migration
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
     disable_statement_timeout
 
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
index a3ab4e3dd9e..5653cfee686 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase do
+describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :truncate do
   let(:migration) { FakeRenameReservedPathMigrationV1.new }
   let(:subject) { described_class.new(['the-path'], migration) }
 
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
index 59e8de2712d..b04547f59fe 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects do
+describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :truncate do
   let(:migration) { FakeRenameReservedPathMigrationV1.new }
   let(:subject) { described_class.new(['the-path'], migration) }
 
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
index f8cc1eb91ec..04a6592aac5 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
@@ -13,7 +13,7 @@ shared_examples 'renames child namespaces' do |type|
   end
 end
 
-describe Gitlab::Database::RenameReservedPathsMigration::V1 do
+describe Gitlab::Database::RenameReservedPathsMigration::V1, :truncate do
   let(:subject) { FakeRenameReservedPathMigrationV1.new }
 
   before do
diff --git a/spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb b/spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb
index bd5f85b901d..65bea662b02 100644
--- a/spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb
+++ b/spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20170508170547_add_head_pipeline_for_each_merge_request.rb')
 
-describe AddHeadPipelineForEachMergeRequest do
+describe AddHeadPipelineForEachMergeRequest, :truncate do
   let(:migration) { described_class.new }
 
   let!(:project) { create(:empty_project) }
diff --git a/spec/migrations/migrate_user_activities_to_users_last_activity_on_spec.rb b/spec/migrations/migrate_user_activities_to_users_last_activity_on_spec.rb
index 1db9bc002ae..e3b42b5eac8 100644
--- a/spec/migrations/migrate_user_activities_to_users_last_activity_on_spec.rb
+++ b/spec/migrations/migrate_user_activities_to_users_last_activity_on_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20170324160416_migrate_user_activities_to_users_last_activity_on.rb')
 
-describe MigrateUserActivitiesToUsersLastActivityOn, :redis do
+describe MigrateUserActivitiesToUsersLastActivityOn, :redis, :truncate do
   let(:migration) { described_class.new }
   let!(:user_active_1) { create(:user) }
   let!(:user_active_2) { create(:user) }
-- 
cgit v1.2.1


From 5145e39ef7efe7618a2f78a63e13bc630be251a9 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Wed, 21 Jun 2017 01:36:08 -0500
Subject: Fix linking to line number on parallel diff creating empty discussion

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
---
 app/assets/javascripts/merge_request_tabs.js       |   2 +-
 ...parallel-diff-line-number-creating-gray-box.yml |   4 +
 spec/javascripts/fixtures/merge_requests.rb        |  13 +-
 spec/javascripts/merge_request_notes_spec.js       |   2 +-
 spec/javascripts/merge_request_tabs_spec.js        | 138 +++++++++++++++++----
 5 files changed, 130 insertions(+), 29 deletions(-)
 create mode 100644 changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml

diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 7bb2236017e..d2c64182248 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -291,7 +291,7 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
           // Scroll any linked note into view
           // Similar to `toggler_behavior` in the discussion tab
           const hash = window.gl.utils.getLocationHash();
-          const anchor = hash && $container.find(`[id="${hash}"]`);
+          const anchor = hash && $container.find(`.note[id="${hash}"]`);
           if (anchor && anchor.length > 0) {
             const notesContent = anchor.closest('.notes_content');
             const lineType = notesContent.hasClass('new') ? 'new' : 'old';
diff --git a/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml b/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml
new file mode 100644
index 00000000000..705d44f8b10
--- /dev/null
+++ b/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml
@@ -0,0 +1,4 @@
+---
+title: Fix linking to line number on side-by-side diff creating empty discussion box
+merge_request:
+author:
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index 0715f4d5f6b..daaddd8f390 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -55,20 +55,27 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
     render_merge_request(example.description, merge_request)
   end
 
-  it 'merge_requests/changes_tab_with_comments.json' do |example|
+  it 'merge_requests/inline_changes_tab_with_comments.json' do |example|
     create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
     create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
     render_merge_request(example.description, merge_request, action: :diffs, format: :json)
   end
 
+  it 'merge_requests/parallel_changes_tab_with_comments.json' do |example|
+    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
+    create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
+    render_merge_request(example.description, merge_request, action: :diffs, format: :json, view: 'parallel')
+  end
+
   private
 
-  def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html)
+  def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html, view: 'inline')
     get action,
       namespace_id: project.namespace.to_param,
       project_id: project,
       id: merge_request.to_param,
-      format: format
+      format: format,
+      view: view
 
     expect(response).to be_success
     store_frontend_fixture(response, fixture_file_name)
diff --git a/spec/javascripts/merge_request_notes_spec.js b/spec/javascripts/merge_request_notes_spec.js
index b6d0ce02c4f..9e9eb17d439 100644
--- a/spec/javascripts/merge_request_notes_spec.js
+++ b/spec/javascripts/merge_request_notes_spec.js
@@ -15,7 +15,7 @@ describe('Merge request notes', () => {
   gl.utils = gl.utils || {};
 
   const discussionTabFixture = 'merge_requests/diff_comment.html.raw';
-  const changesTabJsonFixture = 'merge_requests/changes_tab_with_comments.json';
+  const changesTabJsonFixture = 'merge_requests/inline_changes_tab_with_comments.json';
   preloadFixtures(discussionTabFixture, changesTabJsonFixture);
 
   describe('Discussion tab with diff comments', () => {
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index 9916d2c1e21..bb6b5d852d3 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -22,7 +22,15 @@ import 'vendor/jquery.scrollTo';
       };
       $.extend(stubLocation, defaults, stubs || {});
     };
-    preloadFixtures('merge_requests/merge_request_with_task_list.html.raw', 'merge_requests/diff_comment.html.raw');
+
+    const inlineChangesTabJsonFixture = 'merge_requests/inline_changes_tab_with_comments.json';
+    const parallelChangesTabJsonFixture = 'merge_requests/parallel_changes_tab_with_comments.json';
+    preloadFixtures(
+      'merge_requests/merge_request_with_task_list.html.raw',
+      'merge_requests/diff_comment.html.raw',
+      inlineChangesTabJsonFixture,
+      parallelChangesTabJsonFixture
+    );
 
     beforeEach(function () {
       this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
@@ -271,6 +279,19 @@ import 'vendor/jquery.scrollTo';
     });
 
     describe('loadDiff', function () {
+      beforeEach(() => {
+        loadFixtures('merge_requests/diff_comment.html.raw');
+        spyOn(window.gl.utils, 'getPagePath').and.returnValue('merge_requests');
+        window.gl.ImageFile = () => {};
+        window.notes = new Notes('', []);
+        spyOn(window.notes, 'toggleDiffNote').and.callThrough();
+      });
+
+      afterEach(() => {
+        delete window.gl.ImageFile;
+        delete window.notes;
+      });
+
       it('requires an absolute pathname', function () {
         spyOn($, 'ajax').and.callFake(function (options) {
           expect(options.url).toEqual('/foo/bar/merge_requests/1/diffs.json');
@@ -279,43 +300,112 @@ import 'vendor/jquery.scrollTo';
         this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
       });
 
-      describe('with note fragment hash', () => {
+      describe('with inline diff', () => {
+        let noteId;
+        let noteLineNumId;
+
         beforeEach(() => {
-          loadFixtures('merge_requests/diff_comment.html.raw');
-          spyOn(window.gl.utils, 'getPagePath').and.returnValue('merge_requests');
-          window.notes = new Notes('', []);
-          spyOn(window.notes, 'toggleDiffNote').and.callThrough();
-        });
+          const diffsResponse = getJSONFixture(inlineChangesTabJsonFixture);
+
+          const $html = $(diffsResponse.html);
+          noteId = $html.find('.note').attr('id');
+          noteLineNumId = $html
+            .find('.note')
+            .closest('.notes_holder')
+            .prev('.line_holder')
+            .find('a[data-linenumber]')
+            .attr('href')
+            .replace('#', '');
 
-        afterEach(() => {
-          delete window.notes;
+          spyOn($, 'ajax').and.callFake(function (options) {
+            options.success(diffsResponse);
+          });
         });
 
-        it('should expand and scroll to linked fragment hash #note_xxx', function () {
-          const noteId = 'note_1';
-          spyOn(window.gl.utils, 'getLocationHash').and.returnValue(noteId);
-          spyOn($, 'ajax').and.callFake(function (options) {
-            options.success({ html: `<div id="${noteId}">foo</div>` });
+        describe('with note fragment hash', () => {
+          it('should expand and scroll to linked fragment hash #note_xxx', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue(noteId);
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+
+            expect(noteId.length).toBeGreaterThan(0);
+            expect(window.notes.toggleDiffNote).toHaveBeenCalledWith({
+              target: jasmine.any(Object),
+              lineType: 'old',
+              forceShow: true,
+            });
           });
 
-          this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+          it('should gracefully ignore non-existant fragment hash', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue('note_something-that-does-not-exist');
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
 
-          expect(window.notes.toggleDiffNote).toHaveBeenCalledWith({
-            target: jasmine.any(Object),
-            lineType: 'old',
-            forceShow: true,
+            expect(window.notes.toggleDiffNote).not.toHaveBeenCalled();
           });
         });
 
-        it('should gracefully ignore non-existant fragment hash', function () {
-          spyOn(window.gl.utils, 'getLocationHash').and.returnValue('note_something-that-does-not-exist');
+        describe('with line number fragment hash', () => {
+          it('should gracefully ignore line number fragment hash', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue(noteLineNumId);
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+
+            expect(noteLineNumId.length).toBeGreaterThan(0);
+            expect(window.notes.toggleDiffNote).not.toHaveBeenCalled();
+          });
+        });
+      });
+
+      describe('with parallel diff', () => {
+        let noteId;
+        let noteLineNumId;
+
+        beforeEach(() => {
+          const diffsResponse = getJSONFixture(parallelChangesTabJsonFixture);
+
+          const $html = $(diffsResponse.html);
+          noteId = $html.find('.note').attr('id');
+          noteLineNumId = $html
+            .find('.note')
+            .closest('.notes_holder')
+            .prev('.line_holder')
+            .find('a[data-linenumber]')
+            .attr('href')
+            .replace('#', '');
+
           spyOn($, 'ajax').and.callFake(function (options) {
-            options.success({ html: '' });
+            options.success(diffsResponse);
           });
+        });
+
+        describe('with note fragment hash', () => {
+          it('should expand and scroll to linked fragment hash #note_xxx', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue(noteId);
 
-          this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
 
-          expect(window.notes.toggleDiffNote).not.toHaveBeenCalled();
+            expect(noteId.length).toBeGreaterThan(0);
+            expect(window.notes.toggleDiffNote).toHaveBeenCalledWith({
+              target: jasmine.any(Object),
+              lineType: 'new',
+              forceShow: true,
+            });
+          });
+
+          it('should gracefully ignore non-existant fragment hash', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue('note_something-that-does-not-exist');
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+
+            expect(window.notes.toggleDiffNote).not.toHaveBeenCalled();
+          });
+        });
+
+        describe('with line number fragment hash', () => {
+          it('should gracefully ignore line number fragment hash', function () {
+            spyOn(window.gl.utils, 'getLocationHash').and.returnValue(noteLineNumId);
+            this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
+
+            expect(noteLineNumId.length).toBeGreaterThan(0);
+            expect(window.notes.toggleDiffNote).not.toHaveBeenCalled();
+          });
         });
       });
     });
-- 
cgit v1.2.1


From 1e743a1db7978eeb22f6b5dc94c3268b31cfec76 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 21 Jun 2017 16:30:45 +0100
Subject: Backport changes to Projects::MergeRequestsController for
 gitlab-org/gitlab-ee!2200

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

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index cbe73f9c1e3..aae6f7a99fd 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -579,10 +579,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def merge_request_params
     params.require(:merge_request)
-      .permit(merge_request_params_ce)
+      .permit(merge_request_params_attributes)
   end
 
-  def merge_request_params_ce
+  def merge_request_params_attributes
     [
       :assignee_id,
       :description,
@@ -602,7 +602,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def merge_params
-    params.permit(:should_remove_source_branch, :commit_message)
+    params.permit(merge_params_attributes)
+  end
+
+  def merge_params_attributes
+    [:should_remove_source_branch, :commit_message]
   end
 
   # Make sure merge requests created before 8.0
-- 
cgit v1.2.1


From 0284f01716cfdcbe8d9e7a0281e551414b4c0239 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Mon, 12 Jun 2017 20:55:28 +0200
Subject: Migrate Gitlab::Git::Blob.find to Gitaly

---
 GITALY_SERVER_VERSION              |  2 +-
 Gemfile                            |  2 +-
 Gemfile.lock                       |  4 ++--
 lib/gitlab/git/blob.rb             | 45 ++++++++++++++++++++++++++++++++++++++
 lib/gitlab/gitaly_client/commit.rb | 20 +++++++++++++++++
 spec/lib/gitlab/git/blob_spec.rb   | 12 +++++++++-
 spec/lib/gitlab/workhorse_spec.rb  |  1 -
 7 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index bc859cbd6d9..ac454c6a1fc 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.11.2
+0.12.0
diff --git a/Gemfile b/Gemfile
index 61c70ce6b8a..b1790b23dcd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -384,7 +384,7 @@ gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
 # Gitaly GRPC client
-gem 'gitaly', '~> 0.8.0'
+gem 'gitaly', '~> 0.9.0'
 
 gem 'toml-rb', '~> 0.3.15', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ca330b6a59..bfd0498db35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,7 +277,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly (0.8.0)
+    gitaly (0.9.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -977,7 +977,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-  gitaly (~> 0.8.0)
+  gitaly (~> 0.9.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.5.1)
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb
index 33a7624e303..a7aceab4c14 100644
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
@@ -14,6 +14,51 @@ module Gitlab
 
       class << self
         def find(repository, sha, path)
+          Gitlab::GitalyClient.migrate(:project_raw_show) do |is_enabled|
+            if is_enabled
+              find_by_gitaly(repository, sha, path)
+            else
+              find_by_rugged(repository, sha, path)
+            end
+          end
+        end
+
+        def find_by_gitaly(repository, sha, path)
+          path = path.sub(/\A\/*/, '')
+          path = '/' if path.empty?
+          name = File.basename(path)
+          entry = Gitlab::GitalyClient::Commit.new(repository).tree_entry(sha, path, MAX_DATA_DISPLAY_SIZE)
+          return unless entry
+
+          case entry.type
+          when :COMMIT
+            new(
+              id: entry.oid,
+              name: name,
+              size: 0,
+              data: '',
+              path: path,
+              commit_id: sha
+            )
+          when :BLOB
+            # EncodingDetector checks the first 1024 * 1024 bytes for NUL byte, libgit2 checks
+            # only the first 8000 (https://github.com/libgit2/libgit2/blob/2ed855a9e8f9af211e7274021c2264e600c0f86b/src/filter.h#L15),
+            # which is what we use below to keep a consistent behavior.
+            detect = CharlockHolmes::EncodingDetector.new(8000).detect(entry.data)
+            new(
+              id: entry.oid,
+              name: name,
+              size: entry.size,
+              data: entry.data.dup,
+              mode: entry.mode.to_s(8),
+              path: path,
+              commit_id: sha,
+              binary: detect && detect[:type] == :binary
+            )
+          end
+        end
+
+        def find_by_rugged(repository, sha, path)
           commit = repository.lookup(sha)
           root_tree = commit.tree
 
diff --git a/lib/gitlab/gitaly_client/commit.rb b/lib/gitlab/gitaly_client/commit.rb
index 73c1848c95f..b8877619797 100644
--- a/lib/gitlab/gitaly_client/commit.rb
+++ b/lib/gitlab/gitaly_client/commit.rb
@@ -36,6 +36,26 @@ module Gitlab
         end
       end
 
+      def tree_entry(ref, path, limit = nil)
+        request = Gitaly::TreeEntryRequest.new(
+          repository: @gitaly_repo,
+          revision: ref,
+          path: path.dup.force_encoding(Encoding::ASCII_8BIT),
+          limit: limit.to_i
+        )
+
+        response = GitalyClient.call(@repository.storage, :commit, :tree_entry, request)
+        entry = response.first
+        return unless entry.oid.present?
+
+        if entry.type == :BLOB
+          rest_of_data = response.reduce("") { |memo, msg| memo << msg.data }
+          entry.data += rest_of_data
+        end
+
+        entry
+      end
+
       private
 
       def commit_diff_request_params(commit, options = {})
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb
index e6a07a58d73..610a08b3400 100644
--- a/spec/lib/gitlab/git/blob_spec.rb
+++ b/spec/lib/gitlab/git/blob_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
     end
   end
 
-  describe '.find' do
+  shared_examples 'finding blobs' do
     context 'file in subdir' do
       let(:blob) { Gitlab::Git::Blob.find(repository, SeedRepo::Commit::ID, "files/ruby/popen.rb") }
 
@@ -101,6 +101,16 @@ describe Gitlab::Git::Blob, seed_helper: true do
     end
   end
 
+  describe '.find' do
+    context 'when project_raw_show Gitaly feature is enabled' do
+      it_behaves_like 'finding blobs'
+    end
+
+    context 'when project_raw_show Gitaly feature is disabled', skip_gitaly_mock: true do
+      it_behaves_like 'finding blobs'
+    end
+  end
+
   describe '.raw' do
     let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) }
     it { expect(raw_blob.id).to eq(SeedRepo::RubyBlob::ID) }
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index a3e8166cb70..493ff3bb5fb 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -216,7 +216,6 @@ describe Gitlab::Workhorse, lib: true do
 
       it 'includes a Repository param' do
         repo_param = { Repository: {
-          path: '', # deprecated field; grpc automatically creates it anyway
           storage_name: 'default',
           relative_path: project.full_path + '.git'
         } }
-- 
cgit v1.2.1


From b8a7b59d82c49c14f4f9a452f99fa7df289c444d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 21 Jun 2017 16:35:14 +0200
Subject: Add the Flipper::Middleware::Memoizer middleware
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures we make maximum one call per feature per request.

See
https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/flipper.rb | 4 ++++
 lib/feature.rb                 | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/flipper.rb

diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
new file mode 100644
index 00000000000..0fee832788d
--- /dev/null
+++ b/config/initializers/flipper.rb
@@ -0,0 +1,4 @@
+require 'flipper/middleware/memoizer'
+
+Rails.application.config.middleware.use Flipper::Middleware::Memoizer,
+  lambda { Feature.flipper }
diff --git a/lib/feature.rb b/lib/feature.rb
index 5650a1c1334..e2fd8774c6a 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -39,7 +39,6 @@ class Feature
       get(key).disable
     end
 
-    private
 
     def flipper
       @flipper ||= begin
-- 
cgit v1.2.1


From a8e906cd0eafc8dc6dc9778444f0e22701d10982 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 21 Jun 2017 08:25:55 -0500
Subject: Add padding to target branch container

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

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2dc7f73a295..59e0624d94e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -419,7 +419,7 @@
 
   .commit {
     margin: 0;
-    padding: 10px 0;
+    padding: 10px;
     list-style: none;
 
     &:hover {
-- 
cgit v1.2.1


From 2e9a1ebbc3ce5efef99072c715ae1bdc9d9a46f3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 20 Jun 2017 11:34:07 -0500
Subject: Only show gray footer space if environment actions exist

---
 .../environments/components/environment_item.vue          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index 809c147bf25..b25113e0fc6 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -403,6 +403,14 @@ export default {
       return '';
     },
 
+    displayEnvironmentActions() {
+      return this.hasManualActions ||
+             this.externalURL ||
+             this.monitoringUrl ||
+             this.hasStopAction ||
+             this.canRetry;
+    },
+
     /**
      * Constructs folder URL based on the current location and the folder id.
      *
@@ -535,9 +543,12 @@ export default {
       </span>
     </div>
 
-    <div class="table-section section-30 table-button-footer" role="gridcell">
+    <div
+      v-if="!model.isFolder && displayEnvironmentActions"
+      class="table-section section-30 table-button-footer"
+      role="gridcell">
+
       <div
-        v-if="!model.isFolder"
         class="btn-group table-action-buttons"
         role="group">
 
-- 
cgit v1.2.1


From 7f8bea592936d0cd792f32507140d5c902b36fb0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 21 Jun 2017 18:05:46 +0200
Subject: Do not run the codeclimate job on docs-only changes

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0c266485b6..76a95ad6e0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -461,6 +461,7 @@ karma:
     - coverage-javascript/
 
 codeclimate:
+  <<: *except-docs
   before_script: []
   image: docker:latest
   stage: test
-- 
cgit v1.2.1


From 9f0b85bf2683ef0825018c7b754c23369a513956 Mon Sep 17 00:00:00 2001
From: Bryce Johnson <bryce@gitlab.com>
Date: Mon, 19 Jun 2017 14:59:17 -0400
Subject: Revert to using links instead of buttons in Issuable Index tabs.

---
 .../filtered_search/filtered_search_manager.js     |  1 +
 app/assets/stylesheets/framework/nav.scss          | 27 ++--------------------
 app/views/shared/issuable/_nav.html.haml           | 19 +++++++--------
 .../filtered_search_manager_spec.js                |  3 +++
 4 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 8f547bd8f1f..c7c8d42e677 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -487,6 +487,7 @@ class FilteredSearchManager {
   }
 
   searchState(e) {
+    e.preventDefault();
     const target = e.currentTarget;
     // remove focus outline after click
     target.blur();
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 3787ef370b2..28b2a7cfacd 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -45,8 +45,7 @@
   li {
     display: flex;
 
-    a,
-    .btn-link {
+    a {
       padding: $gl-btn-padding;
       padding-bottom: 11px;
       font-size: 14px;
@@ -68,29 +67,7 @@
       }
     }
 
-    .btn-link {
-      padding-top: 16px;
-      padding-left: 15px;
-      padding-right: 15px;
-      border-left: none;
-      border-right: none;
-      border-top: none;
-      border-radius: 0;
-
-      &:hover,
-      &:active,
-      &:focus {
-        background-color: transparent;
-      }
-
-      &:active {
-        outline: 0;
-        box-shadow: none;
-      }
-    }
-
-    &.active a,
-    &.active .btn-link {
+    &.active a {
       border-bottom: 2px solid $link-underline-blue;
       color: $black;
       font-weight: 600;
diff --git a/app/views/shared/issuable/_nav.html.haml b/app/views/shared/issuable/_nav.html.haml
index cf7ba52d840..10b8dc52c1c 100644
--- a/app/views/shared/issuable/_nav.html.haml
+++ b/app/views/shared/issuable/_nav.html.haml
@@ -1,24 +1,25 @@
 - type = local_assigns.fetch(:type, :issues)
 - page_context_word = type.to_s.humanize(capitalize: false)
 - issuables = @issues || @merge_requests
-- closed_title = 'Filter by issues that are currently closed.'
 
 %ul.nav-links.issues-state-filters
   %li{ class: active_when(params[:state] == 'opened') }>
-    %button.btn.btn-link{ id: 'state-opened', title: "Filter by #{page_context_word} that are currently opened.", type: 'button', data: { state: 'opened' } }
+    = link_to page_filter_path(state: 'opened', label: true), id: 'state-opened', title: "Filter by #{page_context_word} that are currently opened.", data: { state: 'opened' } do
       #{issuables_state_counter_text(type, :opened)}
 
   - if type == :merge_requests
     %li{ class: active_when(params[:state] == 'merged') }>
-      %button.btn.btn-link{ id: 'state-merged', title: 'Filter by merge requests that are currently merged.', type: 'button', data: { state: 'merged' } }
+      = link_to page_filter_path(state: 'merged', label: true), id: 'state-merged', title: 'Filter by merge requests that are currently merged.', data: { state: 'merged' } do
         #{issuables_state_counter_text(type, :merged)}
 
-    - closed_title = 'Filter by merge requests that are currently closed and unmerged.'
-
-  %li{ class: active_when(params[:state] == 'closed') }>
-    %button.btn.btn-link{ id: 'state-closed', title: closed_title, type: 'button', data: { state: 'closed' } }
-      #{issuables_state_counter_text(type, :closed)}
+    %li{ class: active_when(params[:state] == 'closed') }>
+      = link_to page_filter_path(state: 'closed', label: true), id: 'state-closed', title: 'Filter by merge requests that are currently closed and unmerged.', data: { state: 'closed' } do
+        #{issuables_state_counter_text(type, :closed)}
+  - else
+    %li{ class: active_when(params[:state] == 'closed') }>
+      = link_to page_filter_path(state: 'closed', label: true), id: 'state-all', title: 'Filter by issues that are currently closed.', data: { state: 'closed' } do
+        #{issuables_state_counter_text(type, :closed)}
 
   %li{ class: active_when(params[:state] == 'all') }>
-    %button.btn.btn-link{ id: 'state-all', title: "Show all #{page_context_word}.", type: 'button', data: { state: 'all' } }
+    = link_to page_filter_path(state: 'all', label: true), id: 'state-all', title: "Show all #{page_context_word}.", data: { state: 'all' } do
       #{issuables_state_counter_text(type, :all)}
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
index f67cd356ef1..8d239c9cc3f 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
@@ -106,6 +106,7 @@ describe('Filtered Search Manager', () => {
 
     it('should blur button', () => {
       const e = {
+        preventDefault: () => {},
         currentTarget: {
           blur: () => {},
         },
@@ -118,6 +119,7 @@ describe('Filtered Search Manager', () => {
 
     it('should not call search if there is no state', () => {
       const e = {
+        preventDefault: () => {},
         currentTarget: {
           blur: () => {},
         },
@@ -129,6 +131,7 @@ describe('Filtered Search Manager', () => {
 
     it('should call search when there is state', () => {
       const e = {
+        preventDefault: () => {},
         currentTarget: {
           blur: () => {},
           dataset: {
-- 
cgit v1.2.1


From eda30f31041d883787959823b95c0ebef3c762ef Mon Sep 17 00:00:00 2001
From: vanadium23 <chernoffivan@gmail.com>
Date: Fri, 16 Jun 2017 08:28:23 +0300
Subject: Filter archived project in API v3 only if param present

---
 ...301-filter-archive-project-on-param-present.yml |  4 +++
 lib/api/v3/helpers.rb                              |  5 +++-
 lib/api/v3/projects.rb                             |  2 +-
 spec/requests/api/v3/projects_spec.rb              | 30 ++++++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/32301-filter-archive-project-on-param-present.yml

diff --git a/changelogs/unreleased/32301-filter-archive-project-on-param-present.yml b/changelogs/unreleased/32301-filter-archive-project-on-param-present.yml
new file mode 100644
index 00000000000..d6534ed4e1a
--- /dev/null
+++ b/changelogs/unreleased/32301-filter-archive-project-on-param-present.yml
@@ -0,0 +1,4 @@
+---
+title: Filter archived project in API v3 only if param present
+merge_request: 12245
+author: Ivan Chernov
diff --git a/lib/api/v3/helpers.rb b/lib/api/v3/helpers.rb
index d9e76560d03..4e63aa01c1a 100644
--- a/lib/api/v3/helpers.rb
+++ b/lib/api/v3/helpers.rb
@@ -38,7 +38,10 @@ module API
           projects = projects.where(visibility_level: Gitlab::VisibilityLevel.level_value(params[:visibility]))
         end
 
-        projects = projects.where(archived: params[:archived])
+        unless params[:archived].nil?
+          projects = projects.where(archived: to_boolean(params[:archived]))
+        end
+
         projects.reorder(params[:order_by] => params[:sort])
       end
     end
diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb
index 20976b9dd08..eb090453b48 100644
--- a/lib/api/v3/projects.rb
+++ b/lib/api/v3/projects.rb
@@ -69,7 +69,7 @@ module API
           end
 
           params :filter_params do
-            optional :archived, type: Boolean, default: false, desc: 'Limit by archived status'
+            optional :archived, type: Boolean, default: nil, desc: 'Limit by archived status'
             optional :visibility, type: String, values: %w[public internal private],
                                   desc: 'Limit by visibility'
             optional :search, type: String, desc: 'Return list of authorized projects matching the search criteria'
diff --git a/spec/requests/api/v3/projects_spec.rb b/spec/requests/api/v3/projects_spec.rb
index af4b6f92b64..cb74868324c 100644
--- a/spec/requests/api/v3/projects_spec.rb
+++ b/spec/requests/api/v3/projects_spec.rb
@@ -124,6 +124,36 @@ describe API::V3::Projects do
         end
       end
 
+      context 'and using archived' do
+        let!(:archived_project) { create(:empty_project, creator_id: user.id, namespace: user.namespace, archived: true) }
+
+        it 'returns archived project' do
+          get v3_api('/projects?archived=true', user)
+
+          expect(response).to have_http_status(200)
+          expect(json_response).to be_an Array
+          expect(json_response.length).to eq(1)
+          expect(json_response.first['id']).to eq(archived_project.id)
+        end
+
+        it 'returns non-archived project' do
+          get v3_api('/projects?archived=false', user)
+
+          expect(response).to have_http_status(200)
+          expect(json_response).to be_an Array
+          expect(json_response.length).to eq(1)
+          expect(json_response.first['id']).to eq(project.id)
+        end
+
+        it 'returns all project' do
+          get v3_api('/projects', user)
+
+          expect(response).to have_http_status(200)
+          expect(json_response).to be_an Array
+          expect(json_response.length).to eq(2)
+        end
+      end
+
       context 'and using sorting' do
         before do
           project2
-- 
cgit v1.2.1


From e69924c4c77c49dbf4ad037046f833609dcf8122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 13 Jun 2017 11:02:33 +0200
Subject: Fix an uncaught throw in the ee_compat_check job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/ee_compat_check.rb | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 6d326ee213a..1a5887dab7e 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -76,9 +76,13 @@ module Gitlab
 
       step(
         "Generating the patch against origin/master in #{patch_path}",
-        %W[git diff --binary origin/master > #{patch_path}]
+        %w[git diff --binary origin/master...HEAD]
       ) do |output, status|
-        throw(:halt_check, :ko) unless status.zero? && File.exist?(patch_path)
+        throw(:halt_check, :ko) unless status.zero?
+
+        File.write(patch_path, output)
+
+        throw(:halt_check, :ko) unless File.exist?(patch_path)
       end
     end
 
@@ -130,7 +134,15 @@ module Gitlab
       step("Fetching CE/#{ce_branch}", %W[git fetch #{CE_REPO} #{ce_branch}])
       step(
         "Checking if #{patch_path} applies cleanly to EE/master",
-        %W[git apply --check --3way #{patch_path}]
+        # Don't use --check here because it can result in a 0-exit status even
+        # though the patch doesn't apply cleanly, e.g.:
+        #   > git apply --check --3way foo.patch
+        #   error: patch failed: lib/gitlab/ee_compat_check.rb:74
+        #   Falling back to three-way merge...
+        #   Applied patch to 'lib/gitlab/ee_compat_check.rb' with conflicts.
+        #   > echo $?
+        #   0
+        %W[git apply --3way #{patch_path}]
       ) do |output, status|
         puts output
         unless status.zero?
@@ -145,6 +157,7 @@ module Gitlab
           status = 0 if failed_files.empty?
         end
 
+        command(%w[git reset --hard])
         status
       end
     end
@@ -292,7 +305,7 @@ module Gitlab
 
           # In the CE repo
           $ git fetch origin master
-          $ git diff --binary origin/master > #{ce_branch}.patch
+          $ git diff --binary origin/master...HEAD -- > #{ce_branch}.patch
 
           # In the EE repo
           $ git fetch origin master
-- 
cgit v1.2.1


From c66fdc2bd01620d6452943b21e74f0e9f5fafa98 Mon Sep 17 00:00:00 2001
From: sytses <sytse@gitlab.com>
Date: Wed, 21 Jun 2017 11:28:26 -0700
Subject: Wording of Mysql support.

---
 doc/install/requirements.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index e5aaccdeadf..643fe5b686b 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -94,11 +94,11 @@ installation (e.g. the number of users, projects, etc).
 
 We currently support the following databases:
 
-- PostgreSQL
-- MySQL/MariaDB
+- PostgreSQL (highly recommended)
+- MySQL/MariaDB (doesn't support all features)
 
 We **highly recommend** the use of PostgreSQL instead of MySQL/MariaDB as not all
-features of GitLab may work with MySQL/MariaDB:
+features of GitLab work with MySQL/MariaDB:
 
 1. MySQL support for subgroups was [dropped with GitLab 9.3][post].
    See [issue #30472][30472] for more information.
-- 
cgit v1.2.1


From f736a03406e4e14b12f9d5d324d9b0b566a6514e Mon Sep 17 00:00:00 2001
From: Mike Greiling <mgreiling@gitlab.com>
Date: Fri, 9 Jun 2017 20:23:18 +0000
Subject: Update Dockerfile to utilize the stable release of Google Chrome 59

---
 qa/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/Dockerfile b/qa/Dockerfile
index 9e2a74ef991..9146fc7e8be 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -8,10 +8,10 @@ RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list
 RUN apt-get update && apt-get install -y wget git unzip xvfb
 
 ##
-# At this point Google Chrome Beta is 59 - first version with headless support
+# Google Chrome 59 is the first version with headless support
 #
-RUN wget -q https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb
-RUN dpkg -i google-chrome-beta_current_amd64.deb; apt-get -fy install
+RUN wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_59.0.3071.86-1_amd64.deb
+RUN dpkg -i google-chrome-stable_59.0.3071.86-1_amd64.deb; apt-get -fy install
 
 ##
 # Install chromedriver to make it work with Selenium
-- 
cgit v1.2.1


From 59d940661fe939b169a2ab7c105f410b8d53c35d Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 19 Jun 2017 11:21:36 -0500
Subject: update chrome version and chromedriver

---
 qa/Dockerfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/qa/Dockerfile b/qa/Dockerfile
index 9146fc7e8be..016dc5347bb 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,6 +1,9 @@
 FROM ruby:2.3
 LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
 
+ENV CHROME_VERSION 59.0.3071.104-1
+ENV DRIVER_VERSION 2.30
+
 ##
 # Update APT sources and install some dependencies
 #
@@ -8,15 +11,16 @@ RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list
 RUN apt-get update && apt-get install -y wget git unzip xvfb
 
 ##
-# Google Chrome 59 is the first version with headless support
+# Install Google Chrome version with headless support
 #
-RUN wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_59.0.3071.86-1_amd64.deb
-RUN dpkg -i google-chrome-stable_59.0.3071.86-1_amd64.deb; apt-get -fy install
+RUN curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
+RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -y google-chrome-stable=$CHROME_VERSION
 
 ##
 # Install chromedriver to make it work with Selenium
 #
-RUN wget -q https://chromedriver.storage.googleapis.com/2.29/chromedriver_linux64.zip
+RUN wget -q https://chromedriver.storage.googleapis.com/$DRIVER_VERSION/chromedriver_linux64.zip
 RUN unzip chromedriver_linux64.zip -d /usr/local/bin
 
 RUN apt-get clean
-- 
cgit v1.2.1


From bd12e1c85929c799885207f89ced4905184e3bb5 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 21 Jun 2017 14:15:48 -0500
Subject: rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSION

---
 qa/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/Dockerfile b/qa/Dockerfile
index 016dc5347bb..6afb614cc62 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -2,7 +2,7 @@ FROM ruby:2.3
 LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
 
 ENV CHROME_VERSION 59.0.3071.104-1
-ENV DRIVER_VERSION 2.30
+ENV CHROME_DRIVER_VERSION 2.30
 
 ##
 # Update APT sources and install some dependencies
@@ -20,7 +20,7 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -y googl
 ##
 # Install chromedriver to make it work with Selenium
 #
-RUN wget -q https://chromedriver.storage.googleapis.com/$DRIVER_VERSION/chromedriver_linux64.zip
+RUN wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip
 RUN unzip chromedriver_linux64.zip -d /usr/local/bin
 
 RUN apt-get clean
-- 
cgit v1.2.1


From bf0b233fc6bd107b08e203b601697bdee8503dcc Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 21 Jun 2017 14:17:28 -0500
Subject: add CHANGELOG.md entry for !12071

---
 ...pdate-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml

diff --git a/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml b/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml
new file mode 100644
index 00000000000..590472c0990
--- /dev/null
+++ b/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml
@@ -0,0 +1,4 @@
+---
+title: Update QA Dockerfile to lock Chrome browser version
+merge_request: 12071
+author:
-- 
cgit v1.2.1


From 929502174d99c5d2b1ccd633b0a8db91ace0e73c Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Wed, 21 Jun 2017 14:45:50 -0500
Subject: Add feature spec for dashboard state filter tabs

---
 app/views/shared/issuable/_nav.html.haml | 2 +-
 spec/features/dashboard/issues_spec.rb   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/issuable/_nav.html.haml b/app/views/shared/issuable/_nav.html.haml
index 10b8dc52c1c..3f03cc7a275 100644
--- a/app/views/shared/issuable/_nav.html.haml
+++ b/app/views/shared/issuable/_nav.html.haml
@@ -17,7 +17,7 @@
         #{issuables_state_counter_text(type, :closed)}
   - else
     %li{ class: active_when(params[:state] == 'closed') }>
-      = link_to page_filter_path(state: 'closed', label: true), id: 'state-all', title: 'Filter by issues that are currently closed.', data: { state: 'closed' } do
+      = link_to page_filter_path(state: 'closed', label: true), id: 'state-closed', title: 'Filter by issues that are currently closed.', data: { state: 'closed' } do
         #{issuables_state_counter_text(type, :closed)}
 
   %li{ class: active_when(params[:state] == 'all') }>
diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index 6f21cfd322d..a57962abbda 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -59,6 +59,11 @@ RSpec.describe 'Dashboard Issues', feature: true do
       expect(page).to have_content(other_issue.title)
     end
 
+    it 'state filter tabs work' do
+      find('#state-closed').click
+      expect(page).to have_current_path(issues_dashboard_url(assignee_id: current_user.id, scope: 'all', state: 'closed'), url: true)
+    end
+
     it_behaves_like "it has an RSS button with current_user's RSS token"
     it_behaves_like "an autodiscoverable RSS feed with current_user's RSS token"
   end
-- 
cgit v1.2.1


From 5b092d21cca71dde8f032dfcb9b7b41612a8727f Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Thu, 22 Jun 2017 01:51:46 +0200
Subject: Encode Gitaly diff patches properly

---
 lib/gitlab/git/diff.rb                    | 2 +-
 lib/gitlab/gitaly_client/diff_stitcher.rb | 5 ++++-
 spec/lib/gitlab/git/diff_spec.rb          | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb
index f825568f194..cf7829a583b 100644
--- a/lib/gitlab/git/diff.rb
+++ b/lib/gitlab/git/diff.rb
@@ -318,7 +318,7 @@ module Gitlab
       end
 
       def init_from_gitaly(diff)
-        @diff = diff.patch if diff.respond_to?(:patch)
+        @diff = encode!(diff.patch) if diff.respond_to?(:patch)
         @new_path = encode!(diff.to_path.dup)
         @old_path = encode!(diff.from_path.dup)
         @a_mode = diff.old_mode.to_s(8)
diff --git a/lib/gitlab/gitaly_client/diff_stitcher.rb b/lib/gitlab/gitaly_client/diff_stitcher.rb
index d84e8d752dc..65d81dc5d46 100644
--- a/lib/gitlab/gitaly_client/diff_stitcher.rb
+++ b/lib/gitlab/gitaly_client/diff_stitcher.rb
@@ -13,7 +13,10 @@ module Gitlab
         @rpc_response.each do |diff_msg|
           if current_diff.nil?
             diff_params = diff_msg.to_h.slice(*GitalyClient::Diff::FIELDS)
-            diff_params[:patch] = diff_msg.raw_patch_data
+            # gRPC uses frozen strings by default, and we need to have an unfrozen string as it
+            # gets processed further down the line. So we unfreeze the first chunk of the patch
+            # in case it's the only chunk we receive for this diff.
+            diff_params[:patch] = diff_msg.raw_patch_data.dup
 
             current_diff = GitalyClient::Diff.new(diff_params)
           else
diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index 5627562abfb..d50ccb0df30 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -175,6 +175,14 @@ EOT
           expect(diff).to be_too_large
         end
       end
+
+      context 'when the patch passed is not UTF-8-encoded' do
+        let(:raw_patch) { @raw_diff_hash[:diff].encode(Encoding::ASCII_8BIT) }
+
+        it 'encodes diff patch to UTF-8' do
+          expect(diff.diff.encoding).to eq(Encoding::UTF_8)
+        end
+      end
     end
   end
 
-- 
cgit v1.2.1


From b34b29907cc62b02f0a1c91ac25e25abbcadaee7 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mgreiling@gitlab.com>
Date: Thu, 22 Jun 2017 02:22:08 +0000
Subject: Resolve "MR comment + system note highlight don't have the same
 width"

---
 app/assets/stylesheets/framework/variables.scss    |  1 +
 app/assets/stylesheets/pages/note_form.scss        | 16 ++++-
 app/assets/stylesheets/pages/notes.scss            | 81 +++++++++++++---------
 app/views/shared/notes/_notes_with_form.html.haml  | 13 ++--
 ...em-note-highlight-don-t-have-the-same-width.yml |  4 ++
 5 files changed, 75 insertions(+), 40 deletions(-)
 create mode 100644 changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 71513199d84..13c9c6c9fb3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -323,6 +323,7 @@ $note-disabled-comment-color: #b2b2b2;
 $note-targe3-outside: #fffff0;
 $note-targe3-inside: #ffffd3;
 $note-line2-border: #ddd;
+$note-icon-gutter-width: 55px;
 
 
 /*
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 69fed4e6bf7..9877ed2cfd6 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -148,8 +148,20 @@
   padding: 6px 0;
 }
 
-.notes-form > li {
-  border: 0;
+.notes.notes-form > li.timeline-entry {
+  @include notes-media('max', $screen-sm-max) {
+    padding: 0;
+  }
+
+  .timeline-content {
+    @include notes-media('max', $screen-sm-max) {
+      margin: 0;
+    }
+  }
+
+  .timeline-entry-inner {
+    border: 0;
+  }
 }
 
 .note-edit-form {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index b6988c01b4a..f0dbe4249c5 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -14,16 +14,6 @@ ul.notes {
   margin: 0;
   padding: 0;
 
-  .timeline-content {
-    margin-left: 55px;
-
-    &.timeline-content-form {
-      @include notes-media('max', $screen-sm-max) {
-        margin-left: 0;
-      }
-    }
-  }
-
   .note-created-ago,
   .note-updated-at {
     white-space: nowrap;
@@ -46,17 +36,49 @@ ul.notes {
     }
   }
 
-  > li {
-    padding: $gl-padding $gl-btn-padding;
+  > li { // .timeline-entry
+    padding: 0;
     display: block;
     position: relative;
-    border-bottom: 1px solid $white-normal;
+    border-bottom: 0;
+
+    @include notes-media('min', $screen-sm-min) {
+      padding-left: $note-icon-gutter-width;
+    }
 
-    &:last-child {
-      // Override `.timeline > li:last-child { border-bottom: none; }`
+    .timeline-entry-inner {
+      padding: $gl-padding $gl-btn-padding;
       border-bottom: 1px solid $white-normal;
     }
 
+    &:target,
+    &.target {
+      border-bottom: 1px solid $white-normal;
+
+      &:not(:first-child) {
+        border-top: 1px solid $white-normal;
+        margin-top: -1px;
+      }
+
+      .timeline-entry-inner {
+        border-bottom: 0;
+      }
+    }
+
+    .timeline-icon {
+      @include notes-media('min', $screen-sm-min) {
+        margin-left: -$note-icon-gutter-width;
+      }
+    }
+
+    .timeline-content {
+      margin-left: $note-icon-gutter-width;
+
+      @include notes-media('min', $screen-sm-min) {
+        margin-left: 0;
+      }
+    }
+
     &.being-posted {
       pointer-events: none;
       opacity: 0.5;
@@ -73,7 +95,7 @@ ul.notes {
     }
 
     &.note-discussion {
-      &.timeline-entry {
+      .timeline-entry-inner {
         padding: $gl-padding 10px;
       }
     }
@@ -152,13 +174,8 @@ ul.notes {
 
   .system-note {
     font-size: 14px;
-    padding-left: 0;
     clear: both;
 
-    @include notes-media('min', $screen-sm-min) {
-      margin-left: 65px;
-    }
-
     .note-header-info {
       padding-bottom: 0;
     }
@@ -192,13 +209,16 @@ ul.notes {
     .timeline-icon {
       float: left;
 
+      @include notes-media('min', $screen-sm-min) {
+        margin-left: 0;
+        width: auto;
+      }
+
       svg {
         width: 16px;
         height: 16px;
         fill: $gray-darkest;
-        position: absolute;
-        left: 0;
-        top: 2px;
+        margin-top: 2px;
       }
     }
 
@@ -639,15 +659,12 @@ ul.notes {
 .discussion-body,
 .diff-file {
   .notes .note {
-    padding-left: $gl-padding;
-    padding-right: $gl-padding;
-
-    &.system-note {
-      padding-left: 0;
+    border-bottom: 1px solid $white-normal;
 
-      @media (min-width: $screen-sm-min) {
-        margin-left: 70px;
-      }
+    .timeline-entry-inner {
+      padding-left: $gl-padding;
+      padding-right: $gl-padding;
+      border-bottom: none;
     }
   }
 }
diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml
index 0cca8d875d2..f0fcc414756 100644
--- a/app/views/shared/notes/_notes_with_form.html.haml
+++ b/app/views/shared/notes/_notes_with_form.html.haml
@@ -6,13 +6,14 @@
 - if can_create_note?
   %ul.notes.notes-form.timeline
     %li.timeline-entry
-      .flash-container.timeline-content
+      .timeline-entry-inner
+        .flash-container.timeline-content
 
-      .timeline-icon.hidden-xs.hidden-sm
-        %a.author_link{ href: user_path(current_user) }
-          = image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40'
-      .timeline-content.timeline-content-form
-        = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete
+        .timeline-icon.hidden-xs.hidden-sm
+          %a.author_link{ href: user_path(current_user) }
+            = image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40'
+        .timeline-content.timeline-content-form
+          = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete
 - elsif !current_user
   .disabled-comment.text-center.prepend-top-default
     Please
diff --git a/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml b/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml
new file mode 100644
index 00000000000..f3b92878f6d
--- /dev/null
+++ b/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml
@@ -0,0 +1,4 @@
+---
+title: Standardize timeline note margins across different viewport sizes
+merge_request: 12364
+author:
-- 
cgit v1.2.1


From ece7a3cfdcb0923831bc9ebd7aaf52a9763c1613 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Thu, 22 Jun 2017 13:28:11 +1100
Subject: Replace 'profile/notifications.feature' spinach test with an rspec
 analog

---
 ...e_spinach_spec_profile_notifications-feature.yml |  4 ++++
 features/profile/notifications.feature              | 15 ---------------
 .../profiles/user_visits_notifications_tab_spec.rb  | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 changelogs/unreleased/replace_spinach_spec_profile_notifications-feature.yml
 delete mode 100644 features/profile/notifications.feature
 create mode 100644 spec/features/profiles/user_visits_notifications_tab_spec.rb

diff --git a/changelogs/unreleased/replace_spinach_spec_profile_notifications-feature.yml b/changelogs/unreleased/replace_spinach_spec_profile_notifications-feature.yml
new file mode 100644
index 00000000000..38227ebfa7a
--- /dev/null
+++ b/changelogs/unreleased/replace_spinach_spec_profile_notifications-feature.yml
@@ -0,0 +1,4 @@
+---
+title: Replace 'profile/notifications.feature' spinach test with an rspec analog
+merge_request: 12345
+author: @blackst0ne
diff --git a/features/profile/notifications.feature b/features/profile/notifications.feature
deleted file mode 100644
index ef8743932f5..00000000000
--- a/features/profile/notifications.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-@profile
-Feature: Profile Notifications
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-
-  Scenario: I visit notifications tab
-    When I visit profile notifications page
-    Then I should see global notifications settings
-
-  @javascript
-  Scenario: I edit Project Notifications
-    Given I visit profile notifications page
-    When I select Mention setting from dropdown
-    Then I should see Notification saved message
diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb
new file mode 100644
index 00000000000..e98cec79d87
--- /dev/null
+++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+feature 'User visits the notifications tab', js: true do
+  let(:project) { create(:empty_project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    sign_in(user)
+    visit(profile_notifications_path)
+  end
+
+  it 'changes the project notifications setting' do
+    expect(page).to have_content('Notifications')
+
+    first('#notifications-button').trigger('click')
+    click_link('On mention')
+
+    expect(page).to have_content('On mention')
+  end
+end
-- 
cgit v1.2.1


From af5bf71365712f1102eccc22aa3af0c4b5c1860d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 21 Jun 2017 21:38:16 -0500
Subject: Don't reset the session when the example failed, because we need
 capybara-screenshot to have access to it

---
 spec/support/capybara.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 4aa81a03558..3e5d6cf1364 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -36,12 +36,13 @@ RSpec.configure do |config|
     $capybara_server_already_started = true
   end
 
-  config.after(:each, :js) do
+  config.after(:each, :js) do |example|
     # capybara/rspec already calls Capybara.reset_sessions! in an `after` hook,
     # but `block_and_wait_for_requests_complete` is called before it so by
     # calling it explicitely here, we prevent any new requests from being fired
     # See https://github.com/teamcapybara/capybara/blob/ffb41cfad620de1961bb49b1562a9fa9b28c0903/lib/capybara/rspec.rb#L20-L25
-    Capybara.reset_sessions!
+    # We don't reset the session when the example failed, because we need capybara-screenshot to have access to it.
+    Capybara.reset_sessions! unless example.exception
     block_and_wait_for_requests_complete
   end
 end
-- 
cgit v1.2.1


From 54168362d1a352faf18cca9e0e336ffc413e0261 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 22 Jun 2017 10:34:15 +1000
Subject: don't show "Someone edited the issue" warning when saving issue

don't need to check for form visible because error message isn't rendered otherwise
---
 app/assets/javascripts/issue_show/components/app.vue |  6 ------
 app/assets/javascripts/issue_show/stores/index.js    | 10 ++++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index 8473a81bc88..3d5fb7f441c 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -204,13 +204,7 @@ export default {
       method: 'getData',
       successCallback: (res) => {
         const data = res.json();
-        const shouldUpdate = this.store.stateShouldUpdate(data);
-
         this.store.updateState(data);
-
-        if (this.showForm && (shouldUpdate.title || shouldUpdate.description)) {
-          this.store.formState.lockedWarningVisible = true;
-        }
       },
       errorCallback(err) {
         throw new Error(err);
diff --git a/app/assets/javascripts/issue_show/stores/index.js b/app/assets/javascripts/issue_show/stores/index.js
index f2b822f3cbb..0c8bd6f1cc3 100644
--- a/app/assets/javascripts/issue_show/stores/index.js
+++ b/app/assets/javascripts/issue_show/stores/index.js
@@ -12,6 +12,10 @@ export default class Store {
   }
 
   updateState(data) {
+    if (this.stateShouldUpdate(data)) {
+      this.formState.lockedWarningVisible = true;
+    }
+
     this.state.titleHtml = data.title;
     this.state.titleText = data.title_text;
     this.state.descriptionHtml = data.description;
@@ -23,10 +27,8 @@ export default class Store {
   }
 
   stateShouldUpdate(data) {
-    return {
-      title: this.state.titleText !== data.title_text,
-      description: this.state.descriptionText !== data.description_text,
-    };
+    return this.state.titleText !== data.title_text ||
+      this.state.descriptionText !== data.description_text;
   }
 
   setFormState(state) {
-- 
cgit v1.2.1


From 07742c02545c6ed725779e91fef73a96974be0b1 Mon Sep 17 00:00:00 2001
From: winh <winnie@gitlab.com>
Date: Tue, 13 Jun 2017 13:48:13 +0200
Subject: Add failing test for #32987

---
 .../components/mr_widget_pipeline_spec.js             | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
index 647b59520f8..0ffa4ac46e3 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
@@ -76,6 +76,25 @@ describe('MRWidgetPipeline', () => {
       el = vm.$el;
     });
 
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    describe('without a pipeline', () => {
+      beforeEach(() => {
+        vm.mr = { pipeline: null };
+      });
+
+      it('should render message with spinner', (done) => {
+        Vue.nextTick(() => {
+          expect(el.querySelector('.pipeline-id')).toBe(null);
+          expect(el.innerText.trim()).toBe('Waiting for pipeline...');
+          expect(el.querySelectorAll('i.fa.fa-spinner.fa-spin').length).toBe(1);
+          done();
+        });
+      });
+    });
+
     it('should render template elements correctly', () => {
       expect(el.classList.contains('mr-widget-heading')).toBeTruthy();
       expect(el.querySelectorAll('.ci-status-icon.ci-status-icon-success').length).toEqual(1);
-- 
cgit v1.2.1


From a8b16226324c43f080676c76dd183ee8899e847a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 22 Jun 2017 08:19:04 +0000
Subject: File view buttons

---
 app/assets/stylesheets/pages/projects.scss        |   2 +-
 app/assets/stylesheets/pages/tree.scss            |  85 ++++++++++---
 app/views/projects/_find_file_link.html.haml      |   2 +-
 app/views/projects/blob/_breadcrumb.html.haml     |  35 +++---
 app/views/projects/tree/_tree_header.html.haml    | 146 +++++++++++-----------
 changelogs/unreleased/25102-files-view-button.yml |   4 +
 6 files changed, 166 insertions(+), 108 deletions(-)
 create mode 100644 changelogs/unreleased/25102-files-view-button.yml

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 062665bc634..562ecbc6986 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -380,7 +380,7 @@ a.deploy-project-label {
   padding: 0;
   background: transparent;
   border: none;
-  line-height: 36px;
+  line-height: 34px;
   margin: 0;
 
   > li + li::before {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index ab63225147f..ce1a13c6afa 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,6 +1,72 @@
 .tree-holder {
-  > .nav-block {
-    margin: 11px 0;
+  .nav-block {
+    margin: 10px 0;
+
+    @media (min-width: $screen-sm-min) {
+      display: flex;
+
+      .tree-ref-container {
+        flex: 1;
+      }
+
+      .tree-controls {
+        text-align: right;
+
+        .btn-group {
+          margin-left: 10px;
+        }
+      }
+
+      .tree-ref-holder {
+        float: left;
+        margin-right: 15px;
+      }
+
+      .repo-breadcrumb {
+        li:last-of-type {
+          position: relative;
+        }
+      }
+
+      .add-to-tree-dropdown {
+        position: absolute;
+        left: 18px;
+      }
+    }
+  }
+
+  @media (max-width: $screen-xs-max) {
+    .repo-breadcrumb {
+      margin-top: 10px;
+      position: relative;
+
+      .dropdown-menu {
+        min-width: 100%;
+        width: 100%;
+        left: inherit;
+        right: 0;
+      }
+    }
+
+    .add-to-tree-dropdown {
+      position: absolute;
+      left: 0;
+      right: 0;
+    }
+
+    .tree-controls {
+      margin-bottom: 10px;
+
+      .btn,
+      .dropdown,
+      .btn-group {
+        width: 100%;
+      }
+
+      .btn {
+        margin: 10px 0 0;
+      }
+    }
   }
 
   .file-finder {
@@ -131,11 +197,6 @@
   }
 }
 
-.tree-ref-holder {
-  float: left;
-  margin-right: 15px;
-}
-
 .blob-commit-info {
   list-style: none;
   margin: 0;
@@ -159,16 +220,6 @@
   color: $md-link-color;
 }
 
-.tree-controls {
-  float: right;
-  position: relative;
-  z-index: 2;
-
-  .project-action-button {
-    margin-left: $btn-side-margin;
-  }
-}
-
 .repo-charts {
   .sub-header {
     margin: 20px 0;
diff --git a/app/views/projects/_find_file_link.html.haml b/app/views/projects/_find_file_link.html.haml
index c748ccf65e6..cb4d2bbacf5 100644
--- a/app/views/projects/_find_file_link.html.haml
+++ b/app/views/projects/_find_file_link.html.haml
@@ -1,3 +1,3 @@
-= link_to namespace_project_find_file_path(@project.namespace, @project, @ref), class: 'btn btn-grouped shortcuts-find-file', rel: 'nofollow' do
+= link_to namespace_project_find_file_path(@project.namespace, @project, @ref), class: 'btn shortcuts-find-file', rel: 'nofollow' do
   = icon('search')
   %span= _('Find file')
diff --git a/app/views/projects/blob/_breadcrumb.html.haml b/app/views/projects/blob/_breadcrumb.html.haml
index 0ad9f258e48..5840e9863f4 100644
--- a/app/views/projects/blob/_breadcrumb.html.haml
+++ b/app/views/projects/blob/_breadcrumb.html.haml
@@ -1,9 +1,26 @@
 - blame = local_assigns.fetch(:blame, false)
 .nav-block
+  .tree-ref-container
+    .tree-ref-holder
+      = render 'shared/ref_switcher', destination: 'blob', path: @path
+
+    %ul.breadcrumb.repo-breadcrumb
+      %li
+        = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
+          = @project.path
+      - path_breadcrumbs do |title, path|
+        - title = truncate(title, length: 40)
+        %li
+          - if path == @path
+            = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, path)) do
+              %strong= title
+          - else
+            = link_to title, namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
+
   .tree-controls
     = render 'projects/find_file_link'
 
-    .btn-group.prepend-left-10{ role: "group" }<
+    .btn-group{ role: "group" }<
       -# only show normal/blame view links for text files
       - if blob.readable_text?
         - if blame
@@ -18,19 +35,3 @@
 
       = link_to 'Permalink', namespace_project_blob_path(@project.namespace, @project,
           tree_join(@commit.sha, @path)), class: 'btn js-data-file-blob-permalink-url'
-
-  .tree-ref-holder
-    = render 'shared/ref_switcher', destination: 'blob', path: @path
-
-  %ul.breadcrumb.repo-breadcrumb
-    %li
-      = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
-        = @project.path
-    - path_breadcrumbs do |title, path|
-      - title = truncate(title, length: 40)
-      %li
-        - if path == @path
-          = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, path)) do
-            %strong= title
-        - else
-          = link_to title, namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index abde2a48587..00da76349da 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -1,79 +1,81 @@
-.tree-controls
-  = render 'projects/find_file_link'
-
-  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn btn-grouped'
-
-  = render 'projects/buttons/download', project: @project, ref: @ref
+.tree-ref-container
+  .tree-ref-holder
+    = render 'shared/ref_switcher', destination: 'tree', path: @path
 
-.tree-ref-holder
-  = render 'shared/ref_switcher', destination: 'tree', path: @path
-
-%ul.breadcrumb.repo-breadcrumb
-  %li
-    = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
-      = @project.path
-  - path_breadcrumbs do |title, path|
+  %ul.breadcrumb.repo-breadcrumb
     %li
-      = link_to truncate(title, length: 40), namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
+      = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
+        = @project.path
+    - path_breadcrumbs do |title, path|
+      %li
+        = link_to truncate(title, length: 40), namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
 
-  - if current_user
-    %li
-      - if !on_top_of_branch?
-        %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
-          = icon('plus')
-      - else
-        %span.dropdown
-          %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown" }
+    - if current_user
+      %li
+        - if !on_top_of_branch?
+          %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
             = icon('plus')
-          %ul.dropdown-menu
-            - if can_edit_tree?
-              %li
-                = link_to namespace_project_new_blob_path(@project.namespace, @project, @id) do
-                  = icon('pencil fw')
-                  #{ _('New file') }
-              %li
-                = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do
-                  = icon('file fw')
-                  #{ _('Upload file') }
-              %li
-                = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do
-                  = icon('folder fw')
-                  #{ _('New directory') }
-            - elsif can?(current_user, :fork_project, @project)
-              %li
-                - continue_params = { to:         namespace_project_new_blob_path(@project.namespace, @project, @id),
-                                      notice:     edit_in_new_fork_notice,
-                                      notice_now: edit_in_new_fork_notice_now }
-                - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
-                                                                                        continue:       continue_params)
-                = link_to fork_path, method: :post do
-                  = icon('pencil fw')
-                  #{ _('New file') }
+        - else
+          %span.dropdown
+            %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown", "data-target" => ".add-to-tree-dropdown" }
+              = icon('plus')
+          .add-to-tree-dropdown
+            %ul.dropdown-menu
+              - if can_edit_tree?
+                %li
+                  = link_to namespace_project_new_blob_path(@project.namespace, @project, @id) do
+                    = icon('pencil fw')
+                    #{ _('New file') }
+                %li
+                  = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do
+                    = icon('file fw')
+                    #{ _('Upload file') }
+                %li
+                  = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do
+                    = icon('folder fw')
+                    #{ _('New directory') }
+              - elsif can?(current_user, :fork_project, @project)
+                %li
+                  - continue_params = { to:         namespace_project_new_blob_path(@project.namespace, @project, @id),
+                                        notice:     edit_in_new_fork_notice,
+                                        notice_now: edit_in_new_fork_notice_now }
+                  - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
+                                                                                          continue:       continue_params)
+                  = link_to fork_path, method: :post do
+                    = icon('pencil fw')
+                    #{ _('New file') }
+                %li
+                  - continue_params = { to:         request.fullpath,
+                                        notice:     edit_in_new_fork_notice + " Try to upload a file again.",
+                                        notice_now: edit_in_new_fork_notice_now }
+                  - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
+                                                                                          continue:       continue_params)
+                  = link_to fork_path, method: :post do
+                    = icon('file fw')
+                    #{ _('Upload file') }
+                %li
+                  - continue_params = { to:         request.fullpath,
+                                        notice:     edit_in_new_fork_notice + " Try to create a new directory again.",
+                                        notice_now: edit_in_new_fork_notice_now }
+                  - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
+                                                                                          continue:       continue_params)
+                  = link_to fork_path, method: :post do
+                    = icon('folder fw')
+                    #{ _('New directory') }
+
+              %li.divider
               %li
-                - continue_params = { to:         request.fullpath,
-                                      notice:     edit_in_new_fork_notice + " Try to upload a file again.",
-                                      notice_now: edit_in_new_fork_notice_now }
-                - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
-                                                                                        continue:       continue_params)
-                = link_to fork_path, method: :post do
-                  = icon('file fw')
-                  #{ _('Upload file') }
+                = link_to new_namespace_project_branch_path(@project.namespace, @project) do
+                  = icon('code-fork fw')
+                  #{ _('New branch') }
               %li
-                - continue_params = { to:         request.fullpath,
-                                      notice:     edit_in_new_fork_notice + " Try to create a new directory again.",
-                                      notice_now: edit_in_new_fork_notice_now }
-                - fork_path = namespace_project_forks_path(@project.namespace, @project, namespace_key:  current_user.namespace.id,
-                                                                                        continue:       continue_params)
-                = link_to fork_path, method: :post do
-                  = icon('folder fw')
-                  #{ _('New directory') }
+                = link_to new_namespace_project_tag_path(@project.namespace, @project) do
+                  = icon('tags fw')
+                  #{ _('New tag') }
+
+.tree-controls
+  = render 'projects/find_file_link'
 
-            %li.divider
-            %li
-              = link_to new_namespace_project_branch_path(@project.namespace, @project) do
-                = icon('code-fork fw')
-                #{ _('New branch') }
-            %li
-              = link_to new_namespace_project_tag_path(@project.namespace, @project) do
-                = icon('tags fw')
-                #{ _('New tag') }
+  = link_to s_('Commits|History'), namespace_project_commits_path(@project.namespace, @project, @id), class: 'btn'
+
+  = render 'projects/buttons/download', project: @project, ref: @ref
diff --git a/changelogs/unreleased/25102-files-view-button.yml b/changelogs/unreleased/25102-files-view-button.yml
new file mode 100644
index 00000000000..4ba815d9464
--- /dev/null
+++ b/changelogs/unreleased/25102-files-view-button.yml
@@ -0,0 +1,4 @@
+---
+title: Fix mobile view of files view buttons
+merge_request:
+author:
-- 
cgit v1.2.1


From 2cf075596ea4b6a918e5e50a932bd857487ceb45 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Jun 2017 17:17:16 +0100
Subject: Added internationalization to commits list

Closes #32793
---
 app/assets/javascripts/locale/es/app.js       |  2 +-
 app/helpers/commits_helper.rb                 |  6 ++---
 app/views/projects/commits/_commits.html.haml |  6 ++---
 app/views/projects/commits/show.html.haml     | 10 +++----
 locale/es/gitlab.po                           | 38 +++++++++++++++++++++++----
 locale/gitlab.pot                             | 32 ++++++++++++++++++++--
 6 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/locale/es/app.js b/app/assets/javascripts/locale/es/app.js
index eafcd15acf9..8d951928849 100644
--- a/app/assets/javascripts/locale/es/app.js
+++ b/app/assets/javascripts/locale/es/app.js
@@ -1 +1 @@
-var locales = locales || {}; locales['es'] = {"domain":"app","locale_data":{"app":{"":{"Project-Id-Version":"gitlab 1.0.0","Report-Msgid-Bugs-To":"","PO-Revision-Date":"2017-06-15 21:59-0500","Language-Team":"Spanish","Language":"es","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Plural-Forms":"nplurals=2; plural=n != 1;","Last-Translator":"Bob Van Landuyt <bob@gitlab.com>","X-Generator":"Poedit 2.0.2","POT-Creation-Date":"2017-06-15 21:59-0500","lang":"es","domain":"app","plural_forms":"nplurals=2; plural=n != 1;"},"%{commit_author_link} committed %{commit_timeago}":["%{commit_author_link} cambió %{commit_timeago}"],"About auto deploy":["Acerca del auto despliegue"],"Active":["Activo"],"Activity":["Actividad"],"Add Changelog":["Agregar Changelog"],"Add Contribution guide":["Agregar guía de contribución"],"Add License":["Agregar Licencia"],"Add an SSH key to your profile to pull or push via SSH.":["Agregar una clave SSH a tu perfil para actualizar o enviar a través de SSH."],"Add new directory":["Agregar nuevo directorio"],"Archived project! Repository is read-only":["¡Proyecto archivado! El repositorio es de solo lectura"],"Are you sure you want to delete this pipeline schedule?":["¿Estás seguro que deseas eliminar esta programación del pipeline?"],"Attach a file by drag &amp; drop or %{upload_link}":["Adjunte un archivo arrastrando &amp; soltando o %{upload_link}"],"Branch":["Rama","Ramas"],"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}":["La rama <strong>%{branch_name}</strong> fue creada. Para configurar el auto despliegue, escoge una plantilla Yaml para GitLab CI y envía tus cambios. %{link_to_autodeploy_doc}"],"Branches":["Ramas"],"Browse files":["Examinar los archivos"],"ByAuthor|by":["por"],"CI configuration":["Configuración de CI"],"Cancel":["Cancelar"],"ChangeTypeActionLabel|Pick into branch":["Escoger en la rama"],"ChangeTypeActionLabel|Revert in branch":["Revertir en la rama"],"ChangeTypeAction|Cherry-pick":["Cherry-pick"],"ChangeTypeAction|Revert":["Revertir"],"Changelog":["Changelog"],"Charts":["Gráficos"],"Cherry-pick this commit":["Escoger este cambio"],"Cherry-pick this merge request":["Escoger esta solicitud de fusión"],"CiStatusLabel|canceled":["cancelado"],"CiStatusLabel|created":["creado"],"CiStatusLabel|failed":["fallido"],"CiStatusLabel|manual action":["acción manual"],"CiStatusLabel|passed":["pasó"],"CiStatusLabel|passed with warnings":["pasó con advertencias"],"CiStatusLabel|pending":["pendiente"],"CiStatusLabel|skipped":["omitido"],"CiStatusLabel|waiting for manual action":["esperando acción manual"],"CiStatusText|blocked":["bloqueado"],"CiStatusText|canceled":["cancelado"],"CiStatusText|created":["creado"],"CiStatusText|failed":["fallado"],"CiStatusText|manual":["manual"],"CiStatusText|passed":["pasó"],"CiStatusText|pending":["pendiente"],"CiStatusText|skipped":["omitido"],"CiStatus|running":["en ejecución"],"Commit":["Cambio","Cambios"],"Commit message":["Mensaje del cambio"],"CommitBoxTitle|Commit":["Cambio"],"CommitMessage|Add %{file_name}":["Agregar %{file_name}"],"Commits":["Cambios"],"Commits|History":["Historial"],"Committed by":["Enviado por"],"Compare":["Comparar"],"Contribution guide":["Guía de contribución"],"Contributors":["Contribuidores"],"Copy URL to clipboard":["Copiar URL al portapapeles"],"Copy commit SHA to clipboard":["Copiar SHA del cambio al portapapeles"],"Create New Directory":["Crear Nuevo Directorio"],"Create directory":["Crear directorio"],"Create empty bare repository":["Crear repositorio vacío"],"Create merge request":["Crear solicitud de fusión"],"Create new...":["Crear nuevo..."],"CreateNewFork|Fork":["Bifurcar"],"CreateTag|Tag":["Etiqueta"],"Cron Timezone":["Zona horaria del Cron"],"Cron syntax":["Sintaxis de Cron"],"Custom notification events":["Eventos de notificaciones personalizadas"],"Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out %{notification_link}.":["Los niveles de notificación personalizados son los mismos que los niveles participantes. Con los niveles de notificación personalizados, también recibirá notificaciones para eventos seleccionados. Para obtener más información, consulte %{notification_link}."],"Cycle Analytics":["Cycle Analytics"],"Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.":["Cycle Analytics ofrece una visión general de cuánto tiempo tarda en pasar de idea a producción en su proyecto."],"CycleAnalyticsStage|Code":["Código"],"CycleAnalyticsStage|Issue":["Incidencia"],"CycleAnalyticsStage|Plan":["Planificación"],"CycleAnalyticsStage|Production":["Producción"],"CycleAnalyticsStage|Review":["Revisión"],"CycleAnalyticsStage|Staging":["Puesta en escena"],"CycleAnalyticsStage|Test":["Pruebas"],"Define a custom pattern with cron syntax":["Definir un patrón personalizado con la sintaxis de cron"],"Delete":["Eliminar"],"Deploy":["Despliegue","Despliegues"],"Description":["Descripción"],"Directory name":["Nombre del directorio"],"Don't show again":["No mostrar de nuevo"],"Download":["Descargar"],"Download tar":["Descargar tar"],"Download tar.bz2":["Descargar tar.bz2"],"Download tar.gz":["Descargar tar.gz"],"Download zip":["Descargar zip"],"DownloadArtifacts|Download":["Descargar"],"DownloadCommit|Email Patches":["Parches por correo electrónico"],"DownloadCommit|Plain Diff":["Diferencias en texto plano"],"DownloadSource|Download":["Descargar"],"Edit":["Editar"],"Edit Pipeline Schedule %{id}":["Editar Programación del Pipeline %{id}"],"Every day (at 4:00am)":["Todos los días (a las 4:00 am)"],"Every month (on the 1st at 4:00am)":["Todos los meses (el día 1 a las 4:00 am)"],"Every week (Sundays at 4:00am)":["Todas las semanas (domingos a las 4:00 am)"],"Failed to change the owner":["Error al cambiar el propietario"],"Failed to remove the pipeline schedule":["Error al eliminar la programación del pipeline"],"Files":["Archivos"],"Find by path":["Buscar por ruta"],"Find file":["Buscar archivo"],"FirstPushedBy|First":["Primer"],"FirstPushedBy|pushed by":["enviado por"],"Fork":["Bifurcación","Bifurcaciones"],"ForkedFromProjectPath|Forked from":["Bifurcado de"],"From issue creation until deploy to production":["Desde la creación de la incidencia hasta el despliegue a producción"],"From merge request merge until deploy to production":["Desde la integración de la solicitud de fusión hasta el despliegue a producción"],"Go to your fork":["Ir a tu bifurcación"],"GoToYourFork|Fork":["Bifurcación"],"Home":["Inicio"],"Housekeeping successfully started":["Servicio de limpieza iniciado con éxito"],"Import repository":["Importar repositorio"],"Interval Pattern":["Patrón de intervalo"],"Introducing Cycle Analytics":["Introducción a Cycle Analytics"],"LFSStatus|Disabled":["Deshabilitado"],"LFSStatus|Enabled":["Habilitado"],"Last %d day":["Último %d día","Últimos %d días"],"Last Pipeline":["Último Pipeline"],"Last Update":["Última actualización"],"Last commit":["Último cambio"],"Learn more in the":["Más información en la"],"Learn more in the|pipeline schedules documentation":["documentación sobre la programación de pipelines"],"Leave group":["Abandonar grupo"],"Leave project":["Abandonar proyecto"],"Limited to showing %d event at most":["Limitado a mostrar máximo %d evento","Limitado a mostrar máximo %d eventos"],"Median":["Mediana"],"MissingSSHKeyWarningLink|add an SSH key":["agregar una clave SSH"],"New Issue":["Nueva incidencia","Nuevas incidencias"],"New Pipeline Schedule":["Nueva Programación del Pipeline"],"New branch":["Nueva rama"],"New directory":["Nuevo directorio"],"New file":["Nuevo archivo"],"New issue":["Nueva incidencia"],"New merge request":["Nueva solicitud de fusión"],"New schedule":["Nueva programación"],"New snippet":["Nuevo fragmento de código"],"New tag":["Nueva etiqueta"],"No repository":["No hay repositorio"],"No schedules":["No hay programaciones"],"Not available":["No disponible"],"Not enough data":["No hay suficientes datos"],"Notification events":["Eventos de notificación"],"NotificationEvent|Close issue":["Cerrar incidencia"],"NotificationEvent|Close merge request":["Cerrar solicitud de fusión"],"NotificationEvent|Failed pipeline":["Pipeline fallido"],"NotificationEvent|Merge merge request":["Integrar solicitud de fusión"],"NotificationEvent|New issue":["Nueva incidencia"],"NotificationEvent|New merge request":["Nueva solicitud de fusión"],"NotificationEvent|New note":["Nueva nota"],"NotificationEvent|Reassign issue":["Reasignar incidencia"],"NotificationEvent|Reassign merge request":["Reasignar solicitud de fusión"],"NotificationEvent|Reopen issue":["Reabrir incidencia"],"NotificationEvent|Successful pipeline":["Pipeline exitoso"],"NotificationLevel|Custom":["Personalizado"],"NotificationLevel|Disabled":["Deshabilitado"],"NotificationLevel|Global":["Global"],"NotificationLevel|On mention":["Cuando me mencionan"],"NotificationLevel|Participate":["Participación"],"NotificationLevel|Watch":["Vigilancia"],"OfSearchInADropdown|Filter":["Filtrar"],"OpenedNDaysAgo|Opened":["Abierto"],"Options":["Opciones"],"Owner":["Propietario"],"Pipeline":["Pipeline"],"Pipeline Health":["Estado del Pipeline"],"Pipeline Schedule":["Programación del Pipeline"],"Pipeline Schedules":["Programaciones de los Pipelines"],"PipelineSchedules|Activated":["Activado"],"PipelineSchedules|Active":["Activos"],"PipelineSchedules|All":["Todos"],"PipelineSchedules|Inactive":["Inactivos"],"PipelineSchedules|Next Run":["Próxima Ejecución"],"PipelineSchedules|None":["Ninguno"],"PipelineSchedules|Provide a short description for this pipeline":["Proporcione una breve descripción para este pipeline"],"PipelineSchedules|Take ownership":["Tomar posesión"],"PipelineSchedules|Target":["Destino"],"PipelineSheduleIntervalPattern|Custom":["Personalizado"],"Pipeline|with stage":["con etapa"],"Pipeline|with stages":["con etapas"],"Project '%{project_name}' queued for deletion.":["Proyecto ‘%{project_name}’ en cola para eliminación."],"Project '%{project_name}' was successfully created.":["Proyecto ‘%{project_name}’ fue creado satisfactoriamente."],"Project '%{project_name}' was successfully updated.":["Proyecto ‘%{project_name}’ fue actualizado satisfactoriamente."],"Project '%{project_name}' will be deleted.":["Proyecto ‘%{project_name}’ será eliminado."],"Project access must be granted explicitly to each user.":["El acceso al proyecto debe concederse explícitamente a cada usuario."],"Project export could not be deleted.":["No se pudo eliminar la exportación del proyecto."],"Project export has been deleted.":["La exportación del proyecto ha sido eliminada."],"Project export link has expired. Please generate a new export from your project settings.":["El enlace de exportación del proyecto ha caducado. Por favor, genera una nueva exportación desde la configuración del proyecto."],"Project export started. A download link will be sent by email.":["Se inició la exportación del proyecto. Se enviará un enlace de descarga por correo electrónico."],"Project home":["Inicio del proyecto"],"ProjectFeature|Disabled":["Deshabilitada"],"ProjectFeature|Everyone with access":["Todos con acceso"],"ProjectFeature|Only team members":["Solo miembros del equipo"],"ProjectFileTree|Name":["Nombre"],"ProjectLastActivity|Never":["Nunca"],"ProjectLifecycle|Stage":["Etapa"],"ProjectNetworkGraph|Graph":["Historial gráfico"],"Read more":["Leer más"],"Readme":["Léeme"],"RefSwitcher|Branches":["Ramas"],"RefSwitcher|Tags":["Etiquetas"],"Related Commits":["Cambios Relacionados"],"Related Deployed Jobs":["Trabajos Desplegados Relacionados"],"Related Issues":["Incidencias Relacionadas"],"Related Jobs":["Trabajos Relacionados"],"Related Merge Requests":["Solicitudes de fusión Relacionadas"],"Related Merged Requests":["Solicitudes de fusión Relacionadas"],"Remind later":["Recordar después"],"Remove project":["Eliminar proyecto"],"Request Access":["Solicitar acceso"],"Revert this commit":["Revertir este cambio"],"Revert this merge request":["Revertir esta solicitud de fusión"],"Save pipeline schedule":["Guardar programación del pipeline"],"Schedule a new pipeline":["Programar un nuevo pipeline"],"Scheduling Pipelines":["Programación de Pipelines"],"Search branches and tags":["Buscar ramas y etiquetas"],"Select Archive Format":["Seleccionar formato de archivo"],"Select a timezone":["Selecciona una zona horaria"],"Select target branch":["Selecciona una rama de destino"],"Set a password on your account to pull or push via %{protocol}":["Establezca una contraseña en su cuenta para actualizar o enviar a través de %{protocol}"],"Set up CI":["Configurar CI"],"Set up Koding":["Configurar Koding"],"Set up auto deploy":["Configurar auto despliegue"],"SetPasswordToCloneLink|set a password":["establecer una contraseña"],"Showing %d event":["Mostrando %d evento","Mostrando %d eventos"],"Source code":["Código fuente"],"StarProject|Star":["Destacar"],"Start a %{new_merge_request} with these changes":["Iniciar una %{new_merge_request} con estos cambios"],"Switch branch/tag":["Cambiar rama/etiqueta"],"Tag":["Etiqueta","Etiquetas"],"Tags":["Etiquetas"],"Target Branch":["Rama de destino"],"The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.":["La etapa de desarrollo muestra el tiempo desde el primer cambio hasta la creación de la solicitud de fusión. Los datos serán automáticamente incorporados aquí una vez creada tu primera solicitud de fusión."],"The collection of events added to the data gathered for that stage.":["La colección de eventos agregados a los datos recopilados para esa etapa."],"The fork relationship has been removed.":["La relación con la bifurcación se ha eliminado."],"The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.":["La etapa de incidencia muestra el tiempo que toma desde la creación de un tema hasta asignar el tema a un hito, o añadir el tema a una lista en el panel de temas. Empieza a crear temas para ver los datos de esta etapa."],"The phase of the development lifecycle.":["La etapa del ciclo de vida de desarrollo."],"The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user.":["La programación de pipelines ejecuta pipelines en el futuro, repetidamente, para ramas o etiquetas específicas. Los pipelines programados heredarán acceso limitado al proyecto basado en su usuario asociado."],"The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.":["La etapa de planificación muestra el tiempo desde el paso anterior hasta el envío de tu primera confirmación. Este tiempo se añadirá automáticamente una vez que usted envíe el primer cambio."],"The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.":["La etapa de producción muestra el tiempo total que tarda entre la creación de una incidencia y el despliegue del código a producción. Los datos se añadirán automáticamente una vez haya finalizado por completo el ciclo de idea a producción."],"The project can be accessed by any logged in user.":["El proyecto puede ser accedido por cualquier usuario conectado."],"The project can be accessed without any authentication.":["El proyecto puede accederse sin ninguna autenticación."],"The repository for this project does not exist.":["El repositorio para este proyecto no existe."],"The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.":["La etapa de revisión muestra el tiempo desde la creación de la solicitud de fusión hasta que los cambios se fusionaron. Los datos se añadirán automáticamente después de fusionar su primera solicitud de fusión."],"The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.":["La etapa de puesta en escena muestra el tiempo entre la fusión y el despliegue de código en el entorno de producción. Los datos se añadirán automáticamente una vez que se despliega a producción por primera vez."],"The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.":["La etapa de pruebas muestra el tiempo que GitLab CI toma para ejecutar cada pipeline para la solicitud de fusión relacionada. Los datos se añadirán automáticamente luego de que el primer pipeline termine de ejecutarse."],"The time taken by each data entry gathered by that stage.":["El tiempo utilizado por cada entrada de datos obtenido por esa etapa."],"The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6.":["El valor en el punto medio de una serie de valores observados. Por ejemplo, entre 3, 5, 9, la mediana es 5. Entre 3, 5, 7, 8, la mediana es (5 + 7) / 2 = 6."],"This means you can not push code until you create an empty repository or import existing one.":["Esto significa que no puede enviar código hasta que cree un repositorio vacío o importe uno existente."],"Time before an issue gets scheduled":["Tiempo antes de que una incidencia sea programada"],"Time before an issue starts implementation":["Tiempo antes de que empieze la implementación de una incidencia"],"Time between merge request creation and merge/close":["Tiempo entre la creación de la solicitud de fusión y la integración o cierre de ésta"],"Time until first merge request":["Tiempo hasta la primera solicitud de fusión"],"Timeago|%s days ago":["hace %s días"],"Timeago|%s days remaining":["%s días restantes"],"Timeago|%s hours remaining":["%s horas restantes"],"Timeago|%s minutes ago":["hace %s minutos"],"Timeago|%s minutes remaining":["%s minutos restantes"],"Timeago|%s months ago":["hace %s meses"],"Timeago|%s months remaining":["%s meses restantes"],"Timeago|%s seconds remaining":["%s segundos restantes"],"Timeago|%s weeks ago":["hace %s semanas"],"Timeago|%s weeks remaining":["%s semanas restantes"],"Timeago|%s years ago":["hace %s años"],"Timeago|%s years remaining":["%s años restantes"],"Timeago|1 day remaining":["1 día restante"],"Timeago|1 hour remaining":["1 hora restante"],"Timeago|1 minute remaining":["1 minuto restante"],"Timeago|1 month remaining":["1 mes restante"],"Timeago|1 week remaining":["1 semana restante"],"Timeago|1 year remaining":["1 año restante"],"Timeago|Past due":["Atrasado"],"Timeago|a day ago":["hace un día"],"Timeago|a month ago":["hace un mes"],"Timeago|a week ago":["hace una semana"],"Timeago|a while":["hace un momento"],"Timeago|a year ago":["hace un año"],"Timeago|about %s hours ago":["hace alrededor de %s horas"],"Timeago|about a minute ago":["hace alrededor de 1 minuto"],"Timeago|about an hour ago":["hace alrededor de 1 hora"],"Timeago|in %s days":["en %s días"],"Timeago|in %s hours":["en %s horas"],"Timeago|in %s minutes":["en %s minutos"],"Timeago|in %s months":["en %s meses"],"Timeago|in %s seconds":["en %s segundos"],"Timeago|in %s weeks":["en %s semanas"],"Timeago|in %s years":["en %s años"],"Timeago|in 1 day":["en 1 día"],"Timeago|in 1 hour":["en 1 hora"],"Timeago|in 1 minute":["en 1 minuto"],"Timeago|in 1 month":["en 1 mes"],"Timeago|in 1 week":["en 1 semana"],"Timeago|in 1 year":["en 1 año"],"Timeago|less than a minute ago":["hace menos de 1 minuto"],"Time|hr":["hr","hrs"],"Time|min":["min","mins"],"Time|s":["s"],"Total Time":["Tiempo Total"],"Total test time for all commits/merges":["Tiempo total de pruebas para todos los cambios o integraciones"],"Unstar":["No Destacar"],"Upload New File":["Subir nuevo archivo"],"Upload file":["Subir archivo"],"Use your global notification setting":["Utiliza tu configuración de notificación global"],"VisibilityLevel|Internal":["Interno"],"VisibilityLevel|Private":["Privado"],"VisibilityLevel|Public":["Público"],"Want to see the data? Please ask an administrator for access.":["¿Quieres ver los datos? Por favor pide acceso al administrador."],"We don't have enough data to show this stage.":["No hay suficientes datos para mostrar en esta etapa."],"Withdraw Access Request":["Retirar Solicitud de Acceso"],"You are going to remove %{project_name_with_namespace}.\\nRemoved project CANNOT be restored!\\nAre you ABSOLUTELY sure?":["Va a eliminar %{project_name_with_namespace}.\\n¡El proyecto eliminado NO puede ser restaurado!\\n¿Estás TOTALMENTE seguro?"],"You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?":["Vas a eliminar el enlace de la bifurcación con el proyecto original %{forked_from_project}. ¿Estás TOTALMENTE seguro?"],"You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?":["Vas a transferir %{project_name_with_namespace} a otro propietario. ¿Estás TOTALMENTE seguro?"],"You can only add files when you are on a branch":["Solo puedes agregar archivos cuando estás en una rama"],"You must sign in to star a project":["Debes iniciar sesión para destacar un proyecto"],"You need permission.":["Necesitas permisos."],"You will not get any notifications via email":["No recibirás ninguna notificación por correo electrónico"],"You will only receive notifications for the events you choose":["Solo recibirás notificaciones de los eventos que elijas"],"You will only receive notifications for threads you have participated in":["Solo recibirás notificaciones de los temas en los que has participado"],"You will receive notifications for any activity":["Recibirás notificaciones por cualquier actividad"],"You will receive notifications only for comments in which you were @mentioned":["Recibirás notificaciones solo para los comentarios en los que se te mencionó"],"You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account":["No podrás actualizar o enviar código al proyecto a través de %{protocol} hasta que %{set_password_link} en tu cuenta"],"You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile":["No podrás actualizar o enviar código al proyecto a través de SSH hasta que %{add_ssh_key_link} en su perfil"],"Your name":["Tu nombre"],"day":["día","días"],"new merge request":["nueva solicitud de fusión"],"notification emails":["correos electrónicos de notificación"],"parent":["padre","padres"]}}};
\ No newline at end of file
+var locales = locales || {}; locales['es'] = {"domain":"app","locale_data":{"app":{"":{"Project-Id-Version":"gitlab 1.0.0","Report-Msgid-Bugs-To":"","PO-Revision-Date":"2017-06-21 12:09-0500","Language-Team":"Spanish","Language":"es","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Plural-Forms":"nplurals=2; plural=n != 1;","Last-Translator":"Bob Van Landuyt <bob@gitlab.com>","X-Generator":"Poedit 2.0.2","lang":"es","domain":"app","plural_forms":"nplurals=2; plural=n != 1;"},"%d additional commit has been omitted to prevent performance issues.":["%d cambio adicional ha sido omitido para evitar problemas de rendimiento.","%d cambios adicionales han sido omitidos para evitar problemas de rendimiento."],"%d commit":["%d cambio","%d cambios"],"%{commit_author_link} committed %{commit_timeago}":["%{commit_author_link} cambió %{commit_timeago}"],"About auto deploy":["Acerca del auto despliegue"],"Active":["Activo"],"Activity":["Actividad"],"Add Changelog":["Agregar Changelog"],"Add Contribution guide":["Agregar guía de contribución"],"Add License":["Agregar Licencia"],"Add an SSH key to your profile to pull or push via SSH.":["Agregar una clave SSH a tu perfil para actualizar o enviar a través de SSH."],"Add new directory":["Agregar nuevo directorio"],"Archived project! Repository is read-only":["¡Proyecto archivado! El repositorio es de solo lectura"],"Are you sure you want to delete this pipeline schedule?":["¿Estás seguro que deseas eliminar esta programación del pipeline?"],"Attach a file by drag &amp; drop or %{upload_link}":["Adjunte un archivo arrastrando &amp; soltando o %{upload_link}"],"Branch":["Rama","Ramas"],"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}":["La rama <strong>%{branch_name}</strong> fue creada. Para configurar el auto despliegue, escoge una plantilla Yaml para GitLab CI y envía tus cambios. %{link_to_autodeploy_doc}"],"BranchSwitcherPlaceholder|Search branches":["Buscar ramas"],"BranchSwitcherTitle|Switch branch":["Cambiar rama"],"Branches":["Ramas"],"Browse Directory":["Examinar directorio"],"Browse File":["Examinar archivo"],"Browse Files":["Examinar archivos"],"Browse files":["Examinar archivos"],"ByAuthor|by":["por"],"CI configuration":["Configuración de CI"],"Cancel":["Cancelar"],"ChangeTypeActionLabel|Pick into branch":["Escoger en la rama"],"ChangeTypeActionLabel|Revert in branch":["Revertir en la rama"],"ChangeTypeAction|Cherry-pick":["Cherry-pick"],"ChangeTypeAction|Revert":["Revertir"],"Changelog":["Changelog"],"Charts":["Gráficos"],"Cherry-pick this commit":["Escoger este cambio"],"Cherry-pick this merge request":["Escoger esta solicitud de fusión"],"CiStatusLabel|canceled":["cancelado"],"CiStatusLabel|created":["creado"],"CiStatusLabel|failed":["fallido"],"CiStatusLabel|manual action":["acción manual"],"CiStatusLabel|passed":["pasó"],"CiStatusLabel|passed with warnings":["pasó con advertencias"],"CiStatusLabel|pending":["pendiente"],"CiStatusLabel|skipped":["omitido"],"CiStatusLabel|waiting for manual action":["esperando acción manual"],"CiStatusText|blocked":["bloqueado"],"CiStatusText|canceled":["cancelado"],"CiStatusText|created":["creado"],"CiStatusText|failed":["fallado"],"CiStatusText|manual":["manual"],"CiStatusText|passed":["pasó"],"CiStatusText|pending":["pendiente"],"CiStatusText|skipped":["omitido"],"CiStatus|running":["en ejecución"],"Commit":["Cambio","Cambios"],"Commit message":["Mensaje del cambio"],"CommitBoxTitle|Commit":["Cambio"],"CommitMessage|Add %{file_name}":["Agregar %{file_name}"],"Commits":["Cambios"],"Commits feed":["Feed de cambios"],"Commits|History":["Historial"],"Committed by":["Enviado por"],"Compare":["Comparar"],"Contribution guide":["Guía de contribución"],"Contributors":["Contribuidores"],"Copy URL to clipboard":["Copiar URL al portapapeles"],"Copy commit SHA to clipboard":["Copiar SHA del cambio al portapapeles"],"Create New Directory":["Crear Nuevo Directorio"],"Create directory":["Crear directorio"],"Create empty bare repository":["Crear repositorio vacío"],"Create merge request":["Crear solicitud de fusión"],"Create new...":["Crear nuevo..."],"CreateNewFork|Fork":["Bifurcar"],"CreateTag|Tag":["Etiqueta"],"Cron Timezone":["Zona horaria del Cron"],"Cron syntax":["Sintaxis de Cron"],"Custom notification events":["Eventos de notificaciones personalizadas"],"Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out %{notification_link}.":["Los niveles de notificación personalizados son los mismos que los niveles participantes. Con los niveles de notificación personalizados, también recibirá notificaciones para eventos seleccionados. Para obtener más información, consulte %{notification_link}."],"Cycle Analytics":["Cycle Analytics"],"Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.":["Cycle Analytics ofrece una visión general de cuánto tiempo tarda en pasar de idea a producción en su proyecto."],"CycleAnalyticsStage|Code":["Código"],"CycleAnalyticsStage|Issue":["Incidencia"],"CycleAnalyticsStage|Plan":["Planificación"],"CycleAnalyticsStage|Production":["Producción"],"CycleAnalyticsStage|Review":["Revisión"],"CycleAnalyticsStage|Staging":["Puesta en escena"],"CycleAnalyticsStage|Test":["Pruebas"],"Define a custom pattern with cron syntax":["Definir un patrón personalizado con la sintaxis de cron"],"Delete":["Eliminar"],"Deploy":["Despliegue","Despliegues"],"Description":["Descripción"],"Directory name":["Nombre del directorio"],"Don't show again":["No mostrar de nuevo"],"Download":["Descargar"],"Download tar":["Descargar tar"],"Download tar.bz2":["Descargar tar.bz2"],"Download tar.gz":["Descargar tar.gz"],"Download zip":["Descargar zip"],"DownloadArtifacts|Download":["Descargar"],"DownloadCommit|Email Patches":["Parches por correo electrónico"],"DownloadCommit|Plain Diff":["Diferencias en texto plano"],"DownloadSource|Download":["Descargar"],"Edit":["Editar"],"Edit Pipeline Schedule %{id}":["Editar Programación del Pipeline %{id}"],"Every day (at 4:00am)":["Todos los días (a las 4:00 am)"],"Every month (on the 1st at 4:00am)":["Todos los meses (el día 1 a las 4:00 am)"],"Every week (Sundays at 4:00am)":["Todas las semanas (domingos a las 4:00 am)"],"Failed to change the owner":["Error al cambiar el propietario"],"Failed to remove the pipeline schedule":["Error al eliminar la programación del pipeline"],"Files":["Archivos"],"Filter by commit message":["Filtrar por mensaje del cambio"],"Find by path":["Buscar por ruta"],"Find file":["Buscar archivo"],"FirstPushedBy|First":["Primer"],"FirstPushedBy|pushed by":["enviado por"],"Fork":["Bifurcación","Bifurcaciones"],"ForkedFromProjectPath|Forked from":["Bifurcado de"],"From issue creation until deploy to production":["Desde la creación de la incidencia hasta el despliegue a producción"],"From merge request merge until deploy to production":["Desde la integración de la solicitud de fusión hasta el despliegue a producción"],"Go to your fork":["Ir a tu bifurcación"],"GoToYourFork|Fork":["Bifurcación"],"Home":["Inicio"],"Housekeeping successfully started":["Servicio de limpieza iniciado con éxito"],"Import repository":["Importar repositorio"],"Interval Pattern":["Patrón de intervalo"],"Introducing Cycle Analytics":["Introducción a Cycle Analytics"],"LFSStatus|Disabled":["Deshabilitado"],"LFSStatus|Enabled":["Habilitado"],"Last %d day":["Último %d día","Últimos %d días"],"Last Pipeline":["Último Pipeline"],"Last Update":["Última actualización"],"Last commit":["Último cambio"],"Learn more in the":["Más información en la"],"Learn more in the|pipeline schedules documentation":["documentación sobre la programación de pipelines"],"Leave group":["Abandonar grupo"],"Leave project":["Abandonar proyecto"],"Limited to showing %d event at most":["Limitado a mostrar máximo %d evento","Limitado a mostrar máximo %d eventos"],"Median":["Mediana"],"MissingSSHKeyWarningLink|add an SSH key":["agregar una clave SSH"],"New Issue":["Nueva incidencia","Nuevas incidencias"],"New Pipeline Schedule":["Nueva Programación del Pipeline"],"New branch":["Nueva rama"],"New directory":["Nuevo directorio"],"New file":["Nuevo archivo"],"New issue":["Nueva incidencia"],"New merge request":["Nueva solicitud de fusión"],"New schedule":["Nueva programación"],"New snippet":["Nuevo fragmento de código"],"New tag":["Nueva etiqueta"],"No repository":["No hay repositorio"],"No schedules":["No hay programaciones"],"Not available":["No disponible"],"Not enough data":["No hay suficientes datos"],"Notification events":["Eventos de notificación"],"NotificationEvent|Close issue":["Cerrar incidencia"],"NotificationEvent|Close merge request":["Cerrar solicitud de fusión"],"NotificationEvent|Failed pipeline":["Pipeline fallido"],"NotificationEvent|Merge merge request":["Integrar solicitud de fusión"],"NotificationEvent|New issue":["Nueva incidencia"],"NotificationEvent|New merge request":["Nueva solicitud de fusión"],"NotificationEvent|New note":["Nueva nota"],"NotificationEvent|Reassign issue":["Reasignar incidencia"],"NotificationEvent|Reassign merge request":["Reasignar solicitud de fusión"],"NotificationEvent|Reopen issue":["Reabrir incidencia"],"NotificationEvent|Successful pipeline":["Pipeline exitoso"],"NotificationLevel|Custom":["Personalizado"],"NotificationLevel|Disabled":["Deshabilitado"],"NotificationLevel|Global":["Global"],"NotificationLevel|On mention":["Cuando me mencionan"],"NotificationLevel|Participate":["Participación"],"NotificationLevel|Watch":["Vigilancia"],"OfSearchInADropdown|Filter":["Filtrar"],"OpenedNDaysAgo|Opened":["Abierto"],"Options":["Opciones"],"Owner":["Propietario"],"Pipeline":["Pipeline"],"Pipeline Health":["Estado del Pipeline"],"Pipeline Schedule":["Programación del Pipeline"],"Pipeline Schedules":["Programaciones de los Pipelines"],"PipelineSchedules|Activated":["Activado"],"PipelineSchedules|Active":["Activos"],"PipelineSchedules|All":["Todos"],"PipelineSchedules|Inactive":["Inactivos"],"PipelineSchedules|Next Run":["Próxima Ejecución"],"PipelineSchedules|None":["Ninguno"],"PipelineSchedules|Provide a short description for this pipeline":["Proporcione una breve descripción para este pipeline"],"PipelineSchedules|Take ownership":["Tomar posesión"],"PipelineSchedules|Target":["Destino"],"PipelineSheduleIntervalPattern|Custom":["Personalizado"],"Pipeline|with stage":["con etapa"],"Pipeline|with stages":["con etapas"],"Project '%{project_name}' queued for deletion.":["Proyecto ‘%{project_name}’ en cola para eliminación."],"Project '%{project_name}' was successfully created.":["Proyecto ‘%{project_name}’ fue creado satisfactoriamente."],"Project '%{project_name}' was successfully updated.":["Proyecto ‘%{project_name}’ fue actualizado satisfactoriamente."],"Project '%{project_name}' will be deleted.":["Proyecto ‘%{project_name}’ será eliminado."],"Project access must be granted explicitly to each user.":["El acceso al proyecto debe concederse explícitamente a cada usuario."],"Project export could not be deleted.":["No se pudo eliminar la exportación del proyecto."],"Project export has been deleted.":["La exportación del proyecto ha sido eliminada."],"Project export link has expired. Please generate a new export from your project settings.":["El enlace de exportación del proyecto ha caducado. Por favor, genera una nueva exportación desde la configuración del proyecto."],"Project export started. A download link will be sent by email.":["Se inició la exportación del proyecto. Se enviará un enlace de descarga por correo electrónico."],"Project home":["Inicio del proyecto"],"ProjectFeature|Disabled":["Deshabilitada"],"ProjectFeature|Everyone with access":["Todos con acceso"],"ProjectFeature|Only team members":["Solo miembros del equipo"],"ProjectFileTree|Name":["Nombre"],"ProjectLastActivity|Never":["Nunca"],"ProjectLifecycle|Stage":["Etapa"],"ProjectNetworkGraph|Graph":["Historial gráfico"],"Read more":["Leer más"],"Readme":["Léeme"],"RefSwitcher|Branches":["Ramas"],"RefSwitcher|Tags":["Etiquetas"],"Related Commits":["Cambios Relacionados"],"Related Deployed Jobs":["Trabajos Desplegados Relacionados"],"Related Issues":["Incidencias Relacionadas"],"Related Jobs":["Trabajos Relacionados"],"Related Merge Requests":["Solicitudes de fusión Relacionadas"],"Related Merged Requests":["Solicitudes de fusión Relacionadas"],"Remind later":["Recordar después"],"Remove project":["Eliminar proyecto"],"Request Access":["Solicitar acceso"],"Revert this commit":["Revertir este cambio"],"Revert this merge request":["Revertir esta solicitud de fusión"],"Save pipeline schedule":["Guardar programación del pipeline"],"Schedule a new pipeline":["Programar un nuevo pipeline"],"Scheduling Pipelines":["Programación de Pipelines"],"Search branches and tags":["Buscar ramas y etiquetas"],"Select Archive Format":["Seleccionar formato de archivo"],"Select a timezone":["Selecciona una zona horaria"],"Select target branch":["Selecciona una rama de destino"],"Set a password on your account to pull or push via %{protocol}":["Establezca una contraseña en su cuenta para actualizar o enviar a través de %{protocol}"],"Set up CI":["Configurar CI"],"Set up Koding":["Configurar Koding"],"Set up auto deploy":["Configurar auto despliegue"],"SetPasswordToCloneLink|set a password":["establecer una contraseña"],"Showing %d event":["Mostrando %d evento","Mostrando %d eventos"],"Source code":["Código fuente"],"StarProject|Star":["Destacar"],"Start a %{new_merge_request} with these changes":["Iniciar una %{new_merge_request} con estos cambios"],"Switch branch/tag":["Cambiar rama/etiqueta"],"Tag":["Etiqueta","Etiquetas"],"Tags":["Etiquetas"],"Target Branch":["Rama de destino"],"The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.":["La etapa de desarrollo muestra el tiempo desde el primer cambio hasta la creación de la solicitud de fusión. Los datos serán automáticamente incorporados aquí una vez creada tu primera solicitud de fusión."],"The collection of events added to the data gathered for that stage.":["La colección de eventos agregados a los datos recopilados para esa etapa."],"The fork relationship has been removed.":["La relación con la bifurcación se ha eliminado."],"The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.":["La etapa de incidencia muestra el tiempo que toma desde la creación de un tema hasta asignar el tema a un hito, o añadir el tema a una lista en el panel de temas. Empieza a crear temas para ver los datos de esta etapa."],"The phase of the development lifecycle.":["La etapa del ciclo de vida de desarrollo."],"The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user.":["La programación de pipelines ejecuta pipelines en el futuro, repetidamente, para ramas o etiquetas específicas. Los pipelines programados heredarán acceso limitado al proyecto basado en su usuario asociado."],"The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.":["La etapa de planificación muestra el tiempo desde el paso anterior hasta el envío de tu primera confirmación. Este tiempo se añadirá automáticamente una vez que usted envíe el primer cambio."],"The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.":["La etapa de producción muestra el tiempo total que tarda entre la creación de una incidencia y el despliegue del código a producción. Los datos se añadirán automáticamente una vez haya finalizado por completo el ciclo de idea a producción."],"The project can be accessed by any logged in user.":["El proyecto puede ser accedido por cualquier usuario conectado."],"The project can be accessed without any authentication.":["El proyecto puede accederse sin ninguna autenticación."],"The repository for this project does not exist.":["El repositorio para este proyecto no existe."],"The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.":["La etapa de revisión muestra el tiempo desde la creación de la solicitud de fusión hasta que los cambios se fusionaron. Los datos se añadirán automáticamente después de fusionar su primera solicitud de fusión."],"The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.":["La etapa de puesta en escena muestra el tiempo entre la fusión y el despliegue de código en el entorno de producción. Los datos se añadirán automáticamente una vez que se despliega a producción por primera vez."],"The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.":["La etapa de pruebas muestra el tiempo que GitLab CI toma para ejecutar cada pipeline para la solicitud de fusión relacionada. Los datos se añadirán automáticamente luego de que el primer pipeline termine de ejecutarse."],"The time taken by each data entry gathered by that stage.":["El tiempo utilizado por cada entrada de datos obtenido por esa etapa."],"The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6.":["El valor en el punto medio de una serie de valores observados. Por ejemplo, entre 3, 5, 9, la mediana es 5. Entre 3, 5, 7, 8, la mediana es (5 + 7) / 2 = 6."],"This means you can not push code until you create an empty repository or import existing one.":["Esto significa que no puede enviar código hasta que cree un repositorio vacío o importe uno existente."],"Time before an issue gets scheduled":["Tiempo antes de que una incidencia sea programada"],"Time before an issue starts implementation":["Tiempo antes de que empieze la implementación de una incidencia"],"Time between merge request creation and merge/close":["Tiempo entre la creación de la solicitud de fusión y la integración o cierre de ésta"],"Time until first merge request":["Tiempo hasta la primera solicitud de fusión"],"Timeago|%s days ago":["hace %s días"],"Timeago|%s days remaining":["%s días restantes"],"Timeago|%s hours remaining":["%s horas restantes"],"Timeago|%s minutes ago":["hace %s minutos"],"Timeago|%s minutes remaining":["%s minutos restantes"],"Timeago|%s months ago":["hace %s meses"],"Timeago|%s months remaining":["%s meses restantes"],"Timeago|%s seconds remaining":["%s segundos restantes"],"Timeago|%s weeks ago":["hace %s semanas"],"Timeago|%s weeks remaining":["%s semanas restantes"],"Timeago|%s years ago":["hace %s años"],"Timeago|%s years remaining":["%s años restantes"],"Timeago|1 day remaining":["1 día restante"],"Timeago|1 hour remaining":["1 hora restante"],"Timeago|1 minute remaining":["1 minuto restante"],"Timeago|1 month remaining":["1 mes restante"],"Timeago|1 week remaining":["1 semana restante"],"Timeago|1 year remaining":["1 año restante"],"Timeago|Past due":["Atrasado"],"Timeago|a day ago":["hace un día"],"Timeago|a month ago":["hace un mes"],"Timeago|a week ago":["hace una semana"],"Timeago|a while":["hace un momento"],"Timeago|a year ago":["hace un año"],"Timeago|about %s hours ago":["hace alrededor de %s horas"],"Timeago|about a minute ago":["hace alrededor de 1 minuto"],"Timeago|about an hour ago":["hace alrededor de 1 hora"],"Timeago|in %s days":["en %s días"],"Timeago|in %s hours":["en %s horas"],"Timeago|in %s minutes":["en %s minutos"],"Timeago|in %s months":["en %s meses"],"Timeago|in %s seconds":["en %s segundos"],"Timeago|in %s weeks":["en %s semanas"],"Timeago|in %s years":["en %s años"],"Timeago|in 1 day":["en 1 día"],"Timeago|in 1 hour":["en 1 hora"],"Timeago|in 1 minute":["en 1 minuto"],"Timeago|in 1 month":["en 1 mes"],"Timeago|in 1 week":["en 1 semana"],"Timeago|in 1 year":["en 1 año"],"Timeago|less than a minute ago":["hace menos de 1 minuto"],"Time|hr":["hr","hrs"],"Time|min":["min","mins"],"Time|s":["s"],"Total Time":["Tiempo Total"],"Total test time for all commits/merges":["Tiempo total de pruebas para todos los cambios o integraciones"],"Unstar":["No Destacar"],"Upload New File":["Subir nuevo archivo"],"Upload file":["Subir archivo"],"UploadLink|click to upload":["Hacer clic para subir"],"Use your global notification setting":["Utiliza tu configuración de notificación global"],"View open merge request":["Ver solicitud de fusión abierta"],"VisibilityLevel|Internal":["Interno"],"VisibilityLevel|Private":["Privado"],"VisibilityLevel|Public":["Público"],"Want to see the data? Please ask an administrator for access.":["¿Quieres ver los datos? Por favor pide acceso al administrador."],"We don't have enough data to show this stage.":["No hay suficientes datos para mostrar en esta etapa."],"Withdraw Access Request":["Retirar Solicitud de Acceso"],"You are going to remove %{project_name_with_namespace}.\\nRemoved project CANNOT be restored!\\nAre you ABSOLUTELY sure?":["Va a eliminar %{project_name_with_namespace}.\\n¡El proyecto eliminado NO puede ser restaurado!\\n¿Estás TOTALMENTE seguro?"],"You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?":["Vas a eliminar el enlace de la bifurcación con el proyecto original %{forked_from_project}. ¿Estás TOTALMENTE seguro?"],"You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?":["Vas a transferir %{project_name_with_namespace} a otro propietario. ¿Estás TOTALMENTE seguro?"],"You can only add files when you are on a branch":["Solo puedes agregar archivos cuando estás en una rama"],"You have reached your project limit":["Has alcanzado el límite de tu proyecto"],"You must sign in to star a project":["Debes iniciar sesión para destacar un proyecto"],"You need permission.":["Necesitas permisos."],"You will not get any notifications via email":["No recibirás ninguna notificación por correo electrónico"],"You will only receive notifications for the events you choose":["Solo recibirás notificaciones de los eventos que elijas"],"You will only receive notifications for threads you have participated in":["Solo recibirás notificaciones de los temas en los que has participado"],"You will receive notifications for any activity":["Recibirás notificaciones por cualquier actividad"],"You will receive notifications only for comments in which you were @mentioned":["Recibirás notificaciones solo para los comentarios en los que se te mencionó"],"You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account":["No podrás actualizar o enviar código al proyecto a través de %{protocol} hasta que %{set_password_link} en tu cuenta"],"You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile":["No podrás actualizar o enviar código al proyecto a través de SSH hasta que %{add_ssh_key_link} en su perfil"],"Your name":["Tu nombre"],"day":["día","días"],"new merge request":["nueva solicitud de fusión"],"notification emails":["correos electrónicos de notificación"],"parent":["padre","padres"]}}};
\ No newline at end of file
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 5b5cdebe919..0accd1f8d77 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -85,20 +85,20 @@ module CommitsHelper
 
     if @path.blank?
       return link_to(
-        "Browse Files",
+        _("Browse Files"),
         namespace_project_tree_path(project.namespace, project, commit),
         class: "btn btn-default"
       )
     elsif @repo.blob_at(commit.id, @path)
       return link_to(
-        "Browse File",
+        _("Browse File"),
         namespace_project_blob_path(project.namespace, project,
                                     tree_join(commit.id, @path)),
         class: "btn btn-default"
       )
     elsif @path.present?
       return link_to(
-        "Browse Directory",
+        _("Browse Directory"),
         namespace_project_tree_path(project.namespace, project,
                                     tree_join(commit.id, @path)),
         class: "btn btn-default"
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index d3380c917e4..93fd0789c11 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -3,8 +3,8 @@
 
 - commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, commits|
   %li.commit-header.js-commit-header{ data: { day: day } }
-    %span.day= day.strftime('%d %b, %Y')
-    %span.commits-count= pluralize(commits.count, 'commit')
+    %span.day= l(day, format: '%d %b, %Y')
+    %span.commits-count= n_("%d commit", "%d commits", commits.count) % commits.count
 
   %li.commits-row{ data: { day: day } }
     %ul.content-list.commit-list
@@ -12,4 +12,4 @@
 
 - if hidden > 0
   %li.alert.alert-warning
-    #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.
+    = n_('%d additional commit has been omitted to prevent performance issues.', '%d additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index c1c2fb3d299..fabd825aec8 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 
-- page_title "Commits", @ref
+- page_title _("Commits"), @ref
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 
@@ -18,16 +18,16 @@
     .block-controls.hidden-xs.hidden-sm
       - if @merge_request.present?
         .control
-          = link_to "View open merge request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
+          = link_to _("View open merge request"), namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
       - elsif create_mr_button?(@repository.root_ref, @ref)
         .control
-          = link_to "Create merge request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
+          = link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
 
       .control
         = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do
-          = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
+          = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
       .control
-        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: "Commits feed", class: 'btn' do
+        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
           = icon("rss")
 
   %div{ id: dom_id(@project) }
diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po
index f661cbddf5f..cc44a06cbc5 100644
--- a/locale/es/gitlab.po
+++ b/locale/es/gitlab.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-06-19 15:22-0500\n"
+"PO-Revision-Date: 2017-06-21 12:09-0500\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
 "X-Generator: Poedit 2.0.2\n"
 
+msgid "%d additional commit has been omitted to prevent performance issues."
+msgid_plural "%d additional commits have been omitted to prevent performance issues."
+msgstr[0] "%d cambio adicional ha sido omitido para evitar problemas de rendimiento."
+msgstr[1] "%d cambios adicionales han sido omitidos para evitar problemas de rendimiento."
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] "%d cambio"
+msgstr[1] "%d cambios"
+
 msgid "%{commit_author_link} committed %{commit_timeago}"
 msgstr "%{commit_author_link} cambió %{commit_timeago}"
 
@@ -70,8 +80,17 @@ msgstr "Cambiar rama"
 msgid "Branches"
 msgstr "Ramas"
 
+msgid "Browse Directory"
+msgstr "Examinar directorio"
+
+msgid "Browse File"
+msgstr "Examinar archivo"
+
+msgid "Browse Files"
+msgstr "Examinar archivos"
+
 msgid "Browse files"
-msgstr "Examinar los archivos"
+msgstr "Examinar archivos"
 
 msgid "ByAuthor|by"
 msgstr "por"
@@ -177,6 +196,9 @@ msgstr "Agregar %{file_name}"
 msgid "Commits"
 msgstr "Cambios"
 
+msgid "Commits feed"
+msgstr "Feed de cambios"
+
 msgid "Commits|History"
 msgstr "Historial"
 
@@ -329,6 +351,9 @@ msgstr "Error al eliminar la programación del pipeline"
 msgid "Files"
 msgstr "Archivos"
 
+msgid "Filter by commit message"
+msgstr "Filtrar por mensaje del cambio"
+
 msgid "Find by path"
 msgstr "Buscar por ruta"
 
@@ -957,6 +982,9 @@ msgstr "Hacer clic para subir"
 msgid "Use your global notification setting"
 msgstr "Utiliza tu configuración de notificación global"
 
+msgid "View open merge request"
+msgstr "Ver solicitud de fusión abierta"
+
 msgid "VisibilityLevel|Internal"
 msgstr "Interno"
 
@@ -993,12 +1021,12 @@ msgstr "Vas a transferir %{project_name_with_namespace} a otro propietario. ¿Es
 msgid "You can only add files when you are on a branch"
 msgstr "Solo puedes agregar archivos cuando estás en una rama"
 
+msgid "You have reached your project limit"
+msgstr "Has alcanzado el límite de tu proyecto"
+
 msgid "You must sign in to star a project"
 msgstr "Debes iniciar sesión para destacar un proyecto"
 
-msgid "You have reached your project limit"
-msgstr ""
-
 msgid "You need permission."
 msgstr "Necesitas permisos."
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a2e32b478d3..07f9efeb495 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 15:13-0500\n"
-"PO-Revision-Date: 2017-06-19 15:13-0500\n"
+"POT-Creation-Date: 2017-06-19 15:50-0500\n"
+"PO-Revision-Date: 2017-06-19 15:50-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,6 +18,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+msgid "%d additional commit have been omitted to prevent performance issues."
+msgid_plural "%d additional commits have been omitted to prevent performance issues."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "%d commit"
+msgid_plural "%d commits"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%{commit_author_link} committed %{commit_timeago}"
 msgstr ""
 
@@ -71,6 +81,15 @@ msgstr ""
 msgid "Branches"
 msgstr ""
 
+msgid "Browse Directory"
+msgstr ""
+
+msgid "Browse File"
+msgstr ""
+
+msgid "Browse Files"
+msgstr ""
+
 msgid "Browse files"
 msgstr ""
 
@@ -178,6 +197,9 @@ msgstr ""
 msgid "Commits"
 msgstr ""
 
+msgid "Commits feed"
+msgstr ""
+
 msgid "Commits|History"
 msgstr ""
 
@@ -330,6 +352,9 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
+msgid "Filter by commit message"
+msgstr ""
+
 msgid "Find by path"
 msgstr ""
 
@@ -958,6 +983,9 @@ msgstr ""
 msgid "Use your global notification setting"
 msgstr ""
 
+msgid "View open merge request"
+msgstr ""
+
 msgid "VisibilityLevel|Internal"
 msgstr ""
 
-- 
cgit v1.2.1


From 9f09767bcea2bbbe36f782a2e7b2a1e6b289fd2d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 22 Jun 2017 10:25:37 +0100
Subject: fixed some design issues updated some spacing & colors

---
 app/assets/stylesheets/framework/variables.scss |  4 ++--
 app/assets/stylesheets/new_nav.scss             | 28 ++++++++++++++-----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 7a40143ad7d..0d0af66b10d 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -74,8 +74,8 @@ $red-700: #a62d19;
 $red-800: #8b2615;
 $red-900: #711e11;
 
-$purple-700: #2d0573;
-$purple-800: #451c7f;
+$purple-700: #4A2192;
+$purple-800: #2c0a5c;
 $purple-900: #380d75;
 
 $black: #000;
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index 14ff4f75e07..70c1a26447f 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -55,8 +55,10 @@ header.navbar-gitlab-new {
 
   .container-fluid {
     .navbar-toggle {
+      padding: 6px $gl-padding;
+      margin-right: -5px;
       color: currentColor;
-      border-left: 1px solid currentColor;
+      border-left: 1px solid $white-light;
 
       &:hover,
       &:focus,
@@ -68,8 +70,10 @@ header.navbar-gitlab-new {
 
     .navbar-toggle-left {
       right: 0;
+      margin-right: 0;
+      margin-left: -16px;
       border-left: 0;
-      border-right: 1px solid currentColor;
+      border-right: 1px solid $white-light;
     }
 
     .navbar-nav {
@@ -81,15 +85,15 @@ header.navbar-gitlab-new {
     .nav > li > a {
       opacity: .9;
       will-change: opacity;
-    }
 
-    .nav > li > a:hover,
-    .nav > li > a:focus {
-      color: $white-light;
-      opacity: 1;
+      &:hover,
+      &:focus {
+        color: $white-light;
+        opacity: 1;
 
-      > svg {
-        fill: $white-light;
+        > svg {
+          fill: $white-light;
+        }
       }
     }
   }
@@ -127,13 +131,13 @@ header.navbar-gitlab-new {
   }
 
   .dropdown-chevron {
-    font-size: 12px;
+    font-size: 10px;
   }
 }
 
 .search {
   form {
-    border-color: $purple-700;
+    border-color: $purple-800;
 
     &:hover {
       border-color: rgba($white-light, .5);
@@ -146,7 +150,7 @@ header.navbar-gitlab-new {
 
   form,
   .search-input {
-    background-color: $purple-800;
+    background-color: $purple-700;
   }
 
   .search-input {
-- 
cgit v1.2.1


From ce612c3e831814aab67a247d317090bd3fb850db Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 22 Jun 2017 11:57:34 +0200
Subject: Use Gitaly 0.13.0

---
 GITALY_SERVER_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index ac454c6a1fc..54d1a4f2a4a 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.12.0
+0.13.0
-- 
cgit v1.2.1


From 970a0de059f9c6de78f7dfea9262fd4e636079c1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 22 Jun 2017 11:00:28 +0100
Subject: fixed scss-lint

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

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 0d0af66b10d..1fcd8f39922 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -74,7 +74,7 @@ $red-700: #a62d19;
 $red-800: #8b2615;
 $red-900: #711e11;
 
-$purple-700: #4A2192;
+$purple-700: #4a2192;
 $purple-800: #2c0a5c;
 $purple-900: #380d75;
 
-- 
cgit v1.2.1


From 3447f97b448b0fa999351ed959b9d6a8656f9523 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Jun 2017 12:34:16 +0200
Subject: Fix specs for database migration helpers with transactions

---
 spec/lib/gitlab/database/migration_helpers_spec.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 29656667b02..1efc19a2e65 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -317,7 +317,9 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
     context 'outside of a transaction' do
       context 'when a column limit is not set' do
         before do
-          expect(model).to receive(:transaction_open?).and_return(false)
+          expect(model).to receive(:transaction_open?)
+            .and_return(false)
+            .at_least(:once)
 
           expect(model).to receive(:transaction).and_yield
 
@@ -824,7 +826,11 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
       let!(:user) { create(:user, name: 'Kathy Alice Aliceson') }
 
       it 'replaces the correct part of the string' do
-        model.update_column_in_batches(:users, :name, model.replace_sql(Arel::Table.new(:users)[:name], 'Alice', 'Eve'))
+        allow(model).to receive(:transaction_open?).and_return(false)
+        query =  model.replace_sql(Arel::Table.new(:users)[:name], 'Alice', 'Eve')
+
+        model.update_column_in_batches(:users, :name, query)
+
         expect(user.reload.name).to eq('Kathy Eve Aliceson')
       end
     end
-- 
cgit v1.2.1


From 3a3dd539208f75be9b2944c752ac3dc18a1b4306 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Jun 2017 12:35:47 +0200
Subject: Disable transaction in specs for some migrations

---
 .../rename_reserved_paths_migration/v1/rename_namespaces_spec.rb        | 2 +-
 spec/migrations/migrate_user_project_view_spec.rb                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
index ce2b5d620fd..0a6e6bbe2e8 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces do
+describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :truncate do
   let(:migration) { FakeRenameReservedPathMigrationV1.new }
   let(:subject) { described_class.new(['the-path'], migration) }
 
diff --git a/spec/migrations/migrate_user_project_view_spec.rb b/spec/migrations/migrate_user_project_view_spec.rb
index 70f8e0d6082..afaa5d836a7 100644
--- a/spec/migrations/migrate_user_project_view_spec.rb
+++ b/spec/migrations/migrate_user_project_view_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20170406142253_migrate_user_project_view.rb')
 
-describe MigrateUserProjectView do
+describe MigrateUserProjectView, :truncate do
   let(:migration) { described_class.new }
   let!(:user) { create(:user) }
 
-- 
cgit v1.2.1


From 5981fff500d3671366d4a943aca69c6ef88b7e79 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Jun 2017 13:51:47 +0200
Subject: Update chrome version and the binary path

---
 qa/Dockerfile         | 2 +-
 qa/qa/specs/config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/Dockerfile b/qa/Dockerfile
index 6afb614cc62..97ae1961e34 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,7 +1,7 @@
 FROM ruby:2.3
 LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
 
-ENV CHROME_VERSION 59.0.3071.104-1
+ENV CHROME_VERSION 59.0.3071.109-1
 ENV CHROME_DRIVER_VERSION 2.30
 
 ##
diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb
index 78a93828d36..b341aa3094a 100644
--- a/qa/qa/specs/config.rb
+++ b/qa/qa/specs/config.rb
@@ -55,7 +55,7 @@ module QA
         Capybara.register_driver :chrome do |app|
           capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
             'chromeOptions' => {
-              'binary' => '/opt/google/chrome-beta/google-chrome-beta',
+              'binary' => '/usr/bin/google-chrome-stable',
               'args' => %w[headless no-sandbox disable-gpu]
             }
           )
-- 
cgit v1.2.1


From 019b4d34651d0638567ddd337c0cf74ba9ddeced Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Jun 2017 13:55:35 +0200
Subject: Fix Rubocop offense in migration helpers specs

---
 spec/lib/gitlab/database/migration_helpers_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index fc269f33be9..4259be3f522 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -827,7 +827,7 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
       it 'replaces the correct part of the string' do
         allow(model).to receive(:transaction_open?).and_return(false)
-        query =  model.replace_sql(Arel::Table.new(:users)[:name], 'Alice', 'Eve')
+        query = model.replace_sql(Arel::Table.new(:users)[:name], 'Alice', 'Eve')
 
         model.update_column_in_batches(:users, :name, query)
 
-- 
cgit v1.2.1


From a8517c1f342e4ad3097112d0bacedd669fee79be Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 22 Jun 2017 15:19:41 +0200
Subject: Add documentation for running Gitaly on another server

---
 changelogs/unreleased/doc-gitaly-network.yml |   4 +
 doc/administration/gitaly/index.md           | 138 +++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 changelogs/unreleased/doc-gitaly-network.yml

diff --git a/changelogs/unreleased/doc-gitaly-network.yml b/changelogs/unreleased/doc-gitaly-network.yml
new file mode 100644
index 00000000000..5376d8d5096
--- /dev/null
+++ b/changelogs/unreleased/doc-gitaly-network.yml
@@ -0,0 +1,4 @@
+---
+title: Add option to run Gitaly on a remote server
+merge_request: 12381
+author:
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index 48929910a9c..bdeed722987 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -33,6 +33,144 @@ prometheus_listen_addr = "localhost:9236"
 Changes to `/home/git/gitaly/config.toml` are applied when you run `service
 gitlab restart`.
 
+## Running Gitaly on its own server
+
+> This is an optional way to deploy Gitaly which can benefit GitLab
+installations that are larger than a single machine. Most
+installations will be better served with the default configuration
+used by Omnibus and the GitLab source installation guide.
+
+Starting with GitLab 9.4 it is possible to run Gitaly on a different
+server from the rest of the application. This can improve performance
+when running GitLab with its repositories stored on an NFS server.
+
+At the moment (GitLab 9.4) Gitaly is not yet a replacement for NFS
+because some parts of GitLab still bypass Gitaly when accessing Git
+repositories. If you choose to deploy Gitaly on your NFS server you
+must still also mount your Git shares on your GitLab application
+servers.
+
+Gitaly network traffic is unencrypted so you should use a firewall to
+restrict access to your Gitaly server.
+
+Below we describe how to configure a Gitaly server at address
+`gitaly.internal:9999` with secret token `abc123secret`. We assume
+your GitLab installation has two repository storages, `default` and
+`storage1`.
+
+### Client side token configuration
+
+Start by configuring a token on the client side.
+
+Omnibus installations:
+
+```ruby
+# /etc/gitlab/gitlab.rb
+gitlab_rails['gitaly_token'] = 'abc123secret'
+```
+
+Source installations:
+
+```yaml
+# /home/git/gitlab/config/gitlab.yml
+gitlab:
+  gitaly:
+    token: 'abc123secret'
+```
+
+You need to reconfigure (Omnibus) or restart (source) for these
+changes to be picked up.
+
+### Gitaly server configuration
+
+Next, on the Gitaly server, we need to configure storage paths, enable
+the network listener and configure the token.
+
+Note: if you want to reduce the risk of downtime when you enable
+authentication you can temporarily disable enforcement, see
+https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication
+.
+
+In most or all cases the storage paths below end in `/repositories`. Check the
+directory layout on your Gitaly server to be sure.
+
+Omnibus installations:
+
+```ruby
+# /etc/gitlab/gitlab.rb
+gitaly['listen_addr'] = '0.0.0.0:9999'
+gitaly['auth_token'] = 'abc123secret'
+gitaly['storage'] = [
+  { 'name' => 'default', 'path' => '/path/to/default/repositories' },
+  { 'name' => 'storage1', 'path' => '/path/to/storage1/repositories' },
+]
+```
+
+Source installations:
+
+```toml
+# /home/git/gitaly/config.toml
+listen_addr = '0.0.0.0:9999'
+
+[auth]
+token = 'abc123secret'
+
+[[storage]
+name = 'default'
+path = '/path/to/default/repositories'
+
+[[storage]]
+name = 'storage1'
+path = '/path/to/storage1/repositories'
+```
+
+Again, reconfigure (Omnibus) or restart (source).
+
+### Converting clients to use the Gitaly server
+
+Now as the final step update the client machines to switch from using
+their local Gitaly service to the new Gitaly server you just
+configured. This is a risky step because if there is any sort of
+network, firewall, or name resolution problem preventing your GitLab
+server from reaching the Gitaly server then all Gitaly requests will
+fail.
+
+We assume that your Gitaly server can be reached at
+`gitaly.internal:9999` from your GitLab server, and that your GitLab
+NFS shares are mounted at `/mnt/gitlab/default` and
+`/mnt/gitlab/storage1` respectively.
+
+Omnibus installations:
+
+```ruby
+# /etc/gitlab/gitlab.rb
+git_data_dirs({
+  { 'default' => { 'path' => '/mnt/gitlab/default', 'gitaly_address' => 'tcp://gitlab.internal:9999' } },
+  { 'storage1' => { 'path' => '/mnt/gitlab/storage1', 'gitaly_address' => 'tcp://gitlab.internal:9999' } },
+})
+```
+
+Source installations:
+
+```yaml
+# /home/git/gitlab/config/gitlab.yml
+gitlab:
+  repositories:
+    storages:
+      default:
+        path: /mnt/gitlab/default/repositories
+        gitaly_address: tcp://gitlab.internal:9999
+      storage1:
+        path: /mnt/gitlab/storage1/repositories
+        gitaly_address: tcp://gitlab.internal:9999
+```
+
+Now reconfigure (Omnibus) or restart (source). When you tail the
+Gitaly logs on your Gitaly server (`sudo gitlab-ctl tail gitaly` or
+`tail -f /home/git/gitlab/log/gitaly.log`) you should see requests
+coming in. One sure way to trigger a Gitaly request is to clone a
+repository from your GitLab server over HTTP.
+
 ## Configuring GitLab to not use Gitaly
 
 Gitaly is still an optional component in GitLab 9.3. This means you
-- 
cgit v1.2.1


From 5695e52bfe3dcbc4d65413a351a33a8ccbd3ad5d Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Fri, 28 Apr 2017 15:53:42 +0100
Subject: Add bootstrap_form gem

---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index b1790b23dcd..0d82eb2b91d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -123,6 +123,7 @@ gem 'asciidoctor', '~> 1.5.2'
 gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.8'
+gem 'bootstrap_form', '~> 2.7.0'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
diff --git a/Gemfile.lock b/Gemfile.lock
index bfd0498db35..5aff201841e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,6 +88,7 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
+    bootstrap_form (2.7.0)
     brakeman (3.6.1)
     browser (2.2.0)
     builder (3.2.3)
@@ -930,6 +931,7 @@ DEPENDENCIES
   binding_of_caller (~> 0.7.2)
   bootsnap (~> 1.0.0)
   bootstrap-sass (~> 3.3.0)
+  bootstrap_form (~> 2.7.0)
   brakeman (~> 3.6.0)
   browser (~> 2.2)
   bullet (~> 5.5.0)
-- 
cgit v1.2.1


From 517cbdcfcb40581f62174a4d2c2dd33335594154 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 22 Jun 2017 16:15:34 +0200
Subject: Use gitlab-workhorse 2.2.0

---
 GITLAB_WORKHORSE_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 3e3c2f1e5ed..ccbccc3dc62 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-2.1.1
+2.2.0
-- 
cgit v1.2.1


From c150a6f5ef458609ebd3fcd42783d6cd94853736 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 22 Jun 2017 16:25:10 +0200
Subject: Add anchor text

---
 doc/administration/gitaly/index.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index bdeed722987..332457cb384 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -87,8 +87,9 @@ Next, on the Gitaly server, we need to configure storage paths, enable
 the network listener and configure the token.
 
 Note: if you want to reduce the risk of downtime when you enable
-authentication you can temporarily disable enforcement, see
-https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication
+authentication you can temporarily disable enforcement, see [the
+documentation on configuring Gitaly
+authentication](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/configuration/README.md#authentication)
 .
 
 In most or all cases the storage paths below end in `/repositories`. Check the
-- 
cgit v1.2.1


From 2579dcf59e16dd79a091e45749a28da1eaf3429f Mon Sep 17 00:00:00 2001
From: Mike Greiling <mgreiling@gitlab.com>
Date: Thu, 22 Jun 2017 14:32:04 +0000
Subject: Resolve "Rename settings panel "close" action to "collapse" to avoid
 confusion"

---
 app/assets/javascripts/settings_panels.js              | 2 +-
 app/views/projects/deploy_keys/_index.html.haml        | 2 +-
 app/views/projects/protected_branches/_index.html.haml | 2 +-
 app/views/projects/protected_tags/_index.html.haml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/settings_panels.js b/app/assets/javascripts/settings_panels.js
index 59ff2a86293..7fa5996d600 100644
--- a/app/assets/javascripts/settings_panels.js
+++ b/app/assets/javascripts/settings_panels.js
@@ -4,7 +4,7 @@ function expandSectionParent($section, $content) {
 }
 
 function expandSection($section) {
-  $section.find('.js-settings-toggle').text('Close');
+  $section.find('.js-settings-toggle').text('Collapse');
 
   const $content = $section.find('.settings-content');
   $content.addClass('expanded').off('scroll.expandSection').scrollTop(0);
diff --git a/app/views/projects/deploy_keys/_index.html.haml b/app/views/projects/deploy_keys/_index.html.haml
index 6e038ffd9c0..cb98ce04430 100644
--- a/app/views/projects/deploy_keys/_index.html.haml
+++ b/app/views/projects/deploy_keys/_index.html.haml
@@ -4,7 +4,7 @@
     %h4
       Deploy Keys
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.
   .settings-content.no-animate{ class: ('expanded' if expanded) }
diff --git a/app/views/projects/protected_branches/_index.html.haml b/app/views/projects/protected_branches/_index.html.haml
index 9af67649741..5d2422bdf54 100644
--- a/app/views/projects/protected_branches/_index.html.haml
+++ b/app/views/projects/protected_branches/_index.html.haml
@@ -7,7 +7,7 @@
     %h4
       Protected Branches
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Keep stable branches secure and force developers to use merge requests.
   .settings-content.no-animate{ class: ('expanded' if expanded) }
diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
index 976e1d7e93f..8250f692a69 100644
--- a/app/views/projects/protected_tags/_index.html.haml
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -7,7 +7,7 @@
     %h4
       Protected Tags
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Limit access to creating and updating tags.
   .settings-content.no-animate{ class: ('expanded' if expanded) }
-- 
cgit v1.2.1


From 963052bf3c91100de010feb162cf5aa31ae33128 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Fri, 28 Apr 2017 16:33:23 +0100
Subject: Convert app/views/profiles/show.html.haml to bootstrap_form

---
 app/helpers/users_helper.rb           |  10 ++++
 app/views/profiles/show.html.haml     | 107 +++++++++++-----------------------
 config/initializers/bootstrap_form.rb |   7 +++
 3 files changed, 50 insertions(+), 74 deletions(-)
 create mode 100644 config/initializers/bootstrap_form.rb

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 9c623c9ba7c..b5f54d3e154 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -4,4 +4,14 @@ module UsersHelper
             title: user.email,
             class: 'has-tooltip commit-committer-link')
   end
+
+  def user_email_help_text(user)
+    return 'We also use email for avatar detection if no avatar is uploaded.' unless user.unconfirmed_email.present?
+
+    confirmation_link = link_to 'Resend confirmation e-mail', user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post
+
+    h('Please click the link in the confirmation email before continuing. It was sent to ') +
+      content_tag(:strong) { user.unconfirmed_email } + h('.') +
+      content_tag(:p) { confirmation_link }
+  end
 end
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 15672289c65..087ae778b0f 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,6 +1,6 @@
 = render 'profiles/head'
 
-= form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit-user prepend-top-default" }, authenticity_token: true do |f|
+= bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default' }, authenticity_token: true do |f|
   = form_errors(@user)
 
   .row
@@ -11,11 +11,11 @@
         - if @user.avatar?
           You can change your avatar here
           - if gravatar_enabled?
-            or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
+            or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, 'http://' + Gitlab.config.gravatar.host}
         - else
           You can upload an avatar here
           - if gravatar_enabled?
-            or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
+            or change it at #{link_to Gitlab.config.gravatar.host, 'http://' + Gitlab.config.gravatar.host}
     .col-lg-9
       .clearfix.avatar-image.append-bottom-default
         = link_to avatar_icon(@user, 400), target: '_blank', rel: 'noopener noreferrer' do
@@ -26,12 +26,12 @@
         %a.btn.js-choose-user-avatar-button
           Browse file...
         %span.avatar-file-name.prepend-left-default.js-avatar-filename No file chosen
-        = f.file_field :avatar, class: "js-user-avatar-input hidden", accept: "image/*"
+        = f.file_field_without_bootstrap :avatar, class: 'js-user-avatar-input hidden', accept: 'image/*'
       .help-block
         The maximum file size allowed is 200KB.
       - if @user.avatar?
         %hr
-        = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?" }, method: :delete, class: "btn btn-gray"
+        = link_to 'Remove avatar', profile_avatar_path, data: { confirm: 'Avatar will be removed. Are you sure?' }, method: :delete, class: 'btn btn-gray'
   %hr
   .row
     .col-lg-3.profile-settings-sidebar
@@ -43,91 +43,50 @@
           Some options are unavailable for LDAP accounts
     .col-lg-9
       .row
-        .form-group.col-md-9
-          = f.label :name, class: "label-light"
-          = f.text_field :name, class: "form-control", required: true
-          %span.help-block Enter your name, so people you know can recognize you.
+        = f.text_field :name,  required: true, wrapper: { class: 'col-md-9' },
+          help: 'Enter your name, so people you know can recognize you.'
+        = f.text_field :id, readonly: true, label: 'User ID', wrapper: { class: 'col-md-3' }
 
-        .form-group.col-md-3
-          = f.label :id, class: 'label-light' do
-            User ID
-          = f.text_field :id, class: 'form-control', readonly: true
-
-
-      .form-group
-        = f.label :email, class: "label-light"
-        - if @user.external_email?
-          = f.text_field :email, class: "form-control", required: true, readonly: true
-          %span.help-block.light
-            Your email address was automatically set based on your #{email_provider_label} account.
-        - else
-          - if @user.temp_oauth_email?
-            = f.text_field :email, class: "form-control", required: true, value: nil
-          - else
-            = f.text_field :email, class: "form-control", required: true
-          - if @user.unconfirmed_email.present?
-            %span.help-block
-              Please click the link in the confirmation email before continuing. It was sent to
-              = succeed "." do
-                %strong= @user.unconfirmed_email
-              %p
-              = link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post
-
-          - else
-            %span.help-block We also use email for avatar detection if no avatar is uploaded.
-      .form-group
-        = f.label :public_email, class: "label-light"
-        = f.select :public_email, options_for_select(@user.all_emails, selected: @user.public_email), { include_blank: 'Do not show on profile' }, class: "select2"
-        %span.help-block This email will be displayed on your public profile.
-      .form-group
-        = f.label :preferred_language, class: "label-light"
-        = f.select :preferred_language, Gitlab::I18n::AVAILABLE_LANGUAGES.map { |value, label| [label, value] },
-          {}, class: "select2"
-        %span.help-block This feature is experimental and translations are not complete yet.
-      .form-group
-        = f.label :skype, class: "label-light"
-        = f.text_field :skype, class: "form-control"
-      .form-group
-        = f.label :linkedin, class: "label-light"
-        = f.text_field :linkedin, class: "form-control"
-      .form-group
-        = f.label :twitter, class: "label-light"
-        = f.text_field :twitter, class: "form-control"
-      .form-group
-        = f.label :website_url, 'Website', class: "label-light"
-        = f.text_field :website_url, class: "form-control"
-      .form-group
-        = f.label :location, 'Location', class: "label-light"
-        = f.text_field :location, class: "form-control"
-      .form-group
-        = f.label :organization, 'Organization', class: "label-light"
-        = f.text_field :organization, class: "form-control"
-      .form-group
-        = f.label :bio, class: "label-light"
-        = f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
-        %span.help-block Tell us about yourself in fewer than 250 characters.
+      - if @user.external_email?
+        = f.text_field :email, required: true, readonly: true, help: 'Your email address was automatically set based on your #{email_provider_label} account.'
+      - else
+        = f.text_field :email, required: true, value: (@user.email unless @user.temp_oauth_email?),
+          help: user_email_help_text(@user)
+      = f.select :public_email, options_for_select(@user.all_emails, selected: @user.public_email),
+        { help: 'This email will be displayed on your public profile.', include_blank: 'Do not show on profile' },
+        control_class: 'select2'
+      = f.select :preferred_language, Gitlab::I18n::AVAILABLE_LANGUAGES.map { |value, label| [label, value] },
+        { help: 'This feature is experimental and translations are not complete yet.' },
+        control_class: 'select2'
+      = f.text_field :skype
+      = f.text_field :linkedin
+      = f.text_field :twitter
+      = f.text_field :website_url, label: 'Website'
+      = f.text_field :location
+      = f.text_field :organization
+      = f.text_area :bio, rows: 4, maxlength: 250, help: 'Tell us about yourself in fewer than 250 characters.'
       .prepend-top-default.append-bottom-default
-        = f.submit 'Update profile settings', class: "btn btn-success"
-        = link_to "Cancel", user_path(current_user), class: "btn btn-cancel"
+        = f.submit 'Update profile settings', class: 'btn btn-success'
+        = link_to 'Cancel', user_path(current_user), class: 'btn btn-cancel'
 
 .modal.modal-profile-crop
   .modal-dialog
     .modal-content
       .modal-header
-        %button.close{ :type => "button", :'data-dismiss' => "modal" }
+        %button.close{ type: 'button', 'data-dismiss': 'modal' }
           %span
             &times;
         %h4.modal-title
           Position and size your new avatar
       .modal-body
         .profile-crop-image-container
-          %img.modal-profile-crop-image{ alt: "Avatar cropper" }
+          %img.modal-profile-crop-image{ alt: 'Avatar cropper' }
         .crop-controls
           .btn-group
-            %button.btn.btn-primary{ data: { method: "zoom", option: "0.1" } }
+            %button.btn.btn-primary{ data: { method: 'zoom', option: '0.1' } }
               %span.fa.fa-search-plus
-            %button.btn.btn-primary{ data: { method: "zoom", option: "-0.1" } }
+            %button.btn.btn-primary{ data: { method: 'zoom', option: '-0.1' } }
               %span.fa.fa-search-minus
       .modal-footer
-        %button.btn.btn-primary.js-upload-user-avatar{ :type => "button" }
+        %button.btn.btn-primary.js-upload-user-avatar{ type: 'button' }
           Set new profile picture
diff --git a/config/initializers/bootstrap_form.rb b/config/initializers/bootstrap_form.rb
new file mode 100644
index 00000000000..11171b38a85
--- /dev/null
+++ b/config/initializers/bootstrap_form.rb
@@ -0,0 +1,7 @@
+module BootstrapFormBuilderCustomization
+  def label_class
+    "label-light"
+  end
+end
+
+BootstrapForm::FormBuilder.prepend(BootstrapFormBuilderCustomization)
-- 
cgit v1.2.1


From 3b53b553b78d20268d228afa596b53d18046f98e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 22 Jun 2017 16:47:33 +0100
Subject: mobile improvements

---
 app/assets/stylesheets/new_nav.scss     | 20 ++++++++++----------
 app/views/layouts/header/_new.html.haml |  9 +++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index 70c1a26447f..8d280cbe305 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -50,15 +50,19 @@ header.navbar-gitlab-new {
   }
 
   .navbar-collapse {
+    padding-left: 0;
     color: $white-light;
   }
 
   .container-fluid {
     .navbar-toggle {
+      min-width: 45px;
       padding: 6px $gl-padding;
       margin-right: -5px;
+      font-size: 14px;
+      text-align: center;
       color: currentColor;
-      border-left: 1px solid $white-light;
+      border-left: 1px solid lighten($purple-700, 10%);
 
       &:hover,
       &:focus,
@@ -68,14 +72,6 @@ header.navbar-gitlab-new {
       }
     }
 
-    .navbar-toggle-left {
-      right: 0;
-      margin-right: 0;
-      margin-left: -16px;
-      border-left: 0;
-      border-right: 1px solid $white-light;
-    }
-
     .navbar-nav {
       @media (max-width: $screen-xs-max) {
         padding-right: 10px;
@@ -116,7 +112,7 @@ header.navbar-gitlab-new {
 
     > a {
       display: block;
-      padding: 16px 9px 13px;
+      padding: 16px 10px 13px;
       font-size: 13px;
       color: currentColor;
       border-bottom: 3px solid transparent;
@@ -135,6 +131,10 @@ header.navbar-gitlab-new {
   }
 }
 
+.header-user .dropdown-menu-nav {
+  margin-top: 4px;
+}
+
 .search {
   form {
     border-color: $purple-800;
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
index e4b5e5302af..7aa12657c03 100644
--- a/app/views/layouts/header/_new.html.haml
+++ b/app/views/layouts/header/_new.html.haml
@@ -16,10 +16,6 @@
         - else
           = render "layouts/nav/new_explore"
 
-      %button.navbar-toggle.navbar-toggle-left.hide.hidden-sm.hidden-md.hidden-lg.js-navbar-toggle-left{ type: 'button' }
-        %span.sr-only Toggle navigation
-        = icon('chevron-left')
-
       .navbar-collapse.collapse
         %ul.nav.navbar-nav
           %li.hidden-sm.hidden-xs
@@ -84,9 +80,10 @@
               %div
                 = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success'
 
-      %button.navbar-toggle.hidden-sm.hidden-md.hidden-lg.js-navbar-toggle-right{ type: 'button' }
+      %button.navbar-toggle.hidden-sm.hidden-md.hidden-lg{ type: 'button' }
         %span.sr-only Toggle navigation
-        = icon('chevron-right')
+        = icon('ellipsis-v', class: 'js-navbar-toggle-right')
+        = icon('times', class: 'js-navbar-toggle-left', style: 'display: none;')
 
       = yield :header_content
 
-- 
cgit v1.2.1


From db86a993e38b20b61ae909a755532d6204663c06 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 22 Jun 2017 16:08:48 +0000
Subject: Resolve "Can't sort Groups"

---
 .../javascripts/groups/stores/groups_store.js      | 42 ++++++++++++++--------
 spec/javascripts/groups/groups_spec.js             | 24 ++++++++++++-
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js
index f6dc4290fd5..6eab6083e8f 100644
--- a/app/assets/javascripts/groups/stores/groups_store.js
+++ b/app/assets/javascripts/groups/stores/groups_store.js
@@ -47,8 +47,8 @@ export default class GroupsStore {
 
     // Map groups to an object
     groups.map((group) => {
-      mappedGroups[group.id] = group;
-      mappedGroups[group.id].subGroups = {};
+      mappedGroups[`id${group.id}`] = group;
+      mappedGroups[`id${group.id}`].subGroups = {};
       return group;
     });
 
@@ -56,26 +56,27 @@ export default class GroupsStore {
       const currentGroup = mappedGroups[key];
       if (currentGroup.parentId) {
         // If the group is not at the root level, add it to its parent array of subGroups.
-        const findParentGroup = mappedGroups[currentGroup.parentId];
+        const findParentGroup = mappedGroups[`id${currentGroup.parentId}`];
         if (findParentGroup) {
-          mappedGroups[currentGroup.parentId].subGroups[currentGroup.id] = currentGroup;
-          mappedGroups[currentGroup.parentId].isOpen = true; // Expand group if it has subgroups
+          mappedGroups[`id${currentGroup.parentId}`].subGroups[`id${currentGroup.id}`] = currentGroup;
+          mappedGroups[`id${currentGroup.parentId}`].isOpen = true; // Expand group if it has subgroups
         } else if (parentGroup && parentGroup.id === currentGroup.parentId) {
-          tree[currentGroup.id] = currentGroup;
+          tree[`id${currentGroup.id}`] = currentGroup;
         } else {
-          // Means the groups hast no direct parent.
-          // Save for later processing, we will add them to its corresponding base group
+          // No parent found. We save it for later processing
           orphans.push(currentGroup);
+
+          // Add to tree to preserve original order
+          tree[`id${currentGroup.id}`] = currentGroup;
         }
       } else {
-        // If the group is at the root level, add it to first level elements array.
-        tree[currentGroup.id] = currentGroup;
+        // If the group is at the top level, add it to first level elements array.
+        tree[`id${currentGroup.id}`] = currentGroup;
       }
 
       return key;
     });
 
-    // Hopefully this array will be empty for most cases
     if (orphans.length) {
       orphans.map((orphan) => {
         let found = false;
@@ -83,11 +84,23 @@ export default class GroupsStore {
 
         Object.keys(tree).map((key) => {
           const group = tree[key];
-          if (currentOrphan.fullPath.lastIndexOf(group.fullPath) === 0) {
+
+          if (
+           group &&
+           currentOrphan.fullPath.lastIndexOf(group.fullPath) === 0 &&
+           // Make sure the currently selected orphan is not the same as the group
+           // we are checking here otherwise it will end up in an infinite loop
+           currentOrphan.id !== group.id
+           ) {
             group.subGroups[currentOrphan.id] = currentOrphan;
             group.isOpen = true;
             currentOrphan.isOrphan = true;
             found = true;
+
+            // Delete if group was put at the top level. If not the group will be displayed twice.
+            if (tree[`id${currentOrphan.id}`]) {
+              delete tree[`id${currentOrphan.id}`];
+            }
           }
 
           return key;
@@ -95,7 +108,8 @@ export default class GroupsStore {
 
         if (!found) {
           currentOrphan.isOrphan = true;
-          tree[currentOrphan.id] = currentOrphan;
+
+          tree[`id${currentOrphan.id}`] = currentOrphan;
         }
 
         return orphan;
@@ -140,7 +154,7 @@ export default class GroupsStore {
 
   // eslint-disable-next-line class-methods-use-this
   removeGroup(group, collection) {
-    Vue.delete(collection, group.id);
+    Vue.delete(collection, `id${group.id}`);
   }
 
   // eslint-disable-next-line class-methods-use-this
diff --git a/spec/javascripts/groups/groups_spec.js b/spec/javascripts/groups/groups_spec.js
index 2a77f7259da..aaffb56fa94 100644
--- a/spec/javascripts/groups/groups_spec.js
+++ b/spec/javascripts/groups/groups_spec.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import eventHub from '~/groups/event_hub';
 import groupFolderComponent from '~/groups/components/group_folder.vue';
 import groupItemComponent from '~/groups/components/group_item.vue';
 import groupsComponent from '~/groups/components/groups.vue';
@@ -46,6 +47,12 @@ describe('Groups Component', () => {
       expect(component.$el.querySelector('#group-1120')).toBeDefined();
     });
 
+    it('should respect the order of groups', () => {
+      const wrap = component.$el.querySelector('.groups-list-tree-container > .group-list-tree');
+      expect(wrap.querySelector('.group-row:nth-child(1)').id).toBe('group-12');
+      expect(wrap.querySelector('.group-row:nth-child(2)').id).toBe('group-1119');
+    });
+
     it('should render group and its subgroup', () => {
       const lists = component.$el.querySelectorAll('.group-list-tree');
 
@@ -54,11 +61,26 @@ describe('Groups Component', () => {
       expect(lists[0].querySelector('#group-1119').classList.contains('is-open')).toBe(true);
       expect(lists[0].querySelector('#group-1119').classList.contains('has-subgroups')).toBe(true);
 
-      expect(lists[2].querySelector('#group-1120').textContent).toContain(groups[1119].subGroups[1120].name);
+      expect(lists[2].querySelector('#group-1120').textContent).toContain(groups.id1119.subGroups.id1120.name);
     });
 
     it('should remove prefix of parent group', () => {
       expect(component.$el.querySelector('#group-12 #group-1128 .title').textContent).toContain('level2 / level3 / level4');
     });
+
+    it('should remove the group after leaving the group', (done) => {
+      spyOn(window, 'confirm').and.returnValue(true);
+
+      eventHub.$on('leaveGroup', (group, collection) => {
+        store.removeGroup(group, collection);
+      });
+
+      component.$el.querySelector('#group-12 .leave-group').click();
+
+      Vue.nextTick(() => {
+        expect(component.$el.querySelector('#group-12')).toBeNull();
+        done();
+      });
+    });
   });
 });
-- 
cgit v1.2.1


From 72111fad944d9506bc6d1769bc28ff3525004023 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Thu, 22 Jun 2017 11:09:28 -0500
Subject: Update CHANGELOG.md for 9.3.0

[ci skip]
---
 CHANGELOG.md                                       | 214 +++++++++++++++++++++
 .../unreleased/10378-promote-blameless-culture.yml |   4 -
 .../unreleased/12614-fix-long-message-from-mr.yml  |   4 -
 changelogs/unreleased/12614-fix-long-message.yml   |   4 -
 .../unreleased/12910-snippets-description.yml      |   4 -
 ...-activity-feed-to-be-accessible-through-api.yml |   4 -
 .../unreleased/17489-hide-code-from-guests.yml     |   4 -
 .../18927-reorder-issue-action-buttons.yml         |   4 -
 ...-issue-for-project-that-has-issues-disabled.yml |   4 -
 ...lete-projects-issuescontroller-redirect_old.yml |   4 -
 ...-all-spinach-tests-with-rspec-feature-tests.yml |   4 -
 ...xtra-functionality-for-the-top-right-button.yml |   4 -
 ...etting-change-other-dropdowns-automatically.yml |   4 -
 .../unreleased/24196-protected-variables.yml       |   5 -
 .../unreleased/24373-warning-message-go-away.yml   |   4 -
 changelogs/unreleased/25373-jira-links.yml         |   4 -
 changelogs/unreleased/25426-group-dashboard-ui.yml |   4 -
 changelogs/unreleased/25680-CI_ENVIRONMENT_URL.yml |   4 -
 changelogs/unreleased/26325-system-hooks.yml       |   4 -
 .../27148-limit-bulk-create-memberships.yml        |   4 -
 changelogs/unreleased/27439-memory-usage-info.yml  |   4 -
 .../27614-improve-instant-comments-exp.yml         |   4 -
 changelogs/unreleased/28080-system-checks.yml      |   4 -
 ...uring-project-via-api-works-very-unreliable.yml |   4 -
 .../28694-hard-delete-user-from-admin-panel.yml    |   4 -
 .../unreleased/28694-hard-delete-user-from-api.yml |   4 -
 changelogs/unreleased/29010-perf-bar.yml           |   4 -
 ...d-prometheus-instrumenting-to-gitlab-webapp.yml |   4 -
 .../unreleased/29690-rotate-otp-key-base.yml       |   4 -
 changelogs/unreleased/29852-latex-formatting.yml   |   4 -
 .../30378-simplified-repository-settings-page.yml  |   4 -
 .../unreleased/30410-revert-9347-and-10079.yml     |   5 -
 changelogs/unreleased/30469-convdev-index.yml      |   4 -
 ...0651-improve-container-registry-description.yml |   4 -
 .../unreleased/30827-changes-to-audit-log.yml      |   4 -
 ...30892-add-api-support-for-pipeline-schedule.yml |   4 -
 ...ki-is-not-searchable-with-guest-permissions.yml |   4 -
 changelogs/unreleased/30949-empty-states.yml       |   4 -
 ...-26135-ci-project-slug-enviroment-variables.yml |   4 -
 ...age-after-search-doesn-t-go-to-correct-form.yml |   4 -
 changelogs/unreleased/31448-jira-urls.yml          |   4 -
 ...lestone-dropdown-should-not-be-multi-select.yml |   4 -
 changelogs/unreleased/31483-ordered-task-list.yml  |   4 -
 .../unreleased/31510-mask-password-field-edit.yml  |   4 -
 changelogs/unreleased/31511-jira-settings.yml      |   4 -
 .../31554-update-rufus-scheduler-and-sidekiq.yml   |   5 -
 ...ed-runner-is-enabled-in-the-admin-dashboard.yml |   4 -
 ...add-uptime-of-gitlab-instance-in-admin-area.yml |   4 -
 ...en-you-try-to-add-a-tag-that-already-exists.yml |   4 -
 changelogs/unreleased/31633-animate-issue.yml      |   4 -
 .../31644-make-cookie-sessions-unique.yml          |   4 -
 ...n-filter-in-search-bar-to-activate-dropdown.yml |   4 -
 .../31781-print-rendered-files-not-possible.yml    |   4 -
 ...r-destroy-action-without-an-explicit-status.yml |   4 -
 .../unreleased/31849-pipeline-real-time-header.yml |   4 -
 .../31849-pipeline-show-view-realtime.yml          |   5 -
 .../31902-namespace-recent-searches-to-project.yml |   4 -
 changelogs/unreleased/3191-deploy-keys-update.yml  |   4 -
 changelogs/unreleased/31943-document-go-183.yml    |   3 -
 ...-file-size-limit-for-default-toggle-opening.yml |   4 -
 .../unreleased/31998-pipelines-empty-state.yml     |   4 -
 ...-enabled-for-personal-snippet-comments-form.yml |   4 -
 .../unreleased/32118-new-environment-btn-copy.yml  |   4 -
 ...all-in-ci-by-utilizing-inter-pipeline-cache.yml |   4 -
 ...e-administration-environment_variables-html.yml |   4 -
 .../32418-make-link-to-self-less-obvious.yml       |   4 -
 .../32570-project-activity-tab-border.yml          |   4 -
 ...ks-if-password-is-not-provided-for-git-http.yml |   4 -
 .../32642_last_commit_id_in_file_api.yml           |   4 -
 changelogs/unreleased/32682-skipped-ci-icon.yml    |   4 -
 changelogs/unreleased/32720-emoji-spacing.yml      |   4 -
 ...799-remove-no_turbolink-attribute-from-haml.yml |   4 -
 changelogs/unreleased/32807-company-icon.yml       |   4 -
 .../32832-confidential-issue-overflow.yml          |   5 -
 .../unreleased/32851-postgres-min-version.yml      |   4 -
 changelogs/unreleased/32955-special-keywords.yml   |   4 -
 ...tion-removed-the-newline-in-the-end-of-file.yml |   4 -
 ...tandard-gzip-compression-for-webpack-assets.yml |   4 -
 .../33000-tag-list-in-project-create-api.yml       |   4 -
 ...ressed-yourself-todo-when-using-unsubscribe.yml |   5 -
 ...issions-for-project-labels-and-group-labels.yml |   4 -
 ...3207-show-delete-option-in-admin-users-page.yml |   4 -
 .../unreleased/33215-fix-hard-delete-of-users.yml  |   4 -
 ...project-for-user-api-ignores-path-parameter.yml |   4 -
 ...chinese_translation_of_cycle_analytics_page.yml |   4 -
 .../33308-use-pre-wrap-for-commit-messages.yml     |   4 -
 ..._brazil_translation_of_cycle_analytics_page.yml |   4 -
 ...lgarian_translation_of_cycle_analytics_page.yml |   4 -
 .../unreleased/33878_fix_edit_deploy_key.yml       |   4 -
 ...em-note-highlight-don-t-have-the-same-width.yml |   4 -
 .../unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml  |   4 -
 ...ents-for-count-badges-and-permission-badges.yml |   5 -
 changelogs/unreleased/adam-influxdb-hostname.yml   |   4 -
 .../add-index-for-auto_canceled_by_id-mysql.yml    |   4 -
 .../unreleased/add-unicode-trace-feature-test.yml  |   4 -
 ...aching_file_and_redesign_attaching_files_ui.yml |   4 -
 changelogs/unreleased/aliyun-backup-provider.yml   |   4 -
 .../allow-reporters-to-promote-group-labels.yml    |   4 -
 .../unreleased/allow_numeric_pages_domain.yml      |   4 -
 .../allow_numeric_values_in_gitlab_ci_yml.yml      |   4 -
 .../unreleased/artifacts-keyboard-shortcuts.yml    |   4 -
 .../unreleased/auto-search-when-state-changed.yml  |   4 -
 .../unreleased/bugfix-v3-deploy_keys-can_push.yml  |   4 -
 .../bvl-rename-build-events-to-job-events.yml      |   4 -
 .../unreleased/bvl-translate-project-pages.yml     |   4 -
 .../unreleased/ce-31853-projects-shared-groups.yml |   4 -
 ...e-32623-browser-tooltip-commits-branch-list.yml |   5 -
 .../unreleased/ci-build-pipeline-header-vue.yml    |   4 -
 .../unreleased/disable-blocked-manual-actions.yml  |   4 -
 .../disable-environment-list-refresh.yml           |   4 -
 changelogs/unreleased/dm-async-tree-readme.yml     |   4 -
 changelogs/unreleased/dm-auxiliary-viewers.yml     |   5 -
 .../dm-comment-on-mr-commit-discussion.yml         |   4 -
 .../unreleased/dm-consistent-commit-sha-style.yml  |   4 -
 .../unreleased/dm-consistent-last-push-event.yml   |   4 -
 .../dm-copy-as-gfm-without-empty-elements.yml      |   4 -
 ...m-when-parts-of-other-elements-are-selected.yml |   4 -
 .../unreleased/dm-dependency-linker-gemfile.yml    |   4 -
 changelogs/unreleased/dm-discussions-n-plus-1.yml  |   4 -
 .../dm-emails-are-not-user-references.yml          |   4 -
 changelogs/unreleased/dm-fix-jump-button.yml       |   4 -
 changelogs/unreleased/dm-fix-parser-cache.yml      |   4 -
 changelogs/unreleased/dm-gitmodules-parsing.yml    |   4 -
 changelogs/unreleased/dm-gravatar-username.yml     |   4 -
 .../unreleased/dm-more-dependency-linkers.yml      |   4 -
 changelogs/unreleased/dm-oauth-config-for.yml      |   4 -
 changelogs/unreleased/dm-outdated-system-note.yml  |   4 -
 .../unreleased/dm-paste-code-inside-gfm-code.yml   |   4 -
 changelogs/unreleased/dm-revert-mr-8427.yml        |   4 -
 changelogs/unreleased/dm-tree-last-commit.yml      |   4 -
 changelogs/unreleased/document-foreign-keys.yml    |   4 -
 changelogs/unreleased/dturner-username.yml         |   4 -
 .../unreleased/dz-fix-submodule-subgroup.yml       |   4 -
 .../unreleased/dz-project-list-cache-key.yml       |   4 -
 .../dz-rename-pipelines-settings-tab.yml           |   4 -
 .../enable-auto-cancelling-by-default.yml          |   4 -
 changelogs/unreleased/environment-detail-view.yml  |   4 -
 .../expand-backlog-closed-lists-issue-boards.yml   |   4 -
 changelogs/unreleased/feature-flags-flipper.yml    |   4 -
 .../feature-gb-persist-pipeline-stages.yml         |   4 -
 .../feature-print-go-version-in-env-info.yml       |   4 -
 changelogs/unreleased/feature-rss-scoped-token.yml |   4 -
 changelogs/unreleased/fix-33259.yml                |   4 -
 .../fix-counter-cache-for-acts-as-taggable.yml     |   4 -
 .../unreleased/fix-encoding-binary-issue.yml       |   4 -
 ...exclude-manual-actions-from-cancelable-jobs.yml |   4 -
 changelogs/unreleased/fix-github-clone-wiki.yml    |   4 -
 changelogs/unreleased/fix-github-import.yml        |   4 -
 .../fix-n-plus-one-queries-for-user-access.yml     |   4 -
 .../fix-support-for-external-ci-services.yml       |   4 -
 changelogs/unreleased/fix_commits_page.yml         |   4 -
 changelogs/unreleased/fix_diff_line_comments.yml   |   5 -
 changelogs/unreleased/gitaly-local-branches.yml    |   4 -
 changelogs/unreleased/gitaly-opt-out.yml           |   4 -
 .../instrument-merge-request-diff-load-commits.yml |   4 -
 .../unreleased/introduce-source-to-pipelines.yml   |   4 -
 .../issuable-form-create-label-sub-groups.yml      |   4 -
 changelogs/unreleased/issue-23254.yml              |   4 -
 changelogs/unreleased/issue-edit-inline.yml        |   4 -
 ...issue-template-reproduce-in-example-project.yml |   4 -
 .../unreleased/issue-templates-summary-lines.yml   |   4 -
 changelogs/unreleased/issue_19262.yml              |   4 -
 changelogs/unreleased/issue_27166_2.yml            |   4 -
 changelogs/unreleased/issue_27168_2.yml            |   4 -
 changelogs/unreleased/issue_32225_2.yml            |   4 -
 .../unreleased/jouve-gitlab-ce-admin_keys.yml      |   5 -
 .../mabes-gitlab-ce-bypass-auto-login.yml          |   4 -
 .../unreleased/migrate-artifacts-to-a-new-path.yml |   4 -
 .../unreleased/mk-fix-git-over-http-rejections.yml |   4 -
 changelogs/unreleased/mrchrisw-catch-openssl.yml   |   4 -
 changelogs/unreleased/omega-submodules.yml         |   4 -
 changelogs/unreleased/prevent-project-transfer.yml |   4 -
 .../unreleased/projects-api-import-status.yml      |   4 -
 .../unreleased/protected-branches-no-one-merge.yml |   4 -
 .../unreleased/reduce-sidekiq-wait-timings.yml     |   4 -
 .../refactor-projects-finder-init-collection.yml   |   5 -
 changelogs/unreleased/remove-old-isobject.yml      |   4 -
 changelogs/unreleased/rename-builds-controller.yml |   4 -
 .../rework-authorizations-performance.yml          |   6 -
 .../search-restrict-projects-to-group.yml          |   4 -
 .../sh-fix-container-registry-s3-redirects.yml     |   4 -
 .../sh-fix-refactor-uploader-work-dir.yml          |   4 -
 changelogs/unreleased/sync-email-from-omniauth.yml |   4 -
 changelogs/unreleased/task-list-2.yml              |   4 -
 .../unreleased/tc-cache-trackable-attributes.yml   |   4 -
 .../tc-clean-pending-delete-projects.yml           |   4 -
 .../unreleased/tc-improve-project-api-perf.yml     |   4 -
 .../up-arrow-focus-discussion-comment.yml          |   4 -
 changelogs/unreleased/update-admin-health-page.yml |   5 -
 .../use_relative_path_for_project_avatars.yml      |   4 -
 .../wait-for-ajax-handling-all-js-requests.yml     |   4 -
 changelogs/unreleased/winh-current-user-filter.yml |   4 -
 .../unreleased/winh-pipeline-author-link.yml       |   4 -
 .../unreleased/winh-styled-people-search-bar.yml   |   4 -
 .../unreleased/zj-clean-up-ci-variables-table.yml  |   4 -
 .../unreleased/zj-i18n-pipeline-schedules.yml      |   4 -
 .../unreleased/zj-job-view-goes-real-time.yml      |   4 -
 .../unreleased/zj-pipeline-schedule-owner.yml      |   4 -
 changelogs/unreleased/zj-prom-pipeline-count.yml   |   4 -
 .../unreleased/zj-raise-etag-route-regex-miss.yml  |   4 -
 changelogs/unreleased/zj-read-registry-pat.yml     |   4 -
 changelogs/unreleased/zj-realtime-env-list.yml     |   4 -
 changelogs/unreleased/zj-sort-env-folders.yml      |   4 -
 203 files changed, 214 insertions(+), 822 deletions(-)
 delete mode 100644 changelogs/unreleased/10378-promote-blameless-culture.yml
 delete mode 100644 changelogs/unreleased/12614-fix-long-message-from-mr.yml
 delete mode 100644 changelogs/unreleased/12614-fix-long-message.yml
 delete mode 100644 changelogs/unreleased/12910-snippets-description.yml
 delete mode 100644 changelogs/unreleased/14707-allow-activity-feed-to-be-accessible-through-api.yml
 delete mode 100644 changelogs/unreleased/17489-hide-code-from-guests.yml
 delete mode 100644 changelogs/unreleased/18927-reorder-issue-action-buttons.yml
 delete mode 100644 changelogs/unreleased/19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled.yml
 delete mode 100644 changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml
 delete mode 100644 changelogs/unreleased/23036-replace-all-spinach-tests-with-rspec-feature-tests.yml
 delete mode 100644 changelogs/unreleased/23603-add-extra-functionality-for-the-top-right-button.yml
 delete mode 100644 changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml
 delete mode 100644 changelogs/unreleased/24196-protected-variables.yml
 delete mode 100644 changelogs/unreleased/24373-warning-message-go-away.yml
 delete mode 100644 changelogs/unreleased/25373-jira-links.yml
 delete mode 100644 changelogs/unreleased/25426-group-dashboard-ui.yml
 delete mode 100644 changelogs/unreleased/25680-CI_ENVIRONMENT_URL.yml
 delete mode 100644 changelogs/unreleased/26325-system-hooks.yml
 delete mode 100644 changelogs/unreleased/27148-limit-bulk-create-memberships.yml
 delete mode 100644 changelogs/unreleased/27439-memory-usage-info.yml
 delete mode 100644 changelogs/unreleased/27614-improve-instant-comments-exp.yml
 delete mode 100644 changelogs/unreleased/28080-system-checks.yml
 delete mode 100644 changelogs/unreleased/28607-forking-and-configuring-project-via-api-works-very-unreliable.yml
 delete mode 100644 changelogs/unreleased/28694-hard-delete-user-from-admin-panel.yml
 delete mode 100644 changelogs/unreleased/28694-hard-delete-user-from-api.yml
 delete mode 100644 changelogs/unreleased/29010-perf-bar.yml
 delete mode 100644 changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
 delete mode 100644 changelogs/unreleased/29690-rotate-otp-key-base.yml
 delete mode 100644 changelogs/unreleased/29852-latex-formatting.yml
 delete mode 100644 changelogs/unreleased/30378-simplified-repository-settings-page.yml
 delete mode 100644 changelogs/unreleased/30410-revert-9347-and-10079.yml
 delete mode 100644 changelogs/unreleased/30469-convdev-index.yml
 delete mode 100644 changelogs/unreleased/30651-improve-container-registry-description.yml
 delete mode 100644 changelogs/unreleased/30827-changes-to-audit-log.yml
 delete mode 100644 changelogs/unreleased/30892-add-api-support-for-pipeline-schedule.yml
 delete mode 100644 changelogs/unreleased/30917-wiki-is-not-searchable-with-guest-permissions.yml
 delete mode 100644 changelogs/unreleased/30949-empty-states.yml
 delete mode 100644 changelogs/unreleased/31061-26135-ci-project-slug-enviroment-variables.yml
 delete mode 100644 changelogs/unreleased/31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form.yml
 delete mode 100644 changelogs/unreleased/31448-jira-urls.yml
 delete mode 100644 changelogs/unreleased/31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select.yml
 delete mode 100644 changelogs/unreleased/31483-ordered-task-list.yml
 delete mode 100644 changelogs/unreleased/31510-mask-password-field-edit.yml
 delete mode 100644 changelogs/unreleased/31511-jira-settings.yml
 delete mode 100644 changelogs/unreleased/31554-update-rufus-scheduler-and-sidekiq.yml
 delete mode 100644 changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml
 delete mode 100644 changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
 delete mode 100644 changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml
 delete mode 100644 changelogs/unreleased/31633-animate-issue.yml
 delete mode 100644 changelogs/unreleased/31644-make-cookie-sessions-unique.yml
 delete mode 100644 changelogs/unreleased/31757-single-click-on-filter-in-search-bar-to-activate-dropdown.yml
 delete mode 100644 changelogs/unreleased/31781-print-rendered-files-not-possible.yml
 delete mode 100644 changelogs/unreleased/31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status.yml
 delete mode 100644 changelogs/unreleased/31849-pipeline-real-time-header.yml
 delete mode 100644 changelogs/unreleased/31849-pipeline-show-view-realtime.yml
 delete mode 100644 changelogs/unreleased/31902-namespace-recent-searches-to-project.yml
 delete mode 100644 changelogs/unreleased/3191-deploy-keys-update.yml
 delete mode 100644 changelogs/unreleased/31943-document-go-183.yml
 delete mode 100644 changelogs/unreleased/31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening.yml
 delete mode 100644 changelogs/unreleased/31998-pipelines-empty-state.yml
 delete mode 100644 changelogs/unreleased/32086-atwho-is-still-enabled-for-personal-snippet-comments-form.yml
 delete mode 100644 changelogs/unreleased/32118-new-environment-btn-copy.yml
 delete mode 100644 changelogs/unreleased/32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache.yml
 delete mode 100644 changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml
 delete mode 100644 changelogs/unreleased/32418-make-link-to-self-less-obvious.yml
 delete mode 100644 changelogs/unreleased/32570-project-activity-tab-border.yml
 delete mode 100644 changelogs/unreleased/32598-avoid-resource-intensive-login-checks-if-password-is-not-provided-for-git-http.yml
 delete mode 100644 changelogs/unreleased/32642_last_commit_id_in_file_api.yml
 delete mode 100644 changelogs/unreleased/32682-skipped-ci-icon.yml
 delete mode 100644 changelogs/unreleased/32720-emoji-spacing.yml
 delete mode 100644 changelogs/unreleased/32799-remove-no_turbolink-attribute-from-haml.yml
 delete mode 100644 changelogs/unreleased/32807-company-icon.yml
 delete mode 100644 changelogs/unreleased/32832-confidential-issue-overflow.yml
 delete mode 100644 changelogs/unreleased/32851-postgres-min-version.yml
 delete mode 100644 changelogs/unreleased/32955-special-keywords.yml
 delete mode 100644 changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml
 delete mode 100644 changelogs/unreleased/32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets.yml
 delete mode 100644 changelogs/unreleased/33000-tag-list-in-project-create-api.yml
 delete mode 100644 changelogs/unreleased/33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe.yml
 delete mode 100644 changelogs/unreleased/33154-permissions-for-project-labels-and-group-labels.yml
 delete mode 100644 changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml
 delete mode 100644 changelogs/unreleased/33215-fix-hard-delete-of-users.yml
 delete mode 100644 changelogs/unreleased/33242-create-project-for-user-api-ignores-path-parameter.yml
 delete mode 100644 changelogs/unreleased/33245-chinese_translation_of_cycle_analytics_page.yml
 delete mode 100644 changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml
 delete mode 100644 changelogs/unreleased/33334-portuguese_brazil_translation_of_cycle_analytics_page.yml
 delete mode 100644 changelogs/unreleased/33383-bulgarian_translation_of_cycle_analytics_page.yml
 delete mode 100644 changelogs/unreleased/33878_fix_edit_deploy_key.yml
 delete mode 100644 changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml
 delete mode 100644 changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
 delete mode 100644 changelogs/unreleased/UI-improvements-for-count-badges-and-permission-badges.yml
 delete mode 100644 changelogs/unreleased/adam-influxdb-hostname.yml
 delete mode 100644 changelogs/unreleased/add-index-for-auto_canceled_by_id-mysql.yml
 delete mode 100644 changelogs/unreleased/add-unicode-trace-feature-test.yml
 delete mode 100644 changelogs/unreleased/add_ability_to_cancel_attaching_file_and_redesign_attaching_files_ui.yml
 delete mode 100644 changelogs/unreleased/aliyun-backup-provider.yml
 delete mode 100644 changelogs/unreleased/allow-reporters-to-promote-group-labels.yml
 delete mode 100644 changelogs/unreleased/allow_numeric_pages_domain.yml
 delete mode 100644 changelogs/unreleased/allow_numeric_values_in_gitlab_ci_yml.yml
 delete mode 100644 changelogs/unreleased/artifacts-keyboard-shortcuts.yml
 delete mode 100644 changelogs/unreleased/auto-search-when-state-changed.yml
 delete mode 100644 changelogs/unreleased/bugfix-v3-deploy_keys-can_push.yml
 delete mode 100644 changelogs/unreleased/bvl-rename-build-events-to-job-events.yml
 delete mode 100644 changelogs/unreleased/bvl-translate-project-pages.yml
 delete mode 100644 changelogs/unreleased/ce-31853-projects-shared-groups.yml
 delete mode 100644 changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml
 delete mode 100644 changelogs/unreleased/ci-build-pipeline-header-vue.yml
 delete mode 100644 changelogs/unreleased/disable-blocked-manual-actions.yml
 delete mode 100644 changelogs/unreleased/disable-environment-list-refresh.yml
 delete mode 100644 changelogs/unreleased/dm-async-tree-readme.yml
 delete mode 100644 changelogs/unreleased/dm-auxiliary-viewers.yml
 delete mode 100644 changelogs/unreleased/dm-comment-on-mr-commit-discussion.yml
 delete mode 100644 changelogs/unreleased/dm-consistent-commit-sha-style.yml
 delete mode 100644 changelogs/unreleased/dm-consistent-last-push-event.yml
 delete mode 100644 changelogs/unreleased/dm-copy-as-gfm-without-empty-elements.yml
 delete mode 100644 changelogs/unreleased/dm-copy-gfm-when-parts-of-other-elements-are-selected.yml
 delete mode 100644 changelogs/unreleased/dm-dependency-linker-gemfile.yml
 delete mode 100644 changelogs/unreleased/dm-discussions-n-plus-1.yml
 delete mode 100644 changelogs/unreleased/dm-emails-are-not-user-references.yml
 delete mode 100644 changelogs/unreleased/dm-fix-jump-button.yml
 delete mode 100644 changelogs/unreleased/dm-fix-parser-cache.yml
 delete mode 100644 changelogs/unreleased/dm-gitmodules-parsing.yml
 delete mode 100644 changelogs/unreleased/dm-gravatar-username.yml
 delete mode 100644 changelogs/unreleased/dm-more-dependency-linkers.yml
 delete mode 100644 changelogs/unreleased/dm-oauth-config-for.yml
 delete mode 100644 changelogs/unreleased/dm-outdated-system-note.yml
 delete mode 100644 changelogs/unreleased/dm-paste-code-inside-gfm-code.yml
 delete mode 100644 changelogs/unreleased/dm-revert-mr-8427.yml
 delete mode 100644 changelogs/unreleased/dm-tree-last-commit.yml
 delete mode 100644 changelogs/unreleased/document-foreign-keys.yml
 delete mode 100644 changelogs/unreleased/dturner-username.yml
 delete mode 100644 changelogs/unreleased/dz-fix-submodule-subgroup.yml
 delete mode 100644 changelogs/unreleased/dz-project-list-cache-key.yml
 delete mode 100644 changelogs/unreleased/dz-rename-pipelines-settings-tab.yml
 delete mode 100644 changelogs/unreleased/enable-auto-cancelling-by-default.yml
 delete mode 100644 changelogs/unreleased/environment-detail-view.yml
 delete mode 100644 changelogs/unreleased/expand-backlog-closed-lists-issue-boards.yml
 delete mode 100644 changelogs/unreleased/feature-flags-flipper.yml
 delete mode 100644 changelogs/unreleased/feature-gb-persist-pipeline-stages.yml
 delete mode 100644 changelogs/unreleased/feature-print-go-version-in-env-info.yml
 delete mode 100644 changelogs/unreleased/feature-rss-scoped-token.yml
 delete mode 100644 changelogs/unreleased/fix-33259.yml
 delete mode 100644 changelogs/unreleased/fix-counter-cache-for-acts-as-taggable.yml
 delete mode 100644 changelogs/unreleased/fix-encoding-binary-issue.yml
 delete mode 100644 changelogs/unreleased/fix-gb-exclude-manual-actions-from-cancelable-jobs.yml
 delete mode 100644 changelogs/unreleased/fix-github-clone-wiki.yml
 delete mode 100644 changelogs/unreleased/fix-github-import.yml
 delete mode 100644 changelogs/unreleased/fix-n-plus-one-queries-for-user-access.yml
 delete mode 100644 changelogs/unreleased/fix-support-for-external-ci-services.yml
 delete mode 100644 changelogs/unreleased/fix_commits_page.yml
 delete mode 100644 changelogs/unreleased/fix_diff_line_comments.yml
 delete mode 100644 changelogs/unreleased/gitaly-local-branches.yml
 delete mode 100644 changelogs/unreleased/gitaly-opt-out.yml
 delete mode 100644 changelogs/unreleased/instrument-merge-request-diff-load-commits.yml
 delete mode 100644 changelogs/unreleased/introduce-source-to-pipelines.yml
 delete mode 100644 changelogs/unreleased/issuable-form-create-label-sub-groups.yml
 delete mode 100644 changelogs/unreleased/issue-23254.yml
 delete mode 100644 changelogs/unreleased/issue-edit-inline.yml
 delete mode 100644 changelogs/unreleased/issue-template-reproduce-in-example-project.yml
 delete mode 100644 changelogs/unreleased/issue-templates-summary-lines.yml
 delete mode 100644 changelogs/unreleased/issue_19262.yml
 delete mode 100644 changelogs/unreleased/issue_27166_2.yml
 delete mode 100644 changelogs/unreleased/issue_27168_2.yml
 delete mode 100644 changelogs/unreleased/issue_32225_2.yml
 delete mode 100644 changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
 delete mode 100644 changelogs/unreleased/mabes-gitlab-ce-bypass-auto-login.yml
 delete mode 100644 changelogs/unreleased/migrate-artifacts-to-a-new-path.yml
 delete mode 100644 changelogs/unreleased/mk-fix-git-over-http-rejections.yml
 delete mode 100644 changelogs/unreleased/mrchrisw-catch-openssl.yml
 delete mode 100644 changelogs/unreleased/omega-submodules.yml
 delete mode 100644 changelogs/unreleased/prevent-project-transfer.yml
 delete mode 100644 changelogs/unreleased/projects-api-import-status.yml
 delete mode 100644 changelogs/unreleased/protected-branches-no-one-merge.yml
 delete mode 100644 changelogs/unreleased/reduce-sidekiq-wait-timings.yml
 delete mode 100644 changelogs/unreleased/refactor-projects-finder-init-collection.yml
 delete mode 100644 changelogs/unreleased/remove-old-isobject.yml
 delete mode 100644 changelogs/unreleased/rename-builds-controller.yml
 delete mode 100644 changelogs/unreleased/rework-authorizations-performance.yml
 delete mode 100644 changelogs/unreleased/search-restrict-projects-to-group.yml
 delete mode 100644 changelogs/unreleased/sh-fix-container-registry-s3-redirects.yml
 delete mode 100644 changelogs/unreleased/sh-fix-refactor-uploader-work-dir.yml
 delete mode 100644 changelogs/unreleased/sync-email-from-omniauth.yml
 delete mode 100644 changelogs/unreleased/task-list-2.yml
 delete mode 100644 changelogs/unreleased/tc-cache-trackable-attributes.yml
 delete mode 100644 changelogs/unreleased/tc-clean-pending-delete-projects.yml
 delete mode 100644 changelogs/unreleased/tc-improve-project-api-perf.yml
 delete mode 100644 changelogs/unreleased/up-arrow-focus-discussion-comment.yml
 delete mode 100644 changelogs/unreleased/update-admin-health-page.yml
 delete mode 100644 changelogs/unreleased/use_relative_path_for_project_avatars.yml
 delete mode 100644 changelogs/unreleased/wait-for-ajax-handling-all-js-requests.yml
 delete mode 100644 changelogs/unreleased/winh-current-user-filter.yml
 delete mode 100644 changelogs/unreleased/winh-pipeline-author-link.yml
 delete mode 100644 changelogs/unreleased/winh-styled-people-search-bar.yml
 delete mode 100644 changelogs/unreleased/zj-clean-up-ci-variables-table.yml
 delete mode 100644 changelogs/unreleased/zj-i18n-pipeline-schedules.yml
 delete mode 100644 changelogs/unreleased/zj-job-view-goes-real-time.yml
 delete mode 100644 changelogs/unreleased/zj-pipeline-schedule-owner.yml
 delete mode 100644 changelogs/unreleased/zj-prom-pipeline-count.yml
 delete mode 100644 changelogs/unreleased/zj-raise-etag-route-regex-miss.yml
 delete mode 100644 changelogs/unreleased/zj-read-registry-pat.yml
 delete mode 100644 changelogs/unreleased/zj-realtime-env-list.yml
 delete mode 100644 changelogs/unreleased/zj-sort-env-folders.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af5f5809c41..905c588d338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,220 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 9.3.0 (2017-06-22)
+
+- Refactored gitlab:app:check into SystemCheck liberary and improve some checks. !9173
+- Add an ability to cancel attaching file and redesign attaching files UI. !9431 (blackst0ne)
+- Add Aliyun OSS as the backup storage provider. !9721 (Yuanfei Zhu)
+- Add suport for find_local_branches GRPC from Gitaly. !10059
+- Allow manual bypass of auto_sign_in_with_provider with a new param. !10187 (Maxime Besson)
+- Redirect to user's keys index instead of user's index after a key is deleted in the admin. !10227 (Cyril Jouve)
+- Changed Blame to Annotate in the UI to promote blameless culture. !10378 (Ilya Vassilevsky)
+- Implement ability to update deploy keys. !10383 (Alexander Randa)
+- Allow numeric values in gitlab-ci.yml. !10607 (blackst0ne)
+- Add a feature test for Unicode trace. !10736 (dosuken123)
+- Notes: Warning message should go away once resolved. !10823 (Jacopo Beschi @jacopo-beschi)
+- Project authorizations are calculated much faster when using PostgreSQL, and nested groups support for MySQL has been removed
+. !10885
+- Fix long urls in the title of commit. !10938 (Alexander Randa)
+- Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0. !10976 (dosuken123)
+- Use relative paths for group/project/user avatars. !11001 (blackst0ne)
+- Enable cancelling non-HEAD pending pipelines by default for all projects. !11023
+- Implement web hook logging. !11027 (Alexander Randa)
+- Add indices for auto_canceled_by_id for ci_pipelines and ci_builds on PostgreSQL. !11034
+- Add post-deploy migration to clean up projects in `pending_delete` state. !11044
+- Limit User's trackable attributes, like `current_sign_in_at`, to update at most once/hour. !11053
+- Disallow multiple selections for Milestone dropdown. !11084
+- Link to commit author user page from pipelines. !11100
+- Fix the last coverage in trace log should be extracted. !11128 (dosuken123)
+- Remove redirect for old issue url containing id instead of iid. !11135 (blackst0ne)
+- Backported new SystemHook event: `repository_update`. !11140
+- Keep input data after creating a tag that already exists. !11155
+- Fix support for external CI services. !11176
+- Translate backend for Project & Repository pages. !11183
+- Fix LaTeX formatting for AsciiDoc wiki. !11212
+- Add foreign key for pipeline schedule owner. !11233
+- Print Go version in rake gitlab:env:info. !11241
+- Include the blob content when printing a blob page. !11247
+- Sync email address from specified omniauth provider. !11268 (Robin Bobbitt)
+- Disable reference prefixes in notes for Snippets. !11278
+- Rename build_events to job_events. !11287
+- Add API support for pipeline schedule. !11307 (dosuken123)
+- Use route.cache_key for project list cache key. !11325
+- Make environment table realtime. !11333
+- Cache npm modules between pipelines with yarn to speed up setup-test-env. !11343
+- Allow GitLab instance to start when InfluxDB hostname cannot be resolved. !11356
+- Add ConvDev Index page to admin area. !11377
+- Fix Git-over-HTTP error statuses and improve error messages. !11398
+- Renamed users 'Audit Log'' to 'Authentication Log'. !11400
+- Style people in issuable search bar. !11402
+- Change /builds in the URL to /-/jobs. Backward URLs were also added. !11407
+- Update password field label while editing service settings. !11431
+- Add an optional performance bar to view performance metrics for the current page. !11439
+- Update task_list to version 2.0.0. !11525 (Jared Deckard <jared.deckard@gmail.com>)
+- Avoid resource intensive login checks if password is not provided. !11537 (Horatiu Eugen Vlad)
+- Allow numeric pages domain. !11550
+- Exclude manual actions when checking if pipeline can be canceled. !11562
+- Add server uptime to System Info page in admin dashboard. !11590 (Justin Boltz)
+- Simplify testing and saving service integrations. !11599
+- Fixed handling of the `can_push` attribute in the v3 deploy_keys api. !11607 (Richard Clamp)
+- Improve user experience around slash commands in instant comments. !11612
+- Show current user immediately in issuable filters. !11630
+- Add extra context-sensitive functionality for the top right menu button. !11632
+- Reorder Issue action buttons in order of usability. !11642
+- Expose atom links with an RSS token instead of using the private token. !11647 (Alexis Reigel)
+- Respect merge, instead of push, permissions for protected actions. !11648
+- Job details page update real time. !11651
+- Improve performance of ProjectFinder used in /projects API endpoint. !11666
+- Remove redundant data-turbolink attributes from links. !11672 (blackst0ne)
+- Minimum postgresql version is now 9.2. !11677
+- Add protected variables which would only be passed to protected branches or protected tags. !11688
+- Introduce optimistic locking support via optional parameter last_commit_sha on File Update API. !11694 (electroma)
+- Add $CI_ENVIRONMENT_URL to predefined variables for pipelines. !11695
+- Simplify project repository settings page. !11698
+- Fix pipeline_schedules pages throwing error 500. !11706 (dosuken123)
+- Add performance deltas between app deployments on Merge Request widget. !11730
+- Add feature toggles and API endpoints for admins. !11747
+- Replace 'starred_projects.feature' spinach test with an rspec analog. !11752 (blackst0ne)
+- Introduce an Events API. !11755
+- Display Shared Runner status in Admin Dashboard. !11783 (Ivan Chernov)
+- Persist pipeline stages in the database. !11790
+- Revert the feature that would include the current user's username in the HTTP clone URL. !11792
+- Enable Gitaly by default in installations from source. !11796
+- Use zopfli compression for frontend assets. !11798
+- Add tag_list param to project api. !11799 (Ivan Chernov)
+- Add changelog for improved Registry description. !11816
+- Automatically adjust project settings to match changes in project visibility. !11831
+- Add slugify project path to CI enviroment variables. !11838 (Ivan Chernov)
+- Add all pipeline sources as special keywords to 'only' and 'except'. !11844 (Filip Krakowski)
+- Allow pulling of container images using personal access tokens. !11845
+- Expose import_status in Projects API. !11851 (Robin Bobbitt)
+- Allow admins to delete users from the admin users page. !11852
+- Allow users to be hard-deleted from the API. !11853
+- Fix hard-deleting users when they have authored issues. !11855
+- Fix missing optional path parameter in "Create project for user" API. !11868
+- Allow users to be hard-deleted from the admin panel. !11874
+- Add a Rake task to aid in rotating otp_key_base. !11881
+- Fix submodule link to then project under subgroup. !11906
+- Fix binary encoding error on MR diffs. !11929
+- Limit non-administrators to adding 100 members at a time to groups and projects. !11940
+- add bulgarian translation of cycle analytics page to I18N. !11958 (Lyubomir Vasilev)
+- Make backup task to continue on corrupt repositories. !11962
+- Fix incorrect ETag cache key when relative instance URL is used. !11964
+- Reinstate is_admin flag in users api when authenticated user is an admin. !12211 (rickettm)
+- Fix edit button for deploy keys available from other projects. !12301 (Alexander Randa)
+- Fix passing CI_ENVIRONMENT_NAME and CI_ENVIRONMENT_SLUG for CI_ENVIRONMENT_URL. !12344
+- Disable environment list refresh due to bug https://gitlab.com/gitlab-org/gitlab-ee/issues/2677. !12347
+- Standardize timeline note margins across different viewport sizes. !12364
+- Fix Ordered Task List Items. !31483 (Jared Deckard <jared.deckard@gmail.com>)
+- Upgrade dependency to Go 1.8.3. !31943
+- Add prometheus metrics on pipeline creation.
+- Fix etag route not being a match for environments.
+- Sort folder for environments.
+- Support descriptions for snippets.
+- Hide clone panel and file list when user is only a guest. (James Clark)
+- Don’t create comment on JIRA if it already exists for the entity.
+- Update Dashboard Groups UI with better support for subgroups.
+- Confirm Project forking behaviour via the API.
+- Add prometheus based metrics collection to gitlab webapp.
+- Fix: Wiki is not searchable with Guest permissions.
+- Center all empty states.
+- Remove 'New issue' button when issues search returns no results.
+- Add API URL to JIRA settings.
+- animate adding issue to boards.
+- Update session cookie key name to be unique to instance in development.
+- Single click on filter to open filtered search dropdown.
+- Makes header information of pipeline show page realtine.
+- Creates a mediator for pipeline details vue in order to mount several vue apps with the same data.
+- Scope issue/merge request recent searches to project.
+- Increase individual diff collapse limit to 100 KB, and render limit to 200 KB.
+- Fix Pipelines table empty state - only render empty state if we receive 0 pipelines.
+- Make New environment empty state btn lowercase.
+- Removes duplicate environment variable in documentation.
+- Change links in issuable meta to black.
+- Fix border-bottom for project activity tab.
+- Adds new icon for CI skipped status.
+- Create equal padding for emoji.
+- Use briefcase icon for company in profile page.
+- Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon.
+- Keep trailing newline when resolving conflicts by picking sides.
+- Fix /unsubscribe slash command creating extra todos when you were already mentioned in an issue.
+- Fix math rendering on blob pages.
+- Allow group reporters to manage group labels.
+- Use pre-wrap for commit messages to keep lists indented.
+- Count badges depend on translucent color to better adjust to different background colors and permission badges now feature a pill shaped design similar to labels.
+- Allow reporters to promote project labels to group labels.
+- Enabled keyboard shortcuts on artifacts pages.
+- Perform filtered search when state tab is changed.
+- Remove duplication for sharing projects with groups in project settings.
+- Change order of commits ahead and behind on divergence graph for branch list view.
+- Creates CI Header component for Pipelines and Jobs details pages.
+- Invalidate cache for issue and MR counters more granularly.
+- disable blocked manual actions.
+- Load tree readme asynchronously.
+- Display extra info about files on .gitlab-ci.yml, .gitlab/route-map.yml and LICENSE blob pages.
+- Fix replying to a commit discussion displayed in the context of an MR.
+- Consistently use monospace font for commit SHAs and branch and tag names.
+- Consistently display last push event widget.
+- Don't copy empty elements that were not selected on purpose as GFM.
+- Copy as GFM even when parts of other elements are selected.
+- Autolink package names in Gemfile.
+- Resolve N+1 query issue with discussions.
+- Don't match email addresses or foo@bar as user references.
+- Fix title of discussion jump button at top of page.
+- Don't return nil for missing objects from parser cache.
+- Make .gitmodules parsing more resilient to syntax errors.
+- Add username parameter to gravatar URL.
+- Autolink package names in more dependency files.
+- Return nil when looking up config for unknown LDAP provider.
+- Add system note with link to diff comparison when MR discussion becomes outdated.
+- Don't wrap pasted code when it's already inside code tags.
+- Revert 'New file from interface on existing branch'.
+- Show last commit for current tree on tree page.
+- Add documentation about adding foreign keys.
+- add username field to push webhook. (David Turner)
+- Rename CI/CD Pipelines to Pipelines in the project settings.
+- Make environment tables responsive.
+- Expand/collapse backlog & closed lists in issue boards.
+- Fix GitHub importer performance on branch existence check.
+- Fix counter cache for acts as taggable.
+- Github - Fix token interpolation when cloning wiki repository.
+- Fix token interpolation when setting the Github remote.
+- Fix N+1 queries for non-members in comment threads.
+- Fix terminals support for Kubernetes Service.
+- Fix: A diff comment on a change at last line of a file shows as two comments in discussion.
+- Instrument MergeRequestDiff#load_commits.
+- Introduce source to Pipeline entity.
+- Fixed create new label form in issue form not working for sub-group projects.
+- Fixed style on unsubscribe page. (Gustav Ernberg)
+- Enables inline editing for an issues title & description.
+- Ask for an example project for bug reports.
+- Add summary lines for collapsed details in the bug report template.
+- Prevent commits from upstream repositories to be re-processed by forks.
+- Avoid repeated queries for pipeline builds on merge requests.
+- Preloads head pipeline for merge request collection.
+- Handle head pipeline when creating merge requests.
+- Migrate artifacts to a new path.
+- Rescue OpenSSL::SSL::SSLError in JiraService & IssueTrackerService.
+- Repository browser: handle in-repository submodule urls. (David Turner)
+- Prevent project transfers if a new group is not selected.
+- Allow 'no one' as an option for allowed to merge on a procted branch.
+- Reduce time spent waiting for certain Sidekiq jobs to complete.
+- Refactor ProjectsFinder#init_collection to produce more efficient queries for retrieving projects.
+- Remove unused code and uses underscore.
+- Restricts search projects dropdown to group projects when group is selected.
+- Properly handle container registry redirects to fix metadata stored on a S3 backend.
+- Fix LFS timeouts when trying to save large files.
+- Set artifact working directory to be in the destination store to prevent unnecessary I/O.
+- Strip trailing whitespaces in submodule URLs.
+- Make sure reCAPTCHA configuration is loaded when spam checks are initiated.
+- Fix up arrow not editing last discussion comment.
+- Added application readiness endpoints to the monitoring health check admin view.
+- Use wait_for_requests for both ajax and Vue requests.
+- Cleanup ci_variables schema and table.
+- Remove foreigh key on ci_trigger_schedules only if it exists.
+- Allow translation of Pipeline Schedules.
+
 ## 9.2.7 (2017-06-21)
 
 - Reinstate is_admin flag in users api when authenticated user is an admin. !12211 (rickettm)
diff --git a/changelogs/unreleased/10378-promote-blameless-culture.yml b/changelogs/unreleased/10378-promote-blameless-culture.yml
deleted file mode 100644
index 8cf64dfd793..00000000000
--- a/changelogs/unreleased/10378-promote-blameless-culture.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Changed Blame to Annotate in the UI to promote blameless culture
-merge_request: 10378
-author: Ilya Vassilevsky
diff --git a/changelogs/unreleased/12614-fix-long-message-from-mr.yml b/changelogs/unreleased/12614-fix-long-message-from-mr.yml
deleted file mode 100644
index 30408ea4216..00000000000
--- a/changelogs/unreleased/12614-fix-long-message-from-mr.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Implement web hook logging
-merge_request: 11027
-author: Alexander Randa
diff --git a/changelogs/unreleased/12614-fix-long-message.yml b/changelogs/unreleased/12614-fix-long-message.yml
deleted file mode 100644
index 94f8127c3c1..00000000000
--- a/changelogs/unreleased/12614-fix-long-message.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix long urls in the title of commit
-merge_request: 10938
-author: Alexander Randa
diff --git a/changelogs/unreleased/12910-snippets-description.yml b/changelogs/unreleased/12910-snippets-description.yml
deleted file mode 100644
index ac3d754fee1..00000000000
--- a/changelogs/unreleased/12910-snippets-description.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Support descriptions for snippets
-merge_request:
-author:
diff --git a/changelogs/unreleased/14707-allow-activity-feed-to-be-accessible-through-api.yml b/changelogs/unreleased/14707-allow-activity-feed-to-be-accessible-through-api.yml
deleted file mode 100644
index 9c17c3b949c..00000000000
--- a/changelogs/unreleased/14707-allow-activity-feed-to-be-accessible-through-api.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Introduce an Events API
-merge_request: 11755
-author:
diff --git a/changelogs/unreleased/17489-hide-code-from-guests.yml b/changelogs/unreleased/17489-hide-code-from-guests.yml
deleted file mode 100644
index eb6daffedfe..00000000000
--- a/changelogs/unreleased/17489-hide-code-from-guests.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Hide clone panel and file list when user is only a guest
-merge_request:
-author: James Clark
diff --git a/changelogs/unreleased/18927-reorder-issue-action-buttons.yml b/changelogs/unreleased/18927-reorder-issue-action-buttons.yml
deleted file mode 100644
index 793d6582940..00000000000
--- a/changelogs/unreleased/18927-reorder-issue-action-buttons.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Reorder Issue action buttons in order of usability
-merge_request: 11642
-author:
diff --git a/changelogs/unreleased/19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled.yml b/changelogs/unreleased/19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled.yml
deleted file mode 100644
index bec9aa34761..00000000000
--- a/changelogs/unreleased/19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
-merge_request: 19107
-author: blackst0ne
diff --git a/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml b/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml
deleted file mode 100644
index 1f3ab3a2c10..00000000000
--- a/changelogs/unreleased/20517-delete-projects-issuescontroller-redirect_old.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove redirect for old issue url containing id instead of iid
-merge_request: 11135
-author: blackst0ne
diff --git a/changelogs/unreleased/23036-replace-all-spinach-tests-with-rspec-feature-tests.yml b/changelogs/unreleased/23036-replace-all-spinach-tests-with-rspec-feature-tests.yml
deleted file mode 100644
index b350b27d863..00000000000
--- a/changelogs/unreleased/23036-replace-all-spinach-tests-with-rspec-feature-tests.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Replace 'starred_projects.feature' spinach test with an rspec analog
-merge_request: 11752
-author: blackst0ne
diff --git a/changelogs/unreleased/23603-add-extra-functionality-for-the-top-right-button.yml b/changelogs/unreleased/23603-add-extra-functionality-for-the-top-right-button.yml
deleted file mode 100644
index 77f8e31e16e..00000000000
--- a/changelogs/unreleased/23603-add-extra-functionality-for-the-top-right-button.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add extra context-sensitive functionality for the top right menu button
-merge_request: 11632
-author:
diff --git a/changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml b/changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml
deleted file mode 100644
index dbd8a538d51..00000000000
--- a/changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Automatically adjust project settings to match changes in project visibility
-merge_request: 11831
-author:
diff --git a/changelogs/unreleased/24196-protected-variables.yml b/changelogs/unreleased/24196-protected-variables.yml
deleted file mode 100644
index 71567a9d794..00000000000
--- a/changelogs/unreleased/24196-protected-variables.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add protected variables which would only be passed to protected branches or
-  protected tags
-merge_request: 11688
-author:
diff --git a/changelogs/unreleased/24373-warning-message-go-away.yml b/changelogs/unreleased/24373-warning-message-go-away.yml
deleted file mode 100644
index c0f2fd260ba..00000000000
--- a/changelogs/unreleased/24373-warning-message-go-away.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'Notes: Warning message should go away once resolved'
-merge_request: 10823
-author: Jacopo Beschi @jacopo-beschi
diff --git a/changelogs/unreleased/25373-jira-links.yml b/changelogs/unreleased/25373-jira-links.yml
deleted file mode 100644
index 09589d4b992..00000000000
--- a/changelogs/unreleased/25373-jira-links.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Don’t create comment on JIRA if it already exists for the entity
-merge_request:
-author:
diff --git a/changelogs/unreleased/25426-group-dashboard-ui.yml b/changelogs/unreleased/25426-group-dashboard-ui.yml
deleted file mode 100644
index cc2bf62d07b..00000000000
--- a/changelogs/unreleased/25426-group-dashboard-ui.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Update Dashboard Groups UI with better support for subgroups
-merge_request:
-author:
diff --git a/changelogs/unreleased/25680-CI_ENVIRONMENT_URL.yml b/changelogs/unreleased/25680-CI_ENVIRONMENT_URL.yml
deleted file mode 100644
index af9fe3b5041..00000000000
--- a/changelogs/unreleased/25680-CI_ENVIRONMENT_URL.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add $CI_ENVIRONMENT_URL to predefined variables for pipelines
-merge_request: 11695
-author:
diff --git a/changelogs/unreleased/26325-system-hooks.yml b/changelogs/unreleased/26325-system-hooks.yml
deleted file mode 100644
index 62b8adaeccd..00000000000
--- a/changelogs/unreleased/26325-system-hooks.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'Backported new SystemHook event: `repository_update`'
-merge_request: 11140
-author:
diff --git a/changelogs/unreleased/27148-limit-bulk-create-memberships.yml b/changelogs/unreleased/27148-limit-bulk-create-memberships.yml
deleted file mode 100644
index ac4aba2f4e0..00000000000
--- a/changelogs/unreleased/27148-limit-bulk-create-memberships.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Limit non-administrators to adding 100 members at a time to groups and projects
-merge_request: 11940
-author:
diff --git a/changelogs/unreleased/27439-memory-usage-info.yml b/changelogs/unreleased/27439-memory-usage-info.yml
deleted file mode 100644
index dd212853f57..00000000000
--- a/changelogs/unreleased/27439-memory-usage-info.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add performance deltas between app deployments on Merge Request widget
-merge_request: 11730
-author:
diff --git a/changelogs/unreleased/27614-improve-instant-comments-exp.yml b/changelogs/unreleased/27614-improve-instant-comments-exp.yml
deleted file mode 100644
index 4db676801f1..00000000000
--- a/changelogs/unreleased/27614-improve-instant-comments-exp.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Improve user experience around slash commands in instant comments
-merge_request: 11612
-author:
diff --git a/changelogs/unreleased/28080-system-checks.yml b/changelogs/unreleased/28080-system-checks.yml
deleted file mode 100644
index 7d83014279a..00000000000
--- a/changelogs/unreleased/28080-system-checks.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Refactored gitlab:app:check into SystemCheck liberary and improve some checks
-merge_request: 9173
-author:
diff --git a/changelogs/unreleased/28607-forking-and-configuring-project-via-api-works-very-unreliable.yml b/changelogs/unreleased/28607-forking-and-configuring-project-via-api-works-very-unreliable.yml
deleted file mode 100644
index 9cf8d745f92..00000000000
--- a/changelogs/unreleased/28607-forking-and-configuring-project-via-api-works-very-unreliable.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Confirm Project forking behaviour via the API
-merge_request:
-author:
diff --git a/changelogs/unreleased/28694-hard-delete-user-from-admin-panel.yml b/changelogs/unreleased/28694-hard-delete-user-from-admin-panel.yml
deleted file mode 100644
index 2308a528580..00000000000
--- a/changelogs/unreleased/28694-hard-delete-user-from-admin-panel.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow users to be hard-deleted from the admin panel
-merge_request: 11874
-author:
diff --git a/changelogs/unreleased/28694-hard-delete-user-from-api.yml b/changelogs/unreleased/28694-hard-delete-user-from-api.yml
deleted file mode 100644
index ad46540495c..00000000000
--- a/changelogs/unreleased/28694-hard-delete-user-from-api.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow users to be hard-deleted from the API
-merge_request: 11853
-author:
diff --git a/changelogs/unreleased/29010-perf-bar.yml b/changelogs/unreleased/29010-perf-bar.yml
deleted file mode 100644
index f4167e5562f..00000000000
--- a/changelogs/unreleased/29010-perf-bar.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add an optional performance bar to view performance metrics for the current page
-merge_request: 11439
-author:
diff --git a/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml b/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
deleted file mode 100644
index 99c55f128e3..00000000000
--- a/changelogs/unreleased/29118-add-prometheus-instrumenting-to-gitlab-webapp.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add prometheus based metrics collection to gitlab webapp
-merge_request:
-author:
diff --git a/changelogs/unreleased/29690-rotate-otp-key-base.yml b/changelogs/unreleased/29690-rotate-otp-key-base.yml
deleted file mode 100644
index 94d73a24758..00000000000
--- a/changelogs/unreleased/29690-rotate-otp-key-base.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add a Rake task to aid in rotating otp_key_base
-merge_request: 11881
-author:
diff --git a/changelogs/unreleased/29852-latex-formatting.yml b/changelogs/unreleased/29852-latex-formatting.yml
deleted file mode 100644
index e96cda1d6b3..00000000000
--- a/changelogs/unreleased/29852-latex-formatting.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix LaTeX formatting for AsciiDoc wiki
-merge_request: 11212
-author:
diff --git a/changelogs/unreleased/30378-simplified-repository-settings-page.yml b/changelogs/unreleased/30378-simplified-repository-settings-page.yml
deleted file mode 100644
index e8b87c8bb33..00000000000
--- a/changelogs/unreleased/30378-simplified-repository-settings-page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Simplify project repository settings page
-merge_request: 11698
-author:
diff --git a/changelogs/unreleased/30410-revert-9347-and-10079.yml b/changelogs/unreleased/30410-revert-9347-and-10079.yml
deleted file mode 100644
index 0149209caf2..00000000000
--- a/changelogs/unreleased/30410-revert-9347-and-10079.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert the feature that would include the current user's username in the HTTP
-  clone URL
-merge_request: 11792
-author:
diff --git a/changelogs/unreleased/30469-convdev-index.yml b/changelogs/unreleased/30469-convdev-index.yml
deleted file mode 100644
index 0bdd9c4a699..00000000000
--- a/changelogs/unreleased/30469-convdev-index.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add ConvDev Index page to admin area
-merge_request: 11377
-author:
diff --git a/changelogs/unreleased/30651-improve-container-registry-description.yml b/changelogs/unreleased/30651-improve-container-registry-description.yml
deleted file mode 100644
index 0157c9885bc..00000000000
--- a/changelogs/unreleased/30651-improve-container-registry-description.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add changelog for improved Registry description
-merge_request: 11816
-author:
diff --git a/changelogs/unreleased/30827-changes-to-audit-log.yml b/changelogs/unreleased/30827-changes-to-audit-log.yml
deleted file mode 100644
index 32db3bf8e95..00000000000
--- a/changelogs/unreleased/30827-changes-to-audit-log.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Renamed users 'Audit Log'' to 'Authentication Log'
-merge_request: 11400
-author:
diff --git a/changelogs/unreleased/30892-add-api-support-for-pipeline-schedule.yml b/changelogs/unreleased/30892-add-api-support-for-pipeline-schedule.yml
deleted file mode 100644
index 26ce84697d0..00000000000
--- a/changelogs/unreleased/30892-add-api-support-for-pipeline-schedule.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add API support for pipeline schedule
-merge_request: 11307
-author: dosuken123
diff --git a/changelogs/unreleased/30917-wiki-is-not-searchable-with-guest-permissions.yml b/changelogs/unreleased/30917-wiki-is-not-searchable-with-guest-permissions.yml
deleted file mode 100644
index c9bd2dc465e..00000000000
--- a/changelogs/unreleased/30917-wiki-is-not-searchable-with-guest-permissions.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'Fix: Wiki is not searchable with Guest permissions'
-merge_request:
-author:
diff --git a/changelogs/unreleased/30949-empty-states.yml b/changelogs/unreleased/30949-empty-states.yml
deleted file mode 100644
index bef87a954b7..00000000000
--- a/changelogs/unreleased/30949-empty-states.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Center all empty states
-merge_request:
-author:
diff --git a/changelogs/unreleased/31061-26135-ci-project-slug-enviroment-variables.yml b/changelogs/unreleased/31061-26135-ci-project-slug-enviroment-variables.yml
deleted file mode 100644
index e71910dbd67..00000000000
--- a/changelogs/unreleased/31061-26135-ci-project-slug-enviroment-variables.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add slugify project path to CI enviroment variables
-merge_request: 11838
-author: Ivan Chernov
diff --git a/changelogs/unreleased/31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form.yml b/changelogs/unreleased/31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form.yml
deleted file mode 100644
index 8d586616e07..00000000000
--- a/changelogs/unreleased/31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove 'New issue' button when issues search returns no results.
-merge_request: !11263
-author:
diff --git a/changelogs/unreleased/31448-jira-urls.yml b/changelogs/unreleased/31448-jira-urls.yml
deleted file mode 100644
index d0e39f61b55..00000000000
--- a/changelogs/unreleased/31448-jira-urls.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add API URL to JIRA settings
-merge_request:
-author:
diff --git a/changelogs/unreleased/31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select.yml b/changelogs/unreleased/31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select.yml
deleted file mode 100644
index 88e79e3b6ea..00000000000
--- a/changelogs/unreleased/31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Disallow multiple selections for Milestone dropdown
-merge_request: 11084
-author:
diff --git a/changelogs/unreleased/31483-ordered-task-list.yml b/changelogs/unreleased/31483-ordered-task-list.yml
deleted file mode 100644
index c43915b3268..00000000000
--- a/changelogs/unreleased/31483-ordered-task-list.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix Ordered Task List Items
-merge_request: 31483
-author: Jared Deckard <jared.deckard@gmail.com>
diff --git a/changelogs/unreleased/31510-mask-password-field-edit.yml b/changelogs/unreleased/31510-mask-password-field-edit.yml
deleted file mode 100644
index 0ef37be328d..00000000000
--- a/changelogs/unreleased/31510-mask-password-field-edit.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Update password field label while editing service settings
-merge_request: 11431
-author:
diff --git a/changelogs/unreleased/31511-jira-settings.yml b/changelogs/unreleased/31511-jira-settings.yml
deleted file mode 100644
index 4f9ddb13ef6..00000000000
--- a/changelogs/unreleased/31511-jira-settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Simplify testing and saving service integrations
-merge_request: 11599
-author:
diff --git a/changelogs/unreleased/31554-update-rufus-scheduler-and-sidekiq.yml b/changelogs/unreleased/31554-update-rufus-scheduler-and-sidekiq.yml
deleted file mode 100644
index 0a36b52d561..00000000000
--- a/changelogs/unreleased/31554-update-rufus-scheduler-and-sidekiq.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10
-  to 3.4.0
-merge_request: 10976
-author: dosuken123
diff --git a/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml b/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml
deleted file mode 100644
index 00957f7e4f7..00000000000
--- a/changelogs/unreleased/31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Display Shared Runner status in Admin Dashboard
-merge_request: 11783
-author: Ivan Chernov
diff --git a/changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml b/changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
deleted file mode 100644
index 6dc48d6b2d8..00000000000
--- a/changelogs/unreleased/31616-add-uptime-of-gitlab-instance-in-admin-area.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add server uptime to System Info page in admin dashboard
-merge_request: 11590
-author: Justin Boltz
diff --git a/changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml b/changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml
deleted file mode 100644
index aae760b0ef5..00000000000
--- a/changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Keep input data after creating a tag that already exists
-merge_request: 11155
-author:
diff --git a/changelogs/unreleased/31633-animate-issue.yml b/changelogs/unreleased/31633-animate-issue.yml
deleted file mode 100644
index 6df4135b09c..00000000000
--- a/changelogs/unreleased/31633-animate-issue.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: animate adding issue to boards
-merge_request:
-author:
diff --git a/changelogs/unreleased/31644-make-cookie-sessions-unique.yml b/changelogs/unreleased/31644-make-cookie-sessions-unique.yml
deleted file mode 100644
index e9a6a32cf70..00000000000
--- a/changelogs/unreleased/31644-make-cookie-sessions-unique.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Update session cookie key name to be unique to instance in development
-merge_request:
-author:
diff --git a/changelogs/unreleased/31757-single-click-on-filter-in-search-bar-to-activate-dropdown.yml b/changelogs/unreleased/31757-single-click-on-filter-in-search-bar-to-activate-dropdown.yml
deleted file mode 100644
index 48b8a8507ec..00000000000
--- a/changelogs/unreleased/31757-single-click-on-filter-in-search-bar-to-activate-dropdown.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Single click on filter to open filtered search dropdown
-merge_request:
-author:
diff --git a/changelogs/unreleased/31781-print-rendered-files-not-possible.yml b/changelogs/unreleased/31781-print-rendered-files-not-possible.yml
deleted file mode 100644
index 14915823ff7..00000000000
--- a/changelogs/unreleased/31781-print-rendered-files-not-possible.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Include the blob content when printing a blob page
-merge_request: 11247
-author:
diff --git a/changelogs/unreleased/31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status.yml b/changelogs/unreleased/31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status.yml
deleted file mode 100644
index 52bfe771e2b..00000000000
--- a/changelogs/unreleased/31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add a rubocop rule to check if a method 'redirect_to' is used without explicitly set 'status' in 'destroy' actions of controllers
-merge_request: 11749
-author: @blackst0ne
diff --git a/changelogs/unreleased/31849-pipeline-real-time-header.yml b/changelogs/unreleased/31849-pipeline-real-time-header.yml
deleted file mode 100644
index 2bb7af897ff..00000000000
--- a/changelogs/unreleased/31849-pipeline-real-time-header.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Makes header information of pipeline show page realtine
-merge_request:
-author:
diff --git a/changelogs/unreleased/31849-pipeline-show-view-realtime.yml b/changelogs/unreleased/31849-pipeline-show-view-realtime.yml
deleted file mode 100644
index 838a769a26e..00000000000
--- a/changelogs/unreleased/31849-pipeline-show-view-realtime.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Creates a mediator for pipeline details vue in order to mount several vue apps
-  with the same data
-merge_request:
-author:
diff --git a/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml b/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml
deleted file mode 100644
index e00eb6d8f72..00000000000
--- a/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Scope issue/merge request recent searches to project
-merge_request:
-author:
diff --git a/changelogs/unreleased/3191-deploy-keys-update.yml b/changelogs/unreleased/3191-deploy-keys-update.yml
deleted file mode 100644
index 4100163e94f..00000000000
--- a/changelogs/unreleased/3191-deploy-keys-update.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Implement ability to update deploy keys
-merge_request: 10383
-author: Alexander Randa
diff --git a/changelogs/unreleased/31943-document-go-183.yml b/changelogs/unreleased/31943-document-go-183.yml
deleted file mode 100644
index 201cd48f1ab..00000000000
--- a/changelogs/unreleased/31943-document-go-183.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Upgrade dependency to Go 1.8.3
-merge_request: 31943
diff --git a/changelogs/unreleased/31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening.yml b/changelogs/unreleased/31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening.yml
deleted file mode 100644
index f61aa0a6b6e..00000000000
--- a/changelogs/unreleased/31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Increase individual diff collapse limit to 100 KB, and render limit to 200 KB
-merge_request:
-author:
diff --git a/changelogs/unreleased/31998-pipelines-empty-state.yml b/changelogs/unreleased/31998-pipelines-empty-state.yml
deleted file mode 100644
index 78ae222255e..00000000000
--- a/changelogs/unreleased/31998-pipelines-empty-state.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix Pipelines table empty state - only render empty state if we receive 0 pipelines
-merge_request:
-author:
diff --git a/changelogs/unreleased/32086-atwho-is-still-enabled-for-personal-snippet-comments-form.yml b/changelogs/unreleased/32086-atwho-is-still-enabled-for-personal-snippet-comments-form.yml
deleted file mode 100644
index 0fd248e0400..00000000000
--- a/changelogs/unreleased/32086-atwho-is-still-enabled-for-personal-snippet-comments-form.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Disable reference prefixes in notes for Snippets
-merge_request: 11278
-author:
diff --git a/changelogs/unreleased/32118-new-environment-btn-copy.yml b/changelogs/unreleased/32118-new-environment-btn-copy.yml
deleted file mode 100644
index 16a51c3db6a..00000000000
--- a/changelogs/unreleased/32118-new-environment-btn-copy.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make New environment empty state btn lowercase
-merge_request:
-author:
diff --git a/changelogs/unreleased/32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache.yml b/changelogs/unreleased/32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache.yml
deleted file mode 100644
index 7fb3cb3a30b..00000000000
--- a/changelogs/unreleased/32219-speed-up-yarn-install-in-ci-by-utilizing-inter-pipeline-cache.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Cache npm modules between pipelines with yarn to speed up setup-test-env
-merge_request: 11343
-author:
diff --git a/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml b/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml
deleted file mode 100644
index d2be3d6cc4b..00000000000
--- a/changelogs/unreleased/32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Removes duplicate environment variable in documentation
-merge_request:
-author:
diff --git a/changelogs/unreleased/32418-make-link-to-self-less-obvious.yml b/changelogs/unreleased/32418-make-link-to-self-less-obvious.yml
deleted file mode 100644
index aabe87dac0f..00000000000
--- a/changelogs/unreleased/32418-make-link-to-self-less-obvious.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Change links in issuable meta to black
-merge_request:
-author:
diff --git a/changelogs/unreleased/32570-project-activity-tab-border.yml b/changelogs/unreleased/32570-project-activity-tab-border.yml
deleted file mode 100644
index 100a3e6a74d..00000000000
--- a/changelogs/unreleased/32570-project-activity-tab-border.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix border-bottom for project activity tab
-merge_request:
-author:
diff --git a/changelogs/unreleased/32598-avoid-resource-intensive-login-checks-if-password-is-not-provided-for-git-http.yml b/changelogs/unreleased/32598-avoid-resource-intensive-login-checks-if-password-is-not-provided-for-git-http.yml
deleted file mode 100644
index 6da7491bbda..00000000000
--- a/changelogs/unreleased/32598-avoid-resource-intensive-login-checks-if-password-is-not-provided-for-git-http.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Avoid resource intensive login checks if password is not provided.
-merge_request: 11537
-author: Horatiu Eugen Vlad
diff --git a/changelogs/unreleased/32642_last_commit_id_in_file_api.yml b/changelogs/unreleased/32642_last_commit_id_in_file_api.yml
deleted file mode 100644
index 80435352e10..00000000000
--- a/changelogs/unreleased/32642_last_commit_id_in_file_api.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'Introduce optimistic locking support via optional parameter last_commit_sha on File Update API'
-merge_request: 11694
-author: electroma
diff --git a/changelogs/unreleased/32682-skipped-ci-icon.yml b/changelogs/unreleased/32682-skipped-ci-icon.yml
deleted file mode 100644
index ad498b51900..00000000000
--- a/changelogs/unreleased/32682-skipped-ci-icon.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Adds new icon for CI skipped status
-merge_request:
-author:
diff --git a/changelogs/unreleased/32720-emoji-spacing.yml b/changelogs/unreleased/32720-emoji-spacing.yml
deleted file mode 100644
index da3df0f9093..00000000000
--- a/changelogs/unreleased/32720-emoji-spacing.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Create equal padding for emoji
-merge_request:
-author:
diff --git a/changelogs/unreleased/32799-remove-no_turbolink-attribute-from-haml.yml b/changelogs/unreleased/32799-remove-no_turbolink-attribute-from-haml.yml
deleted file mode 100644
index 9c1c1fe77f2..00000000000
--- a/changelogs/unreleased/32799-remove-no_turbolink-attribute-from-haml.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove redundant data-turbolink attributes from links
-merge_request: 11672
-author: blackst0ne
diff --git a/changelogs/unreleased/32807-company-icon.yml b/changelogs/unreleased/32807-company-icon.yml
deleted file mode 100644
index 718108d3733..00000000000
--- a/changelogs/unreleased/32807-company-icon.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use briefcase icon for company in profile page
-merge_request:
-author:
diff --git a/changelogs/unreleased/32832-confidential-issue-overflow.yml b/changelogs/unreleased/32832-confidential-issue-overflow.yml
deleted file mode 100644
index 7d3d3bfed2e..00000000000
--- a/changelogs/unreleased/32832-confidential-issue-overflow.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove overflow from comment form for confidential issues and vertically aligns
-  confidential issue icon
-merge_request:
-author:
diff --git a/changelogs/unreleased/32851-postgres-min-version.yml b/changelogs/unreleased/32851-postgres-min-version.yml
deleted file mode 100644
index 139307d65c6..00000000000
--- a/changelogs/unreleased/32851-postgres-min-version.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Minimum postgresql version is now 9.2
-merge_request: 11677
-author:
diff --git a/changelogs/unreleased/32955-special-keywords.yml b/changelogs/unreleased/32955-special-keywords.yml
deleted file mode 100644
index 0f9939ced8c..00000000000
--- a/changelogs/unreleased/32955-special-keywords.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add all pipeline sources as special keywords to 'only' and 'except'
-merge_request: 11844
-author: Filip Krakowski
diff --git a/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml b/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml
deleted file mode 100644
index eca42176501..00000000000
--- a/changelogs/unreleased/32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Keep trailing newline when resolving conflicts by picking sides
-merge_request:
-author:
diff --git a/changelogs/unreleased/32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets.yml b/changelogs/unreleased/32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets.yml
deleted file mode 100644
index 93037d6181e..00000000000
--- a/changelogs/unreleased/32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use zopfli compression for frontend assets
-merge_request: 11798
-author:
diff --git a/changelogs/unreleased/33000-tag-list-in-project-create-api.yml b/changelogs/unreleased/33000-tag-list-in-project-create-api.yml
deleted file mode 100644
index b0d0d3cbeba..00000000000
--- a/changelogs/unreleased/33000-tag-list-in-project-create-api.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add tag_list param to project api
-merge_request: 11799
-author: Ivan Chernov
diff --git a/changelogs/unreleased/33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe.yml b/changelogs/unreleased/33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe.yml
deleted file mode 100644
index 1eaa0d0124e..00000000000
--- a/changelogs/unreleased/33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix /unsubscribe slash command creating extra todos when you were already mentioned
-  in an issue
-merge_request:
-author:
diff --git a/changelogs/unreleased/33154-permissions-for-project-labels-and-group-labels.yml b/changelogs/unreleased/33154-permissions-for-project-labels-and-group-labels.yml
deleted file mode 100644
index 3b98525167d..00000000000
--- a/changelogs/unreleased/33154-permissions-for-project-labels-and-group-labels.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow group reporters to manage group labels
-merge_request:
-author:
diff --git a/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml b/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml
deleted file mode 100644
index 5eb4e15e311..00000000000
--- a/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow admins to delete users from the admin users page
-merge_request: 11852
-author:
diff --git a/changelogs/unreleased/33215-fix-hard-delete-of-users.yml b/changelogs/unreleased/33215-fix-hard-delete-of-users.yml
deleted file mode 100644
index 29699ff745a..00000000000
--- a/changelogs/unreleased/33215-fix-hard-delete-of-users.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix hard-deleting users when they have authored issues
-merge_request: 11855
-author:
diff --git a/changelogs/unreleased/33242-create-project-for-user-api-ignores-path-parameter.yml b/changelogs/unreleased/33242-create-project-for-user-api-ignores-path-parameter.yml
deleted file mode 100644
index c33278998ee..00000000000
--- a/changelogs/unreleased/33242-create-project-for-user-api-ignores-path-parameter.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix missing optional path parameter in "Create project for user" API
-merge_request: 11868
-author:
diff --git a/changelogs/unreleased/33245-chinese_translation_of_cycle_analytics_page.yml b/changelogs/unreleased/33245-chinese_translation_of_cycle_analytics_page.yml
deleted file mode 100644
index 07dd0872d3b..00000000000
--- a/changelogs/unreleased/33245-chinese_translation_of_cycle_analytics_page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add Chinese translation of Cycle Analytics Page to I18N
-merge_request: 11644
-author:Huang Tao
diff --git a/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml b/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml
deleted file mode 100644
index 43e8f242947..00000000000
--- a/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use pre-wrap for commit messages to keep lists indented
-merge_request:
-author:
diff --git a/changelogs/unreleased/33334-portuguese_brazil_translation_of_cycle_analytics_page.yml b/changelogs/unreleased/33334-portuguese_brazil_translation_of_cycle_analytics_page.yml
deleted file mode 100644
index a0e0458da16..00000000000
--- a/changelogs/unreleased/33334-portuguese_brazil_translation_of_cycle_analytics_page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add Portuguese Brazil of Cycle Analytics Page to I18N
-merge_request: 11920
-author:Huang Tao
diff --git a/changelogs/unreleased/33383-bulgarian_translation_of_cycle_analytics_page.yml b/changelogs/unreleased/33383-bulgarian_translation_of_cycle_analytics_page.yml
deleted file mode 100644
index 71bd5505be7..00000000000
--- a/changelogs/unreleased/33383-bulgarian_translation_of_cycle_analytics_page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: add bulgarian translation of cycle analytics page to I18N
-merge_request: 11958
-author: Lyubomir Vasilev
diff --git a/changelogs/unreleased/33878_fix_edit_deploy_key.yml b/changelogs/unreleased/33878_fix_edit_deploy_key.yml
deleted file mode 100644
index bc47d522240..00000000000
--- a/changelogs/unreleased/33878_fix_edit_deploy_key.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix edit button for deploy keys available from other projects
-merge_request: 12301
-author: Alexander Randa
diff --git a/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml b/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml
deleted file mode 100644
index f3b92878f6d..00000000000
--- a/changelogs/unreleased/33917-mr-comment-system-note-highlight-don-t-have-the-same-width.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Standardize timeline note margins across different viewport sizes
-merge_request: 12364
-author:
diff --git a/changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml b/changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
deleted file mode 100644
index 7f4d6e3bc67..00000000000
--- a/changelogs/unreleased/34008-fix-CI_ENVIRONMENT_URL-2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix passing CI_ENVIRONMENT_NAME and CI_ENVIRONMENT_SLUG for CI_ENVIRONMENT_URL
-merge_request: 12344
-author:
diff --git a/changelogs/unreleased/UI-improvements-for-count-badges-and-permission-badges.yml b/changelogs/unreleased/UI-improvements-for-count-badges-and-permission-badges.yml
deleted file mode 100644
index 374f643faa7..00000000000
--- a/changelogs/unreleased/UI-improvements-for-count-badges-and-permission-badges.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Count badges depend on translucent color to better adjust to different background
-  colors and permission badges now feature a pill shaped design similar to labels
-merge_request:
-author:
diff --git a/changelogs/unreleased/adam-influxdb-hostname.yml b/changelogs/unreleased/adam-influxdb-hostname.yml
deleted file mode 100644
index ab201ae7894..00000000000
--- a/changelogs/unreleased/adam-influxdb-hostname.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
-merge_request: 11356
-author:
diff --git a/changelogs/unreleased/add-index-for-auto_canceled_by_id-mysql.yml b/changelogs/unreleased/add-index-for-auto_canceled_by_id-mysql.yml
deleted file mode 100644
index eac78e9ee1f..00000000000
--- a/changelogs/unreleased/add-index-for-auto_canceled_by_id-mysql.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add indices for auto_canceled_by_id for ci_pipelines and ci_builds on PostgreSQL
-merge_request: 11034
-author:
diff --git a/changelogs/unreleased/add-unicode-trace-feature-test.yml b/changelogs/unreleased/add-unicode-trace-feature-test.yml
deleted file mode 100644
index 90c6a9afefc..00000000000
--- a/changelogs/unreleased/add-unicode-trace-feature-test.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add a feature test for Unicode trace
-merge_request: 10736
-author: dosuken123
diff --git a/changelogs/unreleased/add_ability_to_cancel_attaching_file_and_redesign_attaching_files_ui.yml b/changelogs/unreleased/add_ability_to_cancel_attaching_file_and_redesign_attaching_files_ui.yml
deleted file mode 100644
index fcf4efa2846..00000000000
--- a/changelogs/unreleased/add_ability_to_cancel_attaching_file_and_redesign_attaching_files_ui.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add an ability to cancel attaching file and redesign attaching files UI
-merge_request: 9431
-author: blackst0ne
diff --git a/changelogs/unreleased/aliyun-backup-provider.yml b/changelogs/unreleased/aliyun-backup-provider.yml
deleted file mode 100644
index e7505e44a59..00000000000
--- a/changelogs/unreleased/aliyun-backup-provider.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add Aliyun OSS as the backup storage provider
-merge_request: 9721
-author: Yuanfei Zhu
diff --git a/changelogs/unreleased/allow-reporters-to-promote-group-labels.yml b/changelogs/unreleased/allow-reporters-to-promote-group-labels.yml
deleted file mode 100644
index 2364ce6d068..00000000000
--- a/changelogs/unreleased/allow-reporters-to-promote-group-labels.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow reporters to promote project labels to group labels
-merge_request:
-author:
diff --git a/changelogs/unreleased/allow_numeric_pages_domain.yml b/changelogs/unreleased/allow_numeric_pages_domain.yml
deleted file mode 100644
index 10d9f26f88d..00000000000
--- a/changelogs/unreleased/allow_numeric_pages_domain.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow numeric pages domain
-merge_request: 11550
-author:
diff --git a/changelogs/unreleased/allow_numeric_values_in_gitlab_ci_yml.yml b/changelogs/unreleased/allow_numeric_values_in_gitlab_ci_yml.yml
deleted file mode 100644
index 8c7fa53a18b..00000000000
--- a/changelogs/unreleased/allow_numeric_values_in_gitlab_ci_yml.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow numeric values in gitlab-ci.yml
-merge_request: 10607
-author: blackst0ne
diff --git a/changelogs/unreleased/artifacts-keyboard-shortcuts.yml b/changelogs/unreleased/artifacts-keyboard-shortcuts.yml
deleted file mode 100644
index 69569504c4f..00000000000
--- a/changelogs/unreleased/artifacts-keyboard-shortcuts.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Enabled keyboard shortcuts on artifacts pages
-merge_request:
-author:
diff --git a/changelogs/unreleased/auto-search-when-state-changed.yml b/changelogs/unreleased/auto-search-when-state-changed.yml
deleted file mode 100644
index 2723beb8600..00000000000
--- a/changelogs/unreleased/auto-search-when-state-changed.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Perform filtered search when state tab is changed
-merge_request:
-author:
diff --git a/changelogs/unreleased/bugfix-v3-deploy_keys-can_push.yml b/changelogs/unreleased/bugfix-v3-deploy_keys-can_push.yml
deleted file mode 100644
index 0306663ac8d..00000000000
--- a/changelogs/unreleased/bugfix-v3-deploy_keys-can_push.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Fixed handling of the `can_push` attribute in the v3 deploy_keys api"
-merge_request: 11607
-author: Richard Clamp
diff --git a/changelogs/unreleased/bvl-rename-build-events-to-job-events.yml b/changelogs/unreleased/bvl-rename-build-events-to-job-events.yml
deleted file mode 100644
index 2ce01a71361..00000000000
--- a/changelogs/unreleased/bvl-rename-build-events-to-job-events.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Rename build_events to job_events
-merge_request: 11287
-author:
diff --git a/changelogs/unreleased/bvl-translate-project-pages.yml b/changelogs/unreleased/bvl-translate-project-pages.yml
deleted file mode 100644
index fb90aba08b4..00000000000
--- a/changelogs/unreleased/bvl-translate-project-pages.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Translate backend for Project & Repository pages
-merge_request: 11183
-author:
diff --git a/changelogs/unreleased/ce-31853-projects-shared-groups.yml b/changelogs/unreleased/ce-31853-projects-shared-groups.yml
deleted file mode 100644
index ffa3aed682d..00000000000
--- a/changelogs/unreleased/ce-31853-projects-shared-groups.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove duplication for sharing projects with groups in project settings
-merge_request:
-author:
diff --git a/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml b/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml
deleted file mode 100644
index 93edafed699..00000000000
--- a/changelogs/unreleased/ce-32623-browser-tooltip-commits-branch-list.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change order of commits ahead and behind on divergence graph for branch list
-  view
-merge_request:
-author:
diff --git a/changelogs/unreleased/ci-build-pipeline-header-vue.yml b/changelogs/unreleased/ci-build-pipeline-header-vue.yml
deleted file mode 100644
index 2bbff2fdd16..00000000000
--- a/changelogs/unreleased/ci-build-pipeline-header-vue.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Creates CI Header component for Pipelines and Jobs details pages
-merge_request:
-author:
diff --git a/changelogs/unreleased/disable-blocked-manual-actions.yml b/changelogs/unreleased/disable-blocked-manual-actions.yml
deleted file mode 100644
index a640f61a7dd..00000000000
--- a/changelogs/unreleased/disable-blocked-manual-actions.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: disable blocked manual actions
-merge_request:
-author:
diff --git a/changelogs/unreleased/disable-environment-list-refresh.yml b/changelogs/unreleased/disable-environment-list-refresh.yml
deleted file mode 100644
index 62fd71496a0..00000000000
--- a/changelogs/unreleased/disable-environment-list-refresh.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Disable environment list refresh due to bug https://gitlab.com/gitlab-org/gitlab-ee/issues/2677
-merge_request: 12347
-author:
diff --git a/changelogs/unreleased/dm-async-tree-readme.yml b/changelogs/unreleased/dm-async-tree-readme.yml
deleted file mode 100644
index fb1cfeb210a..00000000000
--- a/changelogs/unreleased/dm-async-tree-readme.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Load tree readme asynchronously
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-auxiliary-viewers.yml b/changelogs/unreleased/dm-auxiliary-viewers.yml
deleted file mode 100644
index ba73a499115..00000000000
--- a/changelogs/unreleased/dm-auxiliary-viewers.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Display extra info about files on .gitlab-ci.yml, .gitlab/route-map.yml and
-  LICENSE blob pages
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-comment-on-mr-commit-discussion.yml b/changelogs/unreleased/dm-comment-on-mr-commit-discussion.yml
deleted file mode 100644
index 50db66c89ba..00000000000
--- a/changelogs/unreleased/dm-comment-on-mr-commit-discussion.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix replying to a commit discussion displayed in the context of an MR
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-consistent-commit-sha-style.yml b/changelogs/unreleased/dm-consistent-commit-sha-style.yml
deleted file mode 100644
index b6dace34d9b..00000000000
--- a/changelogs/unreleased/dm-consistent-commit-sha-style.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Consistently use monospace font for commit SHAs and branch and tag names
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-consistent-last-push-event.yml b/changelogs/unreleased/dm-consistent-last-push-event.yml
deleted file mode 100644
index acc17cb4523..00000000000
--- a/changelogs/unreleased/dm-consistent-last-push-event.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Consistently display last push event widget
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-copy-as-gfm-without-empty-elements.yml b/changelogs/unreleased/dm-copy-as-gfm-without-empty-elements.yml
deleted file mode 100644
index 45a61320ff2..00000000000
--- a/changelogs/unreleased/dm-copy-as-gfm-without-empty-elements.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Don't copy empty elements that were not selected on purpose as GFM
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-copy-gfm-when-parts-of-other-elements-are-selected.yml b/changelogs/unreleased/dm-copy-gfm-when-parts-of-other-elements-are-selected.yml
deleted file mode 100644
index ae916c30ff8..00000000000
--- a/changelogs/unreleased/dm-copy-gfm-when-parts-of-other-elements-are-selected.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Copy as GFM even when parts of other elements are selected
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-dependency-linker-gemfile.yml b/changelogs/unreleased/dm-dependency-linker-gemfile.yml
deleted file mode 100644
index 2d4167a1be5..00000000000
--- a/changelogs/unreleased/dm-dependency-linker-gemfile.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Autolink package names in Gemfile
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-discussions-n-plus-1.yml b/changelogs/unreleased/dm-discussions-n-plus-1.yml
deleted file mode 100644
index b97e4344248..00000000000
--- a/changelogs/unreleased/dm-discussions-n-plus-1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Resolve N+1 query issue with discussions
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-emails-are-not-user-references.yml b/changelogs/unreleased/dm-emails-are-not-user-references.yml
deleted file mode 100644
index fe55a75a88f..00000000000
--- a/changelogs/unreleased/dm-emails-are-not-user-references.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Don't match email addresses or foo@bar as user references
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-fix-jump-button.yml b/changelogs/unreleased/dm-fix-jump-button.yml
deleted file mode 100644
index 4cde354fa28..00000000000
--- a/changelogs/unreleased/dm-fix-jump-button.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix title of discussion jump button at top of page
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-fix-parser-cache.yml b/changelogs/unreleased/dm-fix-parser-cache.yml
deleted file mode 100644
index 31c163b7272..00000000000
--- a/changelogs/unreleased/dm-fix-parser-cache.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Don't return nil for missing objects from parser cache
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-gitmodules-parsing.yml b/changelogs/unreleased/dm-gitmodules-parsing.yml
deleted file mode 100644
index a7d755d6c4d..00000000000
--- a/changelogs/unreleased/dm-gitmodules-parsing.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make .gitmodules parsing more resilient to syntax errors
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-gravatar-username.yml b/changelogs/unreleased/dm-gravatar-username.yml
deleted file mode 100644
index d50455061ec..00000000000
--- a/changelogs/unreleased/dm-gravatar-username.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add username parameter to gravatar URL
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-more-dependency-linkers.yml b/changelogs/unreleased/dm-more-dependency-linkers.yml
deleted file mode 100644
index 12d45e71e85..00000000000
--- a/changelogs/unreleased/dm-more-dependency-linkers.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Autolink package names in more dependency files
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-oauth-config-for.yml b/changelogs/unreleased/dm-oauth-config-for.yml
deleted file mode 100644
index 8fbbd45bb57..00000000000
--- a/changelogs/unreleased/dm-oauth-config-for.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Return nil when looking up config for unknown LDAP provider
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-outdated-system-note.yml b/changelogs/unreleased/dm-outdated-system-note.yml
deleted file mode 100644
index a1038a1051b..00000000000
--- a/changelogs/unreleased/dm-outdated-system-note.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add system note with link to diff comparison when MR discussion becomes outdated
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-paste-code-inside-gfm-code.yml b/changelogs/unreleased/dm-paste-code-inside-gfm-code.yml
deleted file mode 100644
index d078ca449a5..00000000000
--- a/changelogs/unreleased/dm-paste-code-inside-gfm-code.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Don't wrap pasted code when it's already inside code tags
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-revert-mr-8427.yml b/changelogs/unreleased/dm-revert-mr-8427.yml
deleted file mode 100644
index a91cff2e9cd..00000000000
--- a/changelogs/unreleased/dm-revert-mr-8427.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Revert 'New file from interface on existing branch'
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-tree-last-commit.yml b/changelogs/unreleased/dm-tree-last-commit.yml
deleted file mode 100644
index 50619fd6ef2..00000000000
--- a/changelogs/unreleased/dm-tree-last-commit.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Show last commit for current tree on tree page
-merge_request:
-author:
diff --git a/changelogs/unreleased/document-foreign-keys.yml b/changelogs/unreleased/document-foreign-keys.yml
deleted file mode 100644
index faa467e8185..00000000000
--- a/changelogs/unreleased/document-foreign-keys.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add documentation about adding foreign keys
-merge_request:
-author:
diff --git a/changelogs/unreleased/dturner-username.yml b/changelogs/unreleased/dturner-username.yml
deleted file mode 100644
index 09ba822ee65..00000000000
--- a/changelogs/unreleased/dturner-username.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: add username field to push webhook
-merge_request:
-author: David Turner
diff --git a/changelogs/unreleased/dz-fix-submodule-subgroup.yml b/changelogs/unreleased/dz-fix-submodule-subgroup.yml
deleted file mode 100644
index 20c7c9ce657..00000000000
--- a/changelogs/unreleased/dz-fix-submodule-subgroup.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix submodule link to then project under subgroup
-merge_request: 11906
-author:
diff --git a/changelogs/unreleased/dz-project-list-cache-key.yml b/changelogs/unreleased/dz-project-list-cache-key.yml
deleted file mode 100644
index 9e4826e686a..00000000000
--- a/changelogs/unreleased/dz-project-list-cache-key.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use route.cache_key for project list cache key
-merge_request: 11325
-author:
diff --git a/changelogs/unreleased/dz-rename-pipelines-settings-tab.yml b/changelogs/unreleased/dz-rename-pipelines-settings-tab.yml
deleted file mode 100644
index 6a1232523bb..00000000000
--- a/changelogs/unreleased/dz-rename-pipelines-settings-tab.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Rename CI/CD Pipelines to Pipelines in the project settings
-merge_request:
-author:
diff --git a/changelogs/unreleased/enable-auto-cancelling-by-default.yml b/changelogs/unreleased/enable-auto-cancelling-by-default.yml
deleted file mode 100644
index 8b1659bf38b..00000000000
--- a/changelogs/unreleased/enable-auto-cancelling-by-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Enable cancelling non-HEAD pending pipelines by default for all projects
-merge_request: 11023
-author:
diff --git a/changelogs/unreleased/environment-detail-view.yml b/changelogs/unreleased/environment-detail-view.yml
deleted file mode 100644
index c74f70ea86d..00000000000
--- a/changelogs/unreleased/environment-detail-view.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make environment tables responsive
-merge_request:
-author:
diff --git a/changelogs/unreleased/expand-backlog-closed-lists-issue-boards.yml b/changelogs/unreleased/expand-backlog-closed-lists-issue-boards.yml
deleted file mode 100644
index 4796f8e918b..00000000000
--- a/changelogs/unreleased/expand-backlog-closed-lists-issue-boards.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Expand/collapse backlog & closed lists in issue boards
-merge_request:
-author:
diff --git a/changelogs/unreleased/feature-flags-flipper.yml b/changelogs/unreleased/feature-flags-flipper.yml
deleted file mode 100644
index 5be5c44166d..00000000000
--- a/changelogs/unreleased/feature-flags-flipper.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add feature toggles and API endpoints for admins
-merge_request: 11747
-author:
diff --git a/changelogs/unreleased/feature-gb-persist-pipeline-stages.yml b/changelogs/unreleased/feature-gb-persist-pipeline-stages.yml
deleted file mode 100644
index 1404b342359..00000000000
--- a/changelogs/unreleased/feature-gb-persist-pipeline-stages.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Persist pipeline stages in the database
-merge_request: 11790
-author:
diff --git a/changelogs/unreleased/feature-print-go-version-in-env-info.yml b/changelogs/unreleased/feature-print-go-version-in-env-info.yml
deleted file mode 100644
index 34c19b06eda..00000000000
--- a/changelogs/unreleased/feature-print-go-version-in-env-info.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Print Go version in rake gitlab:env:info
-merge_request: 11241
-author:
diff --git a/changelogs/unreleased/feature-rss-scoped-token.yml b/changelogs/unreleased/feature-rss-scoped-token.yml
deleted file mode 100644
index 740d8778be2..00000000000
--- a/changelogs/unreleased/feature-rss-scoped-token.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Expose atom links with an RSS token instead of using the private token
-merge_request: 11647
-author: Alexis Reigel
diff --git a/changelogs/unreleased/fix-33259.yml b/changelogs/unreleased/fix-33259.yml
deleted file mode 100644
index c68e42c02cf..00000000000
--- a/changelogs/unreleased/fix-33259.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix GitHub importer performance on branch existence check
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-counter-cache-for-acts-as-taggable.yml b/changelogs/unreleased/fix-counter-cache-for-acts-as-taggable.yml
deleted file mode 100644
index e40668546c0..00000000000
--- a/changelogs/unreleased/fix-counter-cache-for-acts-as-taggable.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix counter cache for acts as taggable
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-encoding-binary-issue.yml b/changelogs/unreleased/fix-encoding-binary-issue.yml
deleted file mode 100644
index ac9aff64a88..00000000000
--- a/changelogs/unreleased/fix-encoding-binary-issue.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix binary encoding error on MR diffs
-merge_request: 11929
-author:
diff --git a/changelogs/unreleased/fix-gb-exclude-manual-actions-from-cancelable-jobs.yml b/changelogs/unreleased/fix-gb-exclude-manual-actions-from-cancelable-jobs.yml
deleted file mode 100644
index a16fc775b5e..00000000000
--- a/changelogs/unreleased/fix-gb-exclude-manual-actions-from-cancelable-jobs.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Exclude manual actions when checking if pipeline can be canceled
-merge_request: 11562
-author:
diff --git a/changelogs/unreleased/fix-github-clone-wiki.yml b/changelogs/unreleased/fix-github-clone-wiki.yml
deleted file mode 100644
index eadd90e1390..00000000000
--- a/changelogs/unreleased/fix-github-clone-wiki.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Github - Fix token interpolation when cloning wiki repository
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-github-import.yml b/changelogs/unreleased/fix-github-import.yml
deleted file mode 100644
index 3a57152f7a8..00000000000
--- a/changelogs/unreleased/fix-github-import.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix token interpolation when setting the Github remote
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-n-plus-one-queries-for-user-access.yml b/changelogs/unreleased/fix-n-plus-one-queries-for-user-access.yml
deleted file mode 100644
index c2671a96b83..00000000000
--- a/changelogs/unreleased/fix-n-plus-one-queries-for-user-access.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix N+1 queries for non-members in comment threads
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-support-for-external-ci-services.yml b/changelogs/unreleased/fix-support-for-external-ci-services.yml
deleted file mode 100644
index eecb4519259..00000000000
--- a/changelogs/unreleased/fix-support-for-external-ci-services.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix support for external CI services
-merge_request: 11176
-author:
diff --git a/changelogs/unreleased/fix_commits_page.yml b/changelogs/unreleased/fix_commits_page.yml
deleted file mode 100644
index a2afaf6e626..00000000000
--- a/changelogs/unreleased/fix_commits_page.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix duplication of commits header on commits page
-merge_request: 11006
-author: @blackst0ne
diff --git a/changelogs/unreleased/fix_diff_line_comments.yml b/changelogs/unreleased/fix_diff_line_comments.yml
deleted file mode 100644
index bdb0539b49d..00000000000
--- a/changelogs/unreleased/fix_diff_line_comments.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Fix: A diff comment on a change at last line of a file shows as two comments
-  in discussion'
-merge_request:
-author:
diff --git a/changelogs/unreleased/gitaly-local-branches.yml b/changelogs/unreleased/gitaly-local-branches.yml
deleted file mode 100644
index adcc0fa6280..00000000000
--- a/changelogs/unreleased/gitaly-local-branches.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add suport for find_local_branches GRPC from Gitaly
-merge_request: 10059
-author:
diff --git a/changelogs/unreleased/gitaly-opt-out.yml b/changelogs/unreleased/gitaly-opt-out.yml
deleted file mode 100644
index 2f89e0bfc9a..00000000000
--- a/changelogs/unreleased/gitaly-opt-out.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Enable Gitaly by default in installations from source
-merge_request: 11796
-author:
diff --git a/changelogs/unreleased/instrument-merge-request-diff-load-commits.yml b/changelogs/unreleased/instrument-merge-request-diff-load-commits.yml
deleted file mode 100644
index 916b182a48b..00000000000
--- a/changelogs/unreleased/instrument-merge-request-diff-load-commits.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Instrument MergeRequestDiff#load_commits
-merge_request:
-author:
diff --git a/changelogs/unreleased/introduce-source-to-pipelines.yml b/changelogs/unreleased/introduce-source-to-pipelines.yml
deleted file mode 100644
index 7898bd31b39..00000000000
--- a/changelogs/unreleased/introduce-source-to-pipelines.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Introduce source to Pipeline entity
-merge_request:
-author:
diff --git a/changelogs/unreleased/issuable-form-create-label-sub-groups.yml b/changelogs/unreleased/issuable-form-create-label-sub-groups.yml
deleted file mode 100644
index 54b818d6d5e..00000000000
--- a/changelogs/unreleased/issuable-form-create-label-sub-groups.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed create new label form in issue form not working for sub-group projects
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue-23254.yml b/changelogs/unreleased/issue-23254.yml
deleted file mode 100644
index 568a7a41c30..00000000000
--- a/changelogs/unreleased/issue-23254.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed style on unsubscribe page
-merge_request: 
-author: Gustav Ernberg
diff --git a/changelogs/unreleased/issue-edit-inline.yml b/changelogs/unreleased/issue-edit-inline.yml
deleted file mode 100644
index db03d1bdac4..00000000000
--- a/changelogs/unreleased/issue-edit-inline.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Enables inline editing for an issues title & description
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue-template-reproduce-in-example-project.yml b/changelogs/unreleased/issue-template-reproduce-in-example-project.yml
deleted file mode 100644
index 8116007b459..00000000000
--- a/changelogs/unreleased/issue-template-reproduce-in-example-project.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Ask for an example project for bug reports
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue-templates-summary-lines.yml b/changelogs/unreleased/issue-templates-summary-lines.yml
deleted file mode 100644
index 0c8c3d884ce..00000000000
--- a/changelogs/unreleased/issue-templates-summary-lines.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add summary lines for collapsed details in the bug report template
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue_19262.yml b/changelogs/unreleased/issue_19262.yml
deleted file mode 100644
index 7bcbc647fcb..00000000000
--- a/changelogs/unreleased/issue_19262.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Prevent commits from upstream repositories to be re-processed by forks
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue_27166_2.yml b/changelogs/unreleased/issue_27166_2.yml
deleted file mode 100644
index 9b9906e03dd..00000000000
--- a/changelogs/unreleased/issue_27166_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Avoid repeated queries for pipeline builds on merge requests
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue_27168_2.yml b/changelogs/unreleased/issue_27168_2.yml
deleted file mode 100644
index c67692493e0..00000000000
--- a/changelogs/unreleased/issue_27168_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Preloads head pipeline for merge request collection
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue_32225_2.yml b/changelogs/unreleased/issue_32225_2.yml
deleted file mode 100644
index 320b9fe00b8..00000000000
--- a/changelogs/unreleased/issue_32225_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Handle head pipeline when creating merge requests
-merge_request:
-author:
diff --git a/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml b/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
deleted file mode 100644
index df4de9f4e21..00000000000
--- a/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Redirect to user's keys index instead of user's index after a key is deleted
-  in the admin
-merge_request: 10227
-author: Cyril Jouve
diff --git a/changelogs/unreleased/mabes-gitlab-ce-bypass-auto-login.yml b/changelogs/unreleased/mabes-gitlab-ce-bypass-auto-login.yml
deleted file mode 100644
index a321ed9d7d8..00000000000
--- a/changelogs/unreleased/mabes-gitlab-ce-bypass-auto-login.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow manual bypass of auto_sign_in_with_provider with a new param
-merge_request: 10187
-author: Maxime Besson
diff --git a/changelogs/unreleased/migrate-artifacts-to-a-new-path.yml b/changelogs/unreleased/migrate-artifacts-to-a-new-path.yml
deleted file mode 100644
index bd022a3a91b..00000000000
--- a/changelogs/unreleased/migrate-artifacts-to-a-new-path.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Migrate artifacts to a new path
-merge_request:
-author:
diff --git a/changelogs/unreleased/mk-fix-git-over-http-rejections.yml b/changelogs/unreleased/mk-fix-git-over-http-rejections.yml
deleted file mode 100644
index e75740e913f..00000000000
--- a/changelogs/unreleased/mk-fix-git-over-http-rejections.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix Git-over-HTTP error statuses and improve error messages
-merge_request: 11398
-author:
diff --git a/changelogs/unreleased/mrchrisw-catch-openssl.yml b/changelogs/unreleased/mrchrisw-catch-openssl.yml
deleted file mode 100644
index a8b433fb0cd..00000000000
--- a/changelogs/unreleased/mrchrisw-catch-openssl.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Rescue OpenSSL::SSL::SSLError in JiraService & IssueTrackerService
-merge_request:
-author:
diff --git a/changelogs/unreleased/omega-submodules.yml b/changelogs/unreleased/omega-submodules.yml
deleted file mode 100644
index 1488eb72174..00000000000
--- a/changelogs/unreleased/omega-submodules.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: 'Repository browser: handle in-repository submodule urls'
-merge_request:
-author: David Turner
diff --git a/changelogs/unreleased/prevent-project-transfer.yml b/changelogs/unreleased/prevent-project-transfer.yml
deleted file mode 100644
index a5c74676aab..00000000000
--- a/changelogs/unreleased/prevent-project-transfer.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Prevent project transfers if a new group is not selected
-merge_request:
-author:
diff --git a/changelogs/unreleased/projects-api-import-status.yml b/changelogs/unreleased/projects-api-import-status.yml
deleted file mode 100644
index 06603c0adec..00000000000
--- a/changelogs/unreleased/projects-api-import-status.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Expose import_status in Projects API
-merge_request: 11851
-author: Robin Bobbitt
diff --git a/changelogs/unreleased/protected-branches-no-one-merge.yml b/changelogs/unreleased/protected-branches-no-one-merge.yml
deleted file mode 100644
index 52d93793f3d..00000000000
--- a/changelogs/unreleased/protected-branches-no-one-merge.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow 'no one' as an option for allowed to merge on a procted branch
-merge_request:
-author:
diff --git a/changelogs/unreleased/reduce-sidekiq-wait-timings.yml b/changelogs/unreleased/reduce-sidekiq-wait-timings.yml
deleted file mode 100644
index 4d23accc82e..00000000000
--- a/changelogs/unreleased/reduce-sidekiq-wait-timings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Reduce time spent waiting for certain Sidekiq jobs to complete
-merge_request:
-author:
diff --git a/changelogs/unreleased/refactor-projects-finder-init-collection.yml b/changelogs/unreleased/refactor-projects-finder-init-collection.yml
deleted file mode 100644
index c8113419f21..00000000000
--- a/changelogs/unreleased/refactor-projects-finder-init-collection.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor ProjectsFinder#init_collection to produce more efficient queries for
-  retrieving projects
-merge_request:
-author:
diff --git a/changelogs/unreleased/remove-old-isobject.yml b/changelogs/unreleased/remove-old-isobject.yml
deleted file mode 100644
index 67b18642253..00000000000
--- a/changelogs/unreleased/remove-old-isobject.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove unused code and uses underscore
-merge_request:
-author:
diff --git a/changelogs/unreleased/rename-builds-controller.yml b/changelogs/unreleased/rename-builds-controller.yml
deleted file mode 100644
index 7f6872ccf95..00000000000
--- a/changelogs/unreleased/rename-builds-controller.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Change /builds in the URL to /-/jobs. Backward URLs were also added
-merge_request: 11407
-author:
diff --git a/changelogs/unreleased/rework-authorizations-performance.yml b/changelogs/unreleased/rework-authorizations-performance.yml
deleted file mode 100644
index f64257a6f56..00000000000
--- a/changelogs/unreleased/rework-authorizations-performance.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: >
-  Project authorizations are calculated much faster when using PostgreSQL, and
-  nested groups support for MySQL has been removed
-merge_request: 10885
-author:
diff --git a/changelogs/unreleased/search-restrict-projects-to-group.yml b/changelogs/unreleased/search-restrict-projects-to-group.yml
deleted file mode 100644
index ac134bc5bce..00000000000
--- a/changelogs/unreleased/search-restrict-projects-to-group.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Restricts search projects dropdown to group projects when group is selected
-merge_request:
-author:
diff --git a/changelogs/unreleased/sh-fix-container-registry-s3-redirects.yml b/changelogs/unreleased/sh-fix-container-registry-s3-redirects.yml
deleted file mode 100644
index 1e783811b66..00000000000
--- a/changelogs/unreleased/sh-fix-container-registry-s3-redirects.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Properly handle container registry redirects to fix metadata stored on a S3 backend
-merge_request:
-author:
diff --git a/changelogs/unreleased/sh-fix-refactor-uploader-work-dir.yml b/changelogs/unreleased/sh-fix-refactor-uploader-work-dir.yml
deleted file mode 100644
index 255608bd89a..00000000000
--- a/changelogs/unreleased/sh-fix-refactor-uploader-work-dir.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Set artifact working directory to be in the destination store to prevent unnecessary I/O
-merge_request:
-author:
diff --git a/changelogs/unreleased/sync-email-from-omniauth.yml b/changelogs/unreleased/sync-email-from-omniauth.yml
deleted file mode 100644
index ed14a95a5f1..00000000000
--- a/changelogs/unreleased/sync-email-from-omniauth.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Sync email address from specified omniauth provider
-merge_request: 11268
-author: Robin Bobbitt
diff --git a/changelogs/unreleased/task-list-2.yml b/changelogs/unreleased/task-list-2.yml
deleted file mode 100644
index cbae8178081..00000000000
--- a/changelogs/unreleased/task-list-2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Update task_list to version 2.0.0
-merge_request: 11525
-author: Jared Deckard <jared.deckard@gmail.com>
diff --git a/changelogs/unreleased/tc-cache-trackable-attributes.yml b/changelogs/unreleased/tc-cache-trackable-attributes.yml
deleted file mode 100644
index 4a2cf50893a..00000000000
--- a/changelogs/unreleased/tc-cache-trackable-attributes.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Limit User's trackable attributes, like `current_sign_in_at`, to update at most once/hour"
-merge_request: 11053
-author:
diff --git a/changelogs/unreleased/tc-clean-pending-delete-projects.yml b/changelogs/unreleased/tc-clean-pending-delete-projects.yml
deleted file mode 100644
index 31b43999c31..00000000000
--- a/changelogs/unreleased/tc-clean-pending-delete-projects.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add post-deploy migration to clean up projects in `pending_delete` state
-merge_request: 11044
-author:
diff --git a/changelogs/unreleased/tc-improve-project-api-perf.yml b/changelogs/unreleased/tc-improve-project-api-perf.yml
deleted file mode 100644
index 7e88466c058..00000000000
--- a/changelogs/unreleased/tc-improve-project-api-perf.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Improve performance of ProjectFinder used in /projects API endpoint
-merge_request: 11666
-author:
diff --git a/changelogs/unreleased/up-arrow-focus-discussion-comment.yml b/changelogs/unreleased/up-arrow-focus-discussion-comment.yml
deleted file mode 100644
index 5457dab6d3d..00000000000
--- a/changelogs/unreleased/up-arrow-focus-discussion-comment.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix up arrow not editing last discussion comment
-merge_request:
-author:
diff --git a/changelogs/unreleased/update-admin-health-page.yml b/changelogs/unreleased/update-admin-health-page.yml
deleted file mode 100644
index 51aa6682b49..00000000000
--- a/changelogs/unreleased/update-admin-health-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added application readiness endpoints to the monitoring health check admin
-  view
-merge_request:
-author:
diff --git a/changelogs/unreleased/use_relative_path_for_project_avatars.yml b/changelogs/unreleased/use_relative_path_for_project_avatars.yml
deleted file mode 100644
index e3d0c0e1187..00000000000
--- a/changelogs/unreleased/use_relative_path_for_project_avatars.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use relative paths for group/project/user avatars
-merge_request: 11001
-author: blackst0ne
diff --git a/changelogs/unreleased/wait-for-ajax-handling-all-js-requests.yml b/changelogs/unreleased/wait-for-ajax-handling-all-js-requests.yml
deleted file mode 100644
index 14aebe792c2..00000000000
--- a/changelogs/unreleased/wait-for-ajax-handling-all-js-requests.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Use wait_for_requests for both ajax and Vue requests
-merge_request:
-author:
diff --git a/changelogs/unreleased/winh-current-user-filter.yml b/changelogs/unreleased/winh-current-user-filter.yml
deleted file mode 100644
index e5409827b31..00000000000
--- a/changelogs/unreleased/winh-current-user-filter.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Show current user immediately in issuable filters
-merge_request: 11630
-author:
diff --git a/changelogs/unreleased/winh-pipeline-author-link.yml b/changelogs/unreleased/winh-pipeline-author-link.yml
deleted file mode 100644
index 1b903d1e357..00000000000
--- a/changelogs/unreleased/winh-pipeline-author-link.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Link to commit author user page from pipelines
-merge_request: 11100
-author:
diff --git a/changelogs/unreleased/winh-styled-people-search-bar.yml b/changelogs/unreleased/winh-styled-people-search-bar.yml
deleted file mode 100644
index a088af37d8d..00000000000
--- a/changelogs/unreleased/winh-styled-people-search-bar.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Style people in issuable search bar
-merge_request: 11402
-author:
diff --git a/changelogs/unreleased/zj-clean-up-ci-variables-table.yml b/changelogs/unreleased/zj-clean-up-ci-variables-table.yml
deleted file mode 100644
index ea2db40d590..00000000000
--- a/changelogs/unreleased/zj-clean-up-ci-variables-table.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Cleanup ci_variables schema and table
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-i18n-pipeline-schedules.yml b/changelogs/unreleased/zj-i18n-pipeline-schedules.yml
deleted file mode 100644
index 51c82a16359..00000000000
--- a/changelogs/unreleased/zj-i18n-pipeline-schedules.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow translation of Pipeline Schedules
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-job-view-goes-real-time.yml b/changelogs/unreleased/zj-job-view-goes-real-time.yml
deleted file mode 100644
index 376c9dfa65f..00000000000
--- a/changelogs/unreleased/zj-job-view-goes-real-time.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Job details page update real time
-merge_request: 11651
-author:
diff --git a/changelogs/unreleased/zj-pipeline-schedule-owner.yml b/changelogs/unreleased/zj-pipeline-schedule-owner.yml
deleted file mode 100644
index be704e173ab..00000000000
--- a/changelogs/unreleased/zj-pipeline-schedule-owner.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add foreign key for pipeline schedule owner
-merge_request: 11233
-author:
diff --git a/changelogs/unreleased/zj-prom-pipeline-count.yml b/changelogs/unreleased/zj-prom-pipeline-count.yml
deleted file mode 100644
index 191e4f2f949..00000000000
--- a/changelogs/unreleased/zj-prom-pipeline-count.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Add prometheus metrics on pipeline creation
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-raise-etag-route-regex-miss.yml b/changelogs/unreleased/zj-raise-etag-route-regex-miss.yml
deleted file mode 100644
index 57a5f4e44c0..00000000000
--- a/changelogs/unreleased/zj-raise-etag-route-regex-miss.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix etag route not being a match for environments
-merge_request:
-author:
diff --git a/changelogs/unreleased/zj-read-registry-pat.yml b/changelogs/unreleased/zj-read-registry-pat.yml
deleted file mode 100644
index d36159bbdf5..00000000000
--- a/changelogs/unreleased/zj-read-registry-pat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow pulling of container images using personal access tokens
-merge_request: 11845
-author:
diff --git a/changelogs/unreleased/zj-realtime-env-list.yml b/changelogs/unreleased/zj-realtime-env-list.yml
deleted file mode 100644
index 6460d17edc9..00000000000
--- a/changelogs/unreleased/zj-realtime-env-list.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Make environment table realtime
-merge_request: 11333
-author:
diff --git a/changelogs/unreleased/zj-sort-env-folders.yml b/changelogs/unreleased/zj-sort-env-folders.yml
deleted file mode 100644
index b3ca97aef94..00000000000
--- a/changelogs/unreleased/zj-sort-env-folders.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Sort folder for environments
-merge_request:
-author:
-- 
cgit v1.2.1


From 6661b0b8e0232e9ad8df783a7bee90deb5b78e54 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 22 Jun 2017 11:20:54 -0500
Subject: Fix Style/EmptyLines violation in lib/feature.rb

---
 lib/feature.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/feature.rb b/lib/feature.rb
index e2fd8774c6a..d3d972564af 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -39,7 +39,6 @@ class Feature
       get(key).disable
     end
 
-
     def flipper
       @flipper ||= begin
         adapter = Flipper::Adapters::ActiveRecord.new(
-- 
cgit v1.2.1


From 0a863c8b9d066f463a83e007150af34b813ec923 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Mon, 19 Jun 2017 15:13:19 -0700
Subject: Add `datetime_with_timezone` to table definition

So the method can be used in a `create_table` block. There is a new Rubocop style cop that requires the usage of `datetime_with_timezone`.
---
 .../initializers/active_record_table_definition.rb | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb
index 4f59e35f4da..8e3a1c7a62f 100644
--- a/config/initializers/active_record_table_definition.rb
+++ b/config/initializers/active_record_table_definition.rb
@@ -3,15 +3,15 @@
 
 require 'active_record/connection_adapters/abstract/schema_definitions'
 
-# Appends columns `created_at` and `updated_at` to a table.
-#
-# It is used in table creation like:
-# create_table 'users' do |t|
-#   t.timestamps_with_timezone
-# end
 module ActiveRecord
   module ConnectionAdapters
     class TableDefinition
+      # Appends columns `created_at` and `updated_at` to a table.
+      #
+      # It is used in table creation like:
+      # create_table 'users' do |t|
+      #   t.timestamps_with_timezone
+      # end
       def timestamps_with_timezone(**options)
         options[:null] = false if options[:null].nil?
 
@@ -19,6 +19,16 @@ module ActiveRecord
           column(column_name, :datetime_with_timezone, options)
         end
       end
+
+      # Adds specified column with appropriate timestamp type
+      #
+      # It is used in table creation like:
+      # create_table 'users' do |t|
+      #   t.datetime_with_timezone :did_something_at
+      # end
+      def datetime_with_timezone(column_name, **options)
+        column(column_name, :datetime_with_timezone, options)
+      end
     end
   end
 end
-- 
cgit v1.2.1


From b367b780eb503c0141e21194e922d0296557e277 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 20 Jun 2017 11:07:59 -0700
Subject: Fix PostgreSQL schema dump for `timestamptz`

---
 config/initializers/active_record_data_types.rb | 41 ++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index beb97c6fce0..454d5b11902 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -4,20 +4,51 @@
 if Gitlab::Database.postgresql?
   require 'active_record/connection_adapters/postgresql_adapter'
 
-  module ActiveRecord
-    module ConnectionAdapters
-      class PostgreSQLAdapter
-        NATIVE_DATABASE_TYPES.merge!(datetime_with_timezone: { name: 'timestamptz' })
+  module ActiveRecord::ConnectionAdapters::PostgreSQL::OID
+    # Add the class `DateTimeWithTimeZone` so we can map `timestamptz` to it.
+    class DateTimeWithTimeZone < DateTime
+      def type
+        :datetime_with_timezone
+      end
+    end
+  end
+
+  module RegisterDateTimeWithTimeZone
+    # Run original `initialize_type_map` and then register `timestamptz` as a
+    # `DateTimeWithTimeZone`.
+    #
+    # Apparently it does not matter that the original `initialize_type_map`
+    # aliases `timestamptz` to `timestamp`.
+    #
+    # When schema dumping, `timestamptz` columns will be output as
+    # `t.datetime_with_timezone`.
+    def initialize_type_map(mapping)
+      super mapping
+
+      mapping.register_type 'timestamptz' do |_, _, sql_type|
+        precision = extract_precision(sql_type)
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::DateTimeWithTimeZone.new(precision: precision)
       end
     end
   end
+
+  class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    prepend RegisterDateTimeWithTimeZone
+
+    # Add column type `datetime_with_timezone` so we can do this in
+    # migrations:
+    #
+    #   add_column(:users, :datetime_with_timezone)
+    #
+    NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamptz' }
+  end
 elsif Gitlab::Database.mysql?
   require 'active_record/connection_adapters/mysql2_adapter'
 
   module ActiveRecord
     module ConnectionAdapters
       class AbstractMysqlAdapter
-        NATIVE_DATABASE_TYPES.merge!(datetime_with_timezone: { name: 'timestamp' })
+        NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamp' }
       end
     end
   end
-- 
cgit v1.2.1


From ec7b3a8d5cdc88ba4d494da11a3b90257e172652 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Wed, 21 Jun 2017 11:19:19 -0700
Subject: Fix MySQL schema dump for `timestamp`

---
 config/initializers/active_record_data_types.rb | 34 ++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index 454d5b11902..fef591c397d 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -45,11 +45,37 @@ if Gitlab::Database.postgresql?
 elsif Gitlab::Database.mysql?
   require 'active_record/connection_adapters/mysql2_adapter'
 
-  module ActiveRecord
-    module ConnectionAdapters
-      class AbstractMysqlAdapter
-        NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamp' }
+  module RegisterDateTimeWithTimeZone
+    # Run original `initialize_type_map` and then register `timestamp` as a
+    # `MysqlDateTimeWithTimeZone`.
+    #
+    # When schema dumping, `timestamp` columns will be output as
+    # `t.datetime_with_timezone`.
+    def initialize_type_map(mapping)
+      super mapping
+
+      mapping.register_type(%r(timestamp)i) do |sql_type|
+        precision = extract_precision(sql_type)
+        ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::MysqlDateTimeWithTimeZone.new(precision: precision)
       end
     end
   end
+
+  class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
+    prepend RegisterDateTimeWithTimeZone
+
+    # Add the class `DateTimeWithTimeZone` so we can map `timestamp` to it.
+    class MysqlDateTimeWithTimeZone < MysqlDateTime
+      def type
+        :datetime_with_timezone
+      end
+    end
+
+    # Add column type `datetime_with_timezone` so we can do this in
+    # migrations:
+    #
+    #   add_column(:users, :datetime_with_timezone)
+    #
+    NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamp' }
+  end
 end
-- 
cgit v1.2.1


From 171e1bb4455c1dbb02bebf01ccae3a59a184b7ba Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 22 Jun 2017 11:54:35 -0500
Subject: Revert "Merge branch 'rs-bootsnap' into 'master'"

This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing
changes made to 66aad16d1aaa426237e52ef19385385566f194dc.
---
 Gemfile        |  1 -
 Gemfile.lock   |  4 ----
 config/boot.rb | 12 ------------
 3 files changed, 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index b1790b23dcd..84722026e2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '4.2.8'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
-gem 'bootsnap', '~> 1.0.0'
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index bfd0498db35..6226c6bebdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,8 +83,6 @@ GEM
     bindata (2.3.5)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.0.0)
-      msgpack (~> 1.0)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -464,7 +462,6 @@ GEM
     minitest (5.7.0)
     mmap2 (2.2.6)
     mousetrap-rails (1.4.6)
-    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -928,7 +925,6 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
   binding_of_caller (~> 0.7.2)
-  bootsnap (~> 1.0.0)
   bootstrap-sass (~> 3.3.0)
   brakeman (~> 3.6.0)
   browser (~> 2.2)
diff --git a/config/boot.rb b/config/boot.rb
index 16de55d7a86..2d01092acd5 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -9,15 +9,3 @@ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
   ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir'
 end
-
-# Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage
-require 'bootsnap'
-Bootsnap.setup(
-  cache_dir:            'tmp/cache',
-  development_mode:     ENV['RAILS_ENV'] == 'development',
-  load_path_cache:      true,
-  autoload_paths_cache: true,
-  disable_trace:        false,
-  compile_cache_iseq:   true,
-  compile_cache_yaml:   true
-)
-- 
cgit v1.2.1


From 2b0b00268e6f44e93cd495f7cb70de5edd9e6208 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Thu, 22 Jun 2017 13:13:22 -0500
Subject: Remove unnecessary top padding on group MR index

---
 app/views/groups/merge_requests.html.haml            | 3 +--
 changelogs/unreleased/dm-unnecessary-top-padding.yml | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/dm-unnecessary-top-padding.yml

diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 8fe0bd149f3..45e39252e16 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -18,5 +18,4 @@
     - if current_user
       To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
 
-  .prepend-top-default
-    = render 'shared/merge_requests'
+  = render 'shared/merge_requests'
diff --git a/changelogs/unreleased/dm-unnecessary-top-padding.yml b/changelogs/unreleased/dm-unnecessary-top-padding.yml
new file mode 100644
index 00000000000..4557c06f8e7
--- /dev/null
+++ b/changelogs/unreleased/dm-unnecessary-top-padding.yml
@@ -0,0 +1,4 @@
+---
+title: Remove unnecessary top padding on group MR index
+merge_request:
+author:
-- 
cgit v1.2.1


From 1a58170bd4634753d8c96393744093e79caf0460 Mon Sep 17 00:00:00 2001
From: winh <winnie@gitlab.com>
Date: Thu, 22 Jun 2017 13:11:05 +0200
Subject: Suppress Vue tips when running Karma

---
 spec/javascripts/test_bundle.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index f0d51bd0902..7637494cf8b 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -7,6 +7,10 @@ import '~/commons';
 import Vue from 'vue';
 import VueResource from 'vue-resource';
 
+const isHeadlessChrome = /\bHeadlessChrome\//.test(navigator.userAgent);
+Vue.config.devtools = !isHeadlessChrome;
+Vue.config.productionTip = false;
+
 Vue.use(VueResource);
 
 // enable test fixtures
-- 
cgit v1.2.1


From e00f487049e811c497ba3780f38f7e1a8572ad97 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 22 Jun 2017 21:19:55 +0200
Subject: Fix bug where Service `created_at` time was used instead of
 deployment time.

---
 app/models/project_services/prometheus_service.rb       | 2 +-
 spec/models/project_services/prometheus_service_spec.rb | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index c9df678f97e..217f753f05f 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -60,7 +60,7 @@ class PrometheusService < MonitoringService
 
   def deployment_metrics(deployment)
     metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &method(:rename_data_to_metrics))
-    metrics&.merge(deployment_time: created_at.to_i) || {}
+    metrics&.merge(deployment_time: deployment.created_at.to_i) || {}
   end
 
   def additional_environment_metrics(environment)
diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index c914b32f7a4..37f23b1243c 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -71,7 +71,7 @@ describe PrometheusService, models: true, caching: true do
   end
 
   describe '#deployment_metrics' do
-    let(:deployment) { build_stubbed(:deployment)}
+    let(:deployment) { build_stubbed(:deployment) }
     let(:deployment_query) { Gitlab::Prometheus::Queries::DeploymentQuery }
 
     around do |example|
@@ -80,13 +80,16 @@ describe PrometheusService, models: true, caching: true do
 
     context 'with valid data' do
       subject { service.deployment_metrics(deployment) }
+      let(:fake_deployment_time) { 10 }
 
       before do
         stub_reactive_cache(service, prometheus_data, deployment_query, deployment.id)
       end
 
       it 'returns reactive data' do
-        is_expected.to eq(prometheus_metrics_data.merge(deployment_time: deployment.created_at.to_i))
+        expect(deployment).to receive(:created_at).and_return(fake_deployment_time)
+
+        expect(subject).to eq(prometheus_metrics_data.merge(deployment_time: fake_deployment_time))
       end
     end
   end
-- 
cgit v1.2.1


From d49d63a04e567a32decd363bee8527b96898b52a Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Thu, 22 Jun 2017 20:37:08 +0000
Subject: Resolve ""Add Members" drop-down doesn't separate Name/Username"

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

diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index ec45253e50b..46efdcf4202 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -643,7 +643,7 @@ UsersSelect.prototype.formatResult = function(user) {
   } else {
     avatar = gon.default_avatar_url;
   }
-  return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar s24' src='" + avatar + "'></div> <div class='user-name'>" + user.name + "</div> <div class='user-username'>" + (user.username || "") + "</div> </div>";
+  return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar avatar-inline s32' src='" + avatar + "'></div> <div class='user-name dropdown-menu-user-full-name'>" + user.name + "</div> <div class='user-username dropdown-menu-user-username'>" + ("@" + user.username || "") + "</div> </div>";
 };
 
 UsersSelect.prototype.formatSelection = function(user) {
-- 
cgit v1.2.1


From daef4087127747d4bf13fc05d3c39f9a7cd72c01 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 20 Jun 2017 14:35:55 -0700
Subject: Fix breadcrumb order

---
 app/helpers/groups_helper.rb       |  2 +-
 spec/helpers/groups_helper_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index c003b01e226..eb45241615f 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -15,7 +15,7 @@ module GroupsHelper
     @has_group_title = true
     full_title = ''
 
-    group.ancestors.each do |parent|
+    group.ancestors.reverse.each do |parent|
       full_title += link_to(simple_sanitize(parent.name), group_path(parent), class: 'group-path hidable')
       full_title += '<span class="hidable"> / </span>'.html_safe
     end
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb
index a7c06e577a2..84a60ce13fc 100644
--- a/spec/helpers/groups_helper_spec.rb
+++ b/spec/helpers/groups_helper_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe GroupsHelper do
+  include ApplicationHelper
+
   describe 'group_icon' do
     avatar_file_path = File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
 
@@ -81,4 +83,15 @@ describe GroupsHelper do
       end
     end
   end
+
+  describe 'group_title' do
+    let(:group) { create(:group) }
+    let(:nested_group) { create(:group, parent: group) }
+    let(:deep_nested_group) { create(:group, parent: nested_group) }
+    let!(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
+
+    it 'outputs the groups in the correct order' do
+      expect(group_title(very_deep_nested_group)).to match(/>#{group.name}<\/a>.*>#{nested_group.name}<\/a>.*>#{deep_nested_group.name}<\/a>/)
+    end
+  end
 end
-- 
cgit v1.2.1


From c12172ee3374fff0d57b111504773d6e0ad04ee6 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Thu, 22 Jun 2017 16:34:52 -0500
Subject: Remove layout nav from scroll calculation

---
 app/assets/javascripts/right_sidebar.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
index da7c0c5a36c..322162afdb8 100644
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -10,8 +10,6 @@ import Cookies from 'js-cookie';
 
       this.$sidebarInner = this.sidebar.find('.issuable-sidebar');
       this.$navGitlab = $('.navbar-gitlab');
-      this.$layoutNav = $('.layout-nav');
-      this.$subScroll = $('.sub-nav-scroll');
       this.$rightSidebar = $('.js-right-sidebar');
 
       this.removeListeners();
@@ -215,7 +213,7 @@ import Cookies from 'js-cookie';
     };
 
     Sidebar.prototype.setSidebarHeight = function() {
-      const $navHeight = this.$navGitlab.outerHeight() + this.$layoutNav.outerHeight() + (this.$subScroll ? this.$subScroll.outerHeight() : 0);
+      const $navHeight = this.$navGitlab.outerHeight();
       const diff = $navHeight - $(window).scrollTop();
       if (diff > 0) {
         this.$rightSidebar.outerHeight($(window).height() - diff);
-- 
cgit v1.2.1


From 812899d1669daacde5acf5b0a11a08a6e07a0906 Mon Sep 17 00:00:00 2001
From: Gabriele <gabriele.stefanini@gmail.com>
Date: Thu, 22 Jun 2017 21:37:01 +0000
Subject: Change composer update to install to follow PHP/composer best
 practice

[ci skip]
---
 doc/ci/examples/deployment/composer-npm-deploy.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ci/examples/deployment/composer-npm-deploy.md b/doc/ci/examples/deployment/composer-npm-deploy.md
index 8b0d8a003fd..b9f0485290e 100644
--- a/doc/ci/examples/deployment/composer-npm-deploy.md
+++ b/doc/ci/examples/deployment/composer-npm-deploy.md
@@ -20,12 +20,12 @@ before_script:
   - php -r "unlink('composer-setup.php');"
 ```
 
-This will make sure we have all requirements ready. Next, we want to run `composer update` to fetch all PHP dependencies  and `npm install` to load node packages, then run the `npm` script. We need to append them  into `before_script` section:
+This will make sure we have all requirements ready. Next, we want to run `composer install` to fetch all PHP dependencies  and `npm install` to load node packages, then run the `npm` script. We need to append them  into `before_script` section:
 
 ```yaml
 before_script:
   # ...
-  - php composer.phar update
+  - php composer.phar install
   - npm install
   - npm run deploy
 ```
@@ -133,7 +133,7 @@ before_script:
   - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
   - php composer-setup.php
   - php -r "unlink('composer-setup.php');"
-  - php composer.phar update
+  - php composer.phar install
   - npm install
   - npm run deploy
   - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-- 
cgit v1.2.1


From ca25ad266b666f225b8083662e64f715d7c33e37 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Sun, 18 Jun 2017 02:09:45 -0500
Subject: refactor Notes class to ES class syntax

---
 app/assets/javascripts/notes.js | 2730 +++++++++++++++++++--------------------
 1 file changed, 1356 insertions(+), 1374 deletions(-)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 624dd336786..b21d7774920 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -4,7 +4,7 @@ no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line,
 default-case, prefer-template, consistent-return, no-alert, no-return-assign,
 no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new,
 brace-style, no-lonely-if, vars-on-top, no-unused-vars, no-sequences, no-shadow,
-newline-per-chained-call, no-useless-escape */
+newline-per-chained-call, no-useless-escape, class-methods-use-this */
 /* global Flash */
 /* global Autosave */
 /* global ResolveService */
@@ -25,1507 +25,1489 @@ import './task_list';
 window.autosize = autosize;
 window.Dropzone = Dropzone;
 
-const normalizeNewlines = function(str) {
+function normalizeNewlines(str) {
   return str.replace(/\r\n/g, '\n');
-};
-
-(function() {
-  this.Notes = (function() {
-    const MAX_VISIBLE_COMMIT_LIST_COUNT = 3;
-    const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
-
-    Notes.interval = null;
-
-    function Notes(notes_url, note_ids, last_fetched_at, view, enableGFM = true) {
-      this.updateTargetButtons = this.updateTargetButtons.bind(this);
-      this.updateComment = this.updateComment.bind(this);
-      this.visibilityChange = this.visibilityChange.bind(this);
-      this.cancelDiscussionForm = this.cancelDiscussionForm.bind(this);
-      this.onAddDiffNote = this.onAddDiffNote.bind(this);
-      this.setupDiscussionNoteForm = this.setupDiscussionNoteForm.bind(this);
-      this.onReplyToDiscussionNote = this.onReplyToDiscussionNote.bind(this);
-      this.removeNote = this.removeNote.bind(this);
-      this.cancelEdit = this.cancelEdit.bind(this);
-      this.updateNote = this.updateNote.bind(this);
-      this.addDiscussionNote = this.addDiscussionNote.bind(this);
-      this.addNoteError = this.addNoteError.bind(this);
-      this.addNote = this.addNote.bind(this);
-      this.resetMainTargetForm = this.resetMainTargetForm.bind(this);
-      this.refresh = this.refresh.bind(this);
-      this.keydownNoteText = this.keydownNoteText.bind(this);
-      this.toggleCommitList = this.toggleCommitList.bind(this);
-      this.postComment = this.postComment.bind(this);
-      this.clearFlashWrapper = this.clearFlash.bind(this);
-      this.onHashChange = this.onHashChange.bind(this);
-
-      this.notes_url = notes_url;
-      this.note_ids = note_ids;
-      this.enableGFM = enableGFM;
-      // Used to keep track of updated notes while people are editing things
-      this.updatedNotesTrackingMap = {};
-      this.last_fetched_at = last_fetched_at;
-      this.noteable_url = document.URL;
-      this.notesCountBadge || (this.notesCountBadge = $('.issuable-details').find('.notes-tab .badge'));
-      this.basePollingInterval = 15000;
-      this.maxPollingSteps = 4;
-
-      this.cleanBinding();
-      this.addBinding();
-      this.setPollingInterval();
-      this.setupMainTargetNoteForm();
-      this.taskList = new gl.TaskList({
-        dataType: 'note',
-        fieldName: 'note',
-        selector: '.notes'
-      });
-      this.collapseLongCommitList();
-      this.setViewType(view);
-
-      // We are in the Merge Requests page so we need another edit form for Changes tab
-      if (gl.utils.getPagePath(1) === 'merge_requests') {
-        $('.note-edit-form').clone()
-          .addClass('mr-note-edit-form').insertAfter('.note-edit-form');
-      }
+}
+
+const MAX_VISIBLE_COMMIT_LIST_COUNT = 3;
+const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
+
+export default class Notes {
+  constructor(notes_url, note_ids, last_fetched_at, view, enableGFM = true) {
+    this.updateTargetButtons = this.updateTargetButtons.bind(this);
+    this.updateComment = this.updateComment.bind(this);
+    this.visibilityChange = this.visibilityChange.bind(this);
+    this.cancelDiscussionForm = this.cancelDiscussionForm.bind(this);
+    this.onAddDiffNote = this.onAddDiffNote.bind(this);
+    this.setupDiscussionNoteForm = this.setupDiscussionNoteForm.bind(this);
+    this.onReplyToDiscussionNote = this.onReplyToDiscussionNote.bind(this);
+    this.removeNote = this.removeNote.bind(this);
+    this.cancelEdit = this.cancelEdit.bind(this);
+    this.updateNote = this.updateNote.bind(this);
+    this.addDiscussionNote = this.addDiscussionNote.bind(this);
+    this.addNoteError = this.addNoteError.bind(this);
+    this.addNote = this.addNote.bind(this);
+    this.resetMainTargetForm = this.resetMainTargetForm.bind(this);
+    this.refresh = this.refresh.bind(this);
+    this.keydownNoteText = this.keydownNoteText.bind(this);
+    this.toggleCommitList = this.toggleCommitList.bind(this);
+    this.postComment = this.postComment.bind(this);
+    this.clearFlashWrapper = this.clearFlash.bind(this);
+    this.onHashChange = this.onHashChange.bind(this);
+
+    this.notes_url = notes_url;
+    this.note_ids = note_ids;
+    this.enableGFM = enableGFM;
+    // Used to keep track of updated notes while people are editing things
+    this.updatedNotesTrackingMap = {};
+    this.last_fetched_at = last_fetched_at;
+    this.noteable_url = document.URL;
+    this.notesCountBadge || (this.notesCountBadge = $('.issuable-details').find('.notes-tab .badge'));
+    this.basePollingInterval = 15000;
+    this.maxPollingSteps = 4;
+
+    this.cleanBinding();
+    this.addBinding();
+    this.setPollingInterval();
+    this.setupMainTargetNoteForm();
+    this.taskList = new gl.TaskList({
+      dataType: 'note',
+      fieldName: 'note',
+      selector: '.notes'
+    });
+    this.collapseLongCommitList();
+    this.setViewType(view);
+
+    // We are in the Merge Requests page so we need another edit form for Changes tab
+    if (gl.utils.getPagePath(1) === 'merge_requests') {
+      $('.note-edit-form').clone()
+        .addClass('mr-note-edit-form').insertAfter('.note-edit-form');
+    }
+  }
+
+  setViewType(view) {
+    this.view = Cookies.get('diff_view') || view;
+  }
+
+  addBinding() {
+    // Edit note link
+    $(document).on('click', '.js-note-edit', this.showEditForm.bind(this));
+    $(document).on('click', '.note-edit-cancel', this.cancelEdit);
+    // Reopen and close actions for Issue/MR combined with note form submit
+    $(document).on('click', '.js-comment-submit-button', this.postComment);
+    $(document).on('click', '.js-comment-save-button', this.updateComment);
+    $(document).on('keyup input', '.js-note-text', this.updateTargetButtons);
+    // resolve a discussion
+    $(document).on('click', '.js-comment-resolve-button', this.postComment);
+    // remove a note (in general)
+    $(document).on('click', '.js-note-delete', this.removeNote);
+    // delete note attachment
+    $(document).on('click', '.js-note-attachment-delete', this.removeAttachment);
+    // reset main target form when clicking discard
+    $(document).on('click', '.js-note-discard', this.resetMainTargetForm);
+    // update the file name when an attachment is selected
+    $(document).on('change', '.js-note-attachment-input', this.updateFormAttachment);
+    // reply to diff/discussion notes
+    $(document).on('click', '.js-discussion-reply-button', this.onReplyToDiscussionNote);
+    // add diff note
+    $(document).on('click', '.js-add-diff-note-button', this.onAddDiffNote);
+    // hide diff note form
+    $(document).on('click', '.js-close-discussion-note-form', this.cancelDiscussionForm);
+    // toggle commit list
+    $(document).on('click', '.system-note-commit-list-toggler', this.toggleCommitList);
+    // fetch notes when tab becomes visible
+    $(document).on('visibilitychange', this.visibilityChange);
+    // when issue status changes, we need to refresh data
+    $(document).on('issuable:change', this.refresh);
+    // ajax:events that happen on Form when actions like Reopen, Close are performed on Issues and MRs.
+    $(document).on('ajax:success', '.js-main-target-form', this.addNote);
+    $(document).on('ajax:success', '.js-discussion-note-form', this.addDiscussionNote);
+    $(document).on('ajax:success', '.js-main-target-form', this.resetMainTargetForm);
+    $(document).on('ajax:complete', '.js-main-target-form', this.reenableTargetFormSubmitButton);
+    // when a key is clicked on the notes
+    $(document).on('keydown', '.js-note-text', this.keydownNoteText);
+    // When the URL fragment/hash has changed, `#note_xxx`
+    return $(window).on('hashchange', this.onHashChange);
+  }
+
+  cleanBinding() {
+    $(document).off('click', '.js-note-edit');
+    $(document).off('click', '.note-edit-cancel');
+    $(document).off('click', '.js-note-delete');
+    $(document).off('click', '.js-note-attachment-delete');
+    $(document).off('click', '.js-discussion-reply-button');
+    $(document).off('click', '.js-add-diff-note-button');
+    $(document).off('visibilitychange');
+    $(document).off('keyup input', '.js-note-text');
+    $(document).off('click', '.js-note-target-reopen');
+    $(document).off('click', '.js-note-target-close');
+    $(document).off('click', '.js-note-discard');
+    $(document).off('keydown', '.js-note-text');
+    $(document).off('click', '.js-comment-resolve-button');
+    $(document).off('click', '.system-note-commit-list-toggler');
+    $(document).off('ajax:success', '.js-main-target-form');
+    $(document).off('ajax:success', '.js-discussion-note-form');
+    $(document).off('ajax:complete', '.js-main-target-form');
+    $(window).off('hashchange', this.onHashChange);
+  }
+
+  static initCommentTypeToggle(form) {
+    const dropdownTrigger = form.querySelector('.js-comment-type-dropdown .dropdown-toggle');
+    const dropdownList = form.querySelector('.js-comment-type-dropdown .dropdown-menu');
+    const noteTypeInput = form.querySelector('#note_type');
+    const submitButton = form.querySelector('.js-comment-type-dropdown .js-comment-submit-button');
+    const closeButton = form.querySelector('.js-note-target-close');
+    const reopenButton = form.querySelector('.js-note-target-reopen');
+
+    const commentTypeToggle = new CommentTypeToggle({
+      dropdownTrigger,
+      dropdownList,
+      noteTypeInput,
+      submitButton,
+      closeButton,
+      reopenButton,
+    });
+
+    commentTypeToggle.initDroplab();
+  }
+
+  keydownNoteText(e) {
+    var $textarea, discussionNoteForm, editNote, myLastNote, myLastNoteEditBtn, newText, originalText;
+    if (gl.utils.isMetaKey(e)) {
+      return;
     }
 
-    Notes.prototype.setViewType = function(view) {
-      this.view = Cookies.get('diff_view') || view;
-    };
-
-    Notes.prototype.addBinding = function() {
-      // Edit note link
-      $(document).on('click', '.js-note-edit', this.showEditForm.bind(this));
-      $(document).on('click', '.note-edit-cancel', this.cancelEdit);
-      // Reopen and close actions for Issue/MR combined with note form submit
-      $(document).on('click', '.js-comment-submit-button', this.postComment);
-      $(document).on('click', '.js-comment-save-button', this.updateComment);
-      $(document).on('keyup input', '.js-note-text', this.updateTargetButtons);
-      // resolve a discussion
-      $(document).on('click', '.js-comment-resolve-button', this.postComment);
-      // remove a note (in general)
-      $(document).on('click', '.js-note-delete', this.removeNote);
-      // delete note attachment
-      $(document).on('click', '.js-note-attachment-delete', this.removeAttachment);
-      // reset main target form when clicking discard
-      $(document).on('click', '.js-note-discard', this.resetMainTargetForm);
-      // update the file name when an attachment is selected
-      $(document).on('change', '.js-note-attachment-input', this.updateFormAttachment);
-      // reply to diff/discussion notes
-      $(document).on('click', '.js-discussion-reply-button', this.onReplyToDiscussionNote);
-      // add diff note
-      $(document).on('click', '.js-add-diff-note-button', this.onAddDiffNote);
-      // hide diff note form
-      $(document).on('click', '.js-close-discussion-note-form', this.cancelDiscussionForm);
-      // toggle commit list
-      $(document).on('click', '.system-note-commit-list-toggler', this.toggleCommitList);
-      // fetch notes when tab becomes visible
-      $(document).on('visibilitychange', this.visibilityChange);
-      // when issue status changes, we need to refresh data
-      $(document).on('issuable:change', this.refresh);
-      // ajax:events that happen on Form when actions like Reopen, Close are performed on Issues and MRs.
-      $(document).on('ajax:success', '.js-main-target-form', this.addNote);
-      $(document).on('ajax:success', '.js-discussion-note-form', this.addDiscussionNote);
-      $(document).on('ajax:success', '.js-main-target-form', this.resetMainTargetForm);
-      $(document).on('ajax:complete', '.js-main-target-form', this.reenableTargetFormSubmitButton);
-      // when a key is clicked on the notes
-      $(document).on('keydown', '.js-note-text', this.keydownNoteText);
-      // When the URL fragment/hash has changed, `#note_xxx`
-      return $(window).on('hashchange', this.onHashChange);
-    };
-
-    Notes.prototype.cleanBinding = function() {
-      $(document).off('click', '.js-note-edit');
-      $(document).off('click', '.note-edit-cancel');
-      $(document).off('click', '.js-note-delete');
-      $(document).off('click', '.js-note-attachment-delete');
-      $(document).off('click', '.js-discussion-reply-button');
-      $(document).off('click', '.js-add-diff-note-button');
-      $(document).off('visibilitychange');
-      $(document).off('keyup input', '.js-note-text');
-      $(document).off('click', '.js-note-target-reopen');
-      $(document).off('click', '.js-note-target-close');
-      $(document).off('click', '.js-note-discard');
-      $(document).off('keydown', '.js-note-text');
-      $(document).off('click', '.js-comment-resolve-button');
-      $(document).off('click', '.system-note-commit-list-toggler');
-      $(document).off('ajax:success', '.js-main-target-form');
-      $(document).off('ajax:success', '.js-discussion-note-form');
-      $(document).off('ajax:complete', '.js-main-target-form');
-      $(window).off('hashchange', this.onHashChange);
-    };
-
-    Notes.initCommentTypeToggle = function (form) {
-      const dropdownTrigger = form.querySelector('.js-comment-type-dropdown .dropdown-toggle');
-      const dropdownList = form.querySelector('.js-comment-type-dropdown .dropdown-menu');
-      const noteTypeInput = form.querySelector('#note_type');
-      const submitButton = form.querySelector('.js-comment-type-dropdown .js-comment-submit-button');
-      const closeButton = form.querySelector('.js-note-target-close');
-      const reopenButton = form.querySelector('.js-note-target-reopen');
-
-      const commentTypeToggle = new CommentTypeToggle({
-        dropdownTrigger,
-        dropdownList,
-        noteTypeInput,
-        submitButton,
-        closeButton,
-        reopenButton,
-      });
-
-      commentTypeToggle.initDroplab();
-    };
-
-    Notes.prototype.keydownNoteText = function(e) {
-      var $textarea, discussionNoteForm, editNote, myLastNote, myLastNoteEditBtn, newText, originalText;
-      if (gl.utils.isMetaKey(e)) {
-        return;
-      }
-
-      $textarea = $(e.target);
-      // Edit previous note when UP arrow is hit
-      switch (e.which) {
-        case 38:
+    $textarea = $(e.target);
+    // Edit previous note when UP arrow is hit
+    switch (e.which) {
+      case 38:
+        if ($textarea.val() !== '') {
+          return;
+        }
+        myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, .notes_holder, #notes'));
+        if (myLastNote.length) {
+          myLastNoteEditBtn = myLastNote.find('.js-note-edit');
+          return myLastNoteEditBtn.trigger('click', [true, myLastNote]);
+        }
+        break;
+      // Cancel creating diff note or editing any note when ESCAPE is hit
+      case 27:
+        discussionNoteForm = $textarea.closest('.js-discussion-note-form');
+        if (discussionNoteForm.length) {
           if ($textarea.val() !== '') {
-            return;
-          }
-          myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, .notes_holder, #notes'));
-          if (myLastNote.length) {
-            myLastNoteEditBtn = myLastNote.find('.js-note-edit');
-            return myLastNoteEditBtn.trigger('click', [true, myLastNote]);
-          }
-          break;
-        // Cancel creating diff note or editing any note when ESCAPE is hit
-        case 27:
-          discussionNoteForm = $textarea.closest('.js-discussion-note-form');
-          if (discussionNoteForm.length) {
-            if ($textarea.val() !== '') {
-              if (!confirm('Are you sure you want to cancel creating this comment?')) {
-                return;
-              }
+            if (!confirm('Are you sure you want to cancel creating this comment?')) {
+              return;
             }
-            this.removeDiscussionNoteForm(discussionNoteForm);
-            return;
           }
-          editNote = $textarea.closest('.note');
-          if (editNote.length) {
-            originalText = $textarea.closest('form').data('original-note');
-            newText = $textarea.val();
-            if (originalText !== newText) {
-              if (!confirm('Are you sure you want to cancel editing this comment?')) {
-                return;
-              }
+          this.removeDiscussionNoteForm(discussionNoteForm);
+          return;
+        }
+        editNote = $textarea.closest('.note');
+        if (editNote.length) {
+          originalText = $textarea.closest('form').data('original-note');
+          newText = $textarea.val();
+          if (originalText !== newText) {
+            if (!confirm('Are you sure you want to cancel editing this comment?')) {
+              return;
             }
-            return this.removeNoteEditForm(editNote);
           }
-      }
-    };
+          return this.removeNoteEditForm(editNote);
+        }
+    }
+  }
 
-    Notes.prototype.initRefresh = function() {
+  initRefresh() {
+    if (Notes.interval) {
       clearInterval(Notes.interval);
-      return Notes.interval = setInterval((function(_this) {
-        return function() {
-          return _this.refresh();
-        };
-      })(this), this.pollingInterval);
-    };
+    }
+    return Notes.interval = setInterval((function(_this) {
+      return function() {
+        return _this.refresh();
+      };
+    })(this), this.pollingInterval);
+  }
 
-    Notes.prototype.refresh = function() {
-      if (!document.hidden) {
-        return this.getContent();
-      }
-    };
+  refresh() {
+    if (!document.hidden) {
+      return this.getContent();
+    }
+  }
 
-    Notes.prototype.getContent = function() {
-      if (this.refreshing) {
-        return;
-      }
-      this.refreshing = true;
-      return $.ajax({
-        url: this.notes_url,
-        headers: { 'X-Last-Fetched-At': this.last_fetched_at },
-        dataType: 'json',
-        success: (function(_this) {
-          return function(data) {
-            var notes;
-            notes = data.notes;
-            _this.last_fetched_at = data.last_fetched_at;
-            _this.setPollingInterval(data.notes.length);
-            return $.each(notes, function(i, note) {
-              _this.renderNote(note);
-            });
-          };
-        })(this)
-      }).always((function(_this) {
-        return function() {
-          return _this.refreshing = false;
+  getContent() {
+    if (this.refreshing) {
+      return;
+    }
+    this.refreshing = true;
+    return $.ajax({
+      url: this.notes_url,
+      headers: { 'X-Last-Fetched-At': this.last_fetched_at },
+      dataType: 'json',
+      success: (function(_this) {
+        return function(data) {
+          var notes;
+          notes = data.notes;
+          _this.last_fetched_at = data.last_fetched_at;
+          _this.setPollingInterval(data.notes.length);
+          return $.each(notes, function(i, note) {
+            _this.renderNote(note);
+          });
         };
-      })(this));
-    };
-
-    /*
-    Increase @pollingInterval up to 120 seconds on every function call,
-    if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
-    will reset to @basePollingInterval.
-
-    Note: this function is used to gradually increase the polling interval
-    if there aren't new notes coming from the server
-     */
-
-    Notes.prototype.setPollingInterval = function(shouldReset) {
-      var nthInterval;
-      if (shouldReset == null) {
-        shouldReset = true;
-      }
-      nthInterval = this.basePollingInterval * Math.pow(2, this.maxPollingSteps - 1);
-      if (shouldReset) {
-        this.pollingInterval = this.basePollingInterval;
-      } else if (this.pollingInterval < nthInterval) {
-        this.pollingInterval *= 2;
+      })(this)
+    }).always((function(_this) {
+      return function() {
+        return _this.refreshing = false;
+      };
+    })(this));
+  }
+
+  /**
+   * Increase @pollingInterval up to 120 seconds on every function call,
+   * if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
+   * will reset to @basePollingInterval.
+   *
+   * Note: this function is used to gradually increase the polling interval
+   * if there aren't new notes coming from the server
+   */
+  setPollingInterval(shouldReset) {
+    var nthInterval;
+    if (shouldReset == null) {
+      shouldReset = true;
+    }
+    nthInterval = this.basePollingInterval * Math.pow(2, this.maxPollingSteps - 1);
+    if (shouldReset) {
+      this.pollingInterval = this.basePollingInterval;
+    } else if (this.pollingInterval < nthInterval) {
+      this.pollingInterval *= 2;
+    }
+    return this.initRefresh();
+  }
+
+  handleQuickActions(noteEntity) {
+    var votesBlock;
+    if (noteEntity.commands_changes) {
+      if ('merge' in noteEntity.commands_changes) {
+        Notes.checkMergeRequestStatus();
       }
-      return this.initRefresh();
-    };
-
-    Notes.prototype.handleQuickActions = function(noteEntity) {
-      var votesBlock;
-      if (noteEntity.commands_changes) {
-        if ('merge' in noteEntity.commands_changes) {
-          Notes.checkMergeRequestStatus();
-        }
 
-        if ('emoji_award' in noteEntity.commands_changes) {
-          votesBlock = $('.js-awards-block').eq(0);
-          gl.awardsHandler.addAwardToEmojiBar(votesBlock, noteEntity.commands_changes.emoji_award);
-          return gl.awardsHandler.scrollToAwards();
-        }
+      if ('emoji_award' in noteEntity.commands_changes) {
+        votesBlock = $('.js-awards-block').eq(0);
+        gl.awardsHandler.addAwardToEmojiBar(votesBlock, noteEntity.commands_changes.emoji_award);
+        return gl.awardsHandler.scrollToAwards();
       }
-    };
-
-    Notes.prototype.setupNewNote = function($note) {
-      // Update datetime format on the recent note
-      gl.utils.localTimeAgo($note.find('.js-timeago'), false);
-
-      this.collapseLongCommitList();
-      this.taskList.init();
-
-      // This stops the note highlight, #note_xxx`, from being removed after real time update
-      // The `:target` selector does not re-evaluate after we replace element in the DOM
-      Notes.updateNoteTargetSelector($note);
-      this.$noteToCleanHighlight = $note;
-    };
-
-    Notes.prototype.onHashChange = function() {
-      if (this.$noteToCleanHighlight) {
-        Notes.updateNoteTargetSelector(this.$noteToCleanHighlight);
-      }
-
-      this.$noteToCleanHighlight = null;
-    };
-
-    Notes.updateNoteTargetSelector = function($note) {
-      const hash = gl.utils.getLocationHash();
-      // Needs to be an explicit true/false for the jQuery `toggleClass(force)`
-      const addTargetClass = Boolean(hash && $note.filter(`#${hash}`).length > 0);
-      $note.toggleClass('target', addTargetClass);
-    };
-
-    /*
-    Render note in main comments area.
+    }
+  }
 
-    Note: for rendering inline notes use renderDiscussionNote
-     */
+  setupNewNote($note) {
+    // Update datetime format on the recent note
+    gl.utils.localTimeAgo($note.find('.js-timeago'), false);
 
-    Notes.prototype.renderNote = function(noteEntity, $form, $notesList = $('.main-notes-list')) {
-      if (noteEntity.discussion_html) {
-        return this.renderDiscussionNote(noteEntity, $form);
-      }
+    this.collapseLongCommitList();
+    this.taskList.init();
 
-      if (!noteEntity.valid) {
-        if (noteEntity.errors.commands_only) {
-          this.addFlash(noteEntity.errors.commands_only, 'notice', this.parentTimeline);
-          this.refresh();
-        }
-        return;
-      }
+    // This stops the note highlight, #note_xxx`, from being removed after real time update
+    // The `:target` selector does not re-evaluate after we replace element in the DOM
+    Notes.updateNoteTargetSelector($note);
+    this.$noteToCleanHighlight = $note;
+  }
 
-      const $note = $notesList.find(`#note_${noteEntity.id}`);
-      if (Notes.isNewNote(noteEntity, this.note_ids)) {
-        this.note_ids.push(noteEntity.id);
+  onHashChange() {
+    if (this.$noteToCleanHighlight) {
+      Notes.updateNoteTargetSelector(this.$noteToCleanHighlight);
+    }
 
-        if ($notesList.length) {
-          $notesList.find('.system-note.being-posted').remove();
-        }
-        const $newNote = Notes.animateAppendNote(noteEntity.html, $notesList);
+    this.$noteToCleanHighlight = null;
+  }
+
+  static updateNoteTargetSelector($note) {
+    const hash = gl.utils.getLocationHash();
+    // Needs to be an explicit true/false for the jQuery `toggleClass(force)`
+    const addTargetClass = Boolean(hash && $note.filter(`#${hash}`).length > 0);
+    $note.toggleClass('target', addTargetClass);
+  }
+
+  /**
+   * Render note in main comments area.
+   *
+   * Note: for rendering inline notes use renderDiscussionNote
+   */
+  renderNote(noteEntity, $form, $notesList = $('.main-notes-list')) {
+    if (noteEntity.discussion_html) {
+      return this.renderDiscussionNote(noteEntity, $form);
+    }
 
-        this.setupNewNote($newNote);
+    if (!noteEntity.valid) {
+      if (noteEntity.errors.commands_only) {
+        this.addFlash(noteEntity.errors.commands_only, 'notice', this.parentTimeline);
         this.refresh();
-        return this.updateNotesCount(1);
       }
-      // The server can send the same update multiple times so we need to make sure to only update once per actual update.
-      else if (Notes.isUpdatedNote(noteEntity, $note)) {
-        const isEditing = $note.hasClass('is-editing');
-        const initialContent = normalizeNewlines(
-          $note.find('.original-note-content').text().trim()
-        );
-        const $textarea = $note.find('.js-note-text');
-        const currentContent = $textarea.val();
-        // There can be CRLF vs LF mismatches if we don't sanitize and compare the same way
-        const sanitizedNoteNote = normalizeNewlines(noteEntity.note);
-        const isTextareaUntouched = currentContent === initialContent || currentContent === sanitizedNoteNote;
-
-        if (isEditing && isTextareaUntouched) {
-          $textarea.val(noteEntity.note);
-          this.updatedNotesTrackingMap[noteEntity.id] = noteEntity;
-        }
-        else if (isEditing && !isTextareaUntouched) {
-          this.putConflictEditWarningInPlace(noteEntity, $note);
-          this.updatedNotesTrackingMap[noteEntity.id] = noteEntity;
-        }
-        else {
-          const $updatedNote = Notes.animateUpdateNote(noteEntity.html, $note);
-          this.setupNewNote($updatedNote);
-        }
-      }
-    };
-
-    Notes.prototype.isParallelView = function() {
-      return Cookies.get('diff_view') === 'parallel';
-    };
-
-    /*
-    Render note in discussion area.
-
-    Note: for rendering inline notes use renderDiscussionNote
-     */
+      return;
+    }
 
-    Notes.prototype.renderDiscussionNote = function(noteEntity, $form) {
-      var discussionContainer, form, row, lineType, diffAvatarContainer;
-      if (!Notes.isNewNote(noteEntity, this.note_ids)) {
-        return;
-      }
+    const $note = $notesList.find(`#note_${noteEntity.id}`);
+    if (Notes.isNewNote(noteEntity, this.note_ids)) {
       this.note_ids.push(noteEntity.id);
-      form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`);
-      row = form.closest('tr');
-      lineType = this.isParallelView() ? form.find('#line_type').val() : 'old';
-      diffAvatarContainer = row.prevAll('.line_holder').first().find('.js-avatar-container.' + lineType + '_line');
-      // is this the first note of discussion?
-      discussionContainer = $(`.notes[data-discussion-id="${noteEntity.discussion_id}"]`);
-      if (!discussionContainer.length) {
-        discussionContainer = form.closest('.discussion').find('.notes');
-      }
-      if (discussionContainer.length === 0) {
-        if (noteEntity.diff_discussion_html) {
-          var $discussion = $(noteEntity.diff_discussion_html).renderGFM();
-
-          if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) {
-            // insert the note and the reply button after the temp row
-            row.after($discussion);
-          } else {
-            // Merge new discussion HTML in
-            var $notes = $discussion.find(`.notes[data-discussion-id="${noteEntity.discussion_id}"]`);
-            var contentContainerClass = '.' + $notes.closest('.notes_content')
-              .attr('class')
-              .split(' ')
-              .join('.');
-
-            row.find(contentContainerClass + ' .content').append($notes.closest('.content').children());
-          }
-        }
-        // Init discussion on 'Discussion' page if it is merge request page
-        const page = $('body').attr('data-page');
-        if ((page && page.indexOf('projects:merge_request') !== -1) || !noteEntity.diff_discussion_html) {
-          Notes.animateAppendNote(noteEntity.discussion_html, $('.main-notes-list'));
-        }
-      } else {
-        // append new note to all matching discussions
-        Notes.animateAppendNote(noteEntity.html, discussionContainer);
-      }
 
-      if (typeof gl.diffNotesCompileComponents !== 'undefined' && noteEntity.discussion_resolvable) {
-        gl.diffNotesCompileComponents();
-        this.renderDiscussionAvatar(diffAvatarContainer, noteEntity);
+      if ($notesList.length) {
+        $notesList.find('.system-note.being-posted').remove();
       }
+      const $newNote = Notes.animateAppendNote(noteEntity.html, $notesList);
 
-      gl.utils.localTimeAgo($('.js-timeago'), false);
-      Notes.checkMergeRequestStatus();
+      this.setupNewNote($newNote);
+      this.refresh();
       return this.updateNotesCount(1);
-    };
-
-    Notes.prototype.getLineHolder = function(changesDiscussionContainer) {
-      return $(changesDiscussionContainer).closest('.notes_holder')
-        .prevAll('.line_holder')
-        .first()
-        .get(0);
-    };
-
-    Notes.prototype.renderDiscussionAvatar = function(diffAvatarContainer, noteEntity) {
-      var commentButton = diffAvatarContainer.find('.js-add-diff-note-button');
-      var avatarHolder = diffAvatarContainer.find('.diff-comment-avatar-holders');
-
-      if (!avatarHolder.length) {
-        avatarHolder = document.createElement('diff-note-avatars');
-        avatarHolder.setAttribute('discussion-id', noteEntity.discussion_id);
-
-        diffAvatarContainer.append(avatarHolder);
+    }
+    // The server can send the same update multiple times so we need to make sure to only update once per actual update.
+    else if (Notes.isUpdatedNote(noteEntity, $note)) {
+      const isEditing = $note.hasClass('is-editing');
+      const initialContent = normalizeNewlines(
+        $note.find('.original-note-content').text().trim()
+      );
+      const $textarea = $note.find('.js-note-text');
+      const currentContent = $textarea.val();
+      // There can be CRLF vs LF mismatches if we don't sanitize and compare the same way
+      const sanitizedNoteNote = normalizeNewlines(noteEntity.note);
+      const isTextareaUntouched = currentContent === initialContent || currentContent === sanitizedNoteNote;
 
-        gl.diffNotesCompileComponents();
+      if (isEditing && isTextareaUntouched) {
+        $textarea.val(noteEntity.note);
+        this.updatedNotesTrackingMap[noteEntity.id] = noteEntity;
       }
-
-      if (commentButton.length) {
-        commentButton.remove();
+      else if (isEditing && !isTextareaUntouched) {
+        this.putConflictEditWarningInPlace(noteEntity, $note);
+        this.updatedNotesTrackingMap[noteEntity.id] = noteEntity;
       }
-    };
-
-    /*
-    Called in response the main target form has been successfully submitted.
-
-    Removes any errors.
-    Resets text and preview.
-    Resets buttons.
-     */
-
-    Notes.prototype.resetMainTargetForm = function(e) {
-      var form;
-      form = $('.js-main-target-form');
-      // remove validation errors
-      form.find('.js-errors').remove();
-      // reset text and preview
-      form.find('.js-md-write-button').click();
-      form.find('.js-note-text').val('').trigger('input');
-      form.find('.js-note-text').data('autosave').reset();
-
-      var event = document.createEvent('Event');
-      event.initEvent('autosize:update', true, false);
-      form.find('.js-autosize')[0].dispatchEvent(event);
-
-      this.updateTargetButtons(e);
-    };
-
-    Notes.prototype.reenableTargetFormSubmitButton = function() {
-      var form;
-      form = $('.js-main-target-form');
-      return form.find('.js-note-text').trigger('input');
-    };
-
-    /*
-    Shows the main form and does some setup on it.
-
-    Sets some hidden fields in the form.
-     */
-
-    Notes.prototype.setupMainTargetNoteForm = function() {
-      var form;
-      // find the form
-      form = $('.js-new-note-form');
-      // Set a global clone of the form for later cloning
-      this.formClone = form.clone();
-      // show the form
-      this.setupNoteForm(form);
-      // fix classes
-      form.removeClass('js-new-note-form');
-      form.addClass('js-main-target-form');
-      form.find('#note_line_code').remove();
-      form.find('#note_position').remove();
-      form.find('#note_type').val('');
-      form.find('#in_reply_to_discussion_id').remove();
-      form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove();
-      this.parentTimeline = form.parents('.timeline');
-
-      if (form.length) {
-        Notes.initCommentTypeToggle(form.get(0));
-      }
-    };
-
-    /*
-    General note form setup.
-
-    deactivates the submit button when text is empty
-    hides the preview button when text is empty
-    setup GFM auto complete
-    show the form
-     */
-
-    Notes.prototype.setupNoteForm = function(form) {
-      var textarea, key;
-      new gl.GLForm(form, this.enableGFM);
-      textarea = form.find('.js-note-text');
-      key = [
-        'Note',
-        form.find('#note_noteable_type').val(),
-        form.find('#note_noteable_id').val(),
-        form.find('#note_commit_id').val(),
-        form.find('#note_type').val(),
-        form.find('#in_reply_to_discussion_id').val(),
-
-        // LegacyDiffNote
-        form.find('#note_line_code').val(),
-
-        // DiffNote
-        form.find('#note_position').val()
-      ];
-      return new Autosave(textarea, key);
-    };
-
-    /*
-    Called in response to the new note form being submitted
-
-    Adds new note to list.
-     */
-
-    Notes.prototype.addNote = function($form, note) {
-      return this.renderNote(note);
-    };
-
-    Notes.prototype.addNoteError = function($form) {
-      let formParentTimeline;
-      if ($form.hasClass('js-main-target-form')) {
-        formParentTimeline = $form.parents('.timeline');
-      } else if ($form.hasClass('js-discussion-note-form')) {
-        formParentTimeline = $form.closest('.discussion-notes').find('.notes');
+      else {
+        const $updatedNote = Notes.animateUpdateNote(noteEntity.html, $note);
+        this.setupNewNote($updatedNote);
       }
-      return this.addFlash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', formParentTimeline);
-    };
-
-    Notes.prototype.updateNoteError = $parentTimeline => new Flash('Your comment could not be updated! Please check your network connection and try again.');
-
-    /*
-    Called in response to the new note form being submitted
-
-    Adds new note to list.
-     */
-
-    Notes.prototype.addDiscussionNote = function($form, note, isNewDiffComment) {
-      if ($form.attr('data-resolve-all') != null) {
-        var projectPath = $form.data('project-path');
-        var discussionId = $form.data('discussion-id');
-        var mergeRequestId = $form.data('noteable-iid');
+    }
+  }
+
+  isParallelView() {
+    return Cookies.get('diff_view') === 'parallel';
+  }
+
+  /**
+   * Render note in discussion area.
+   *
+   * Note: for rendering inline notes use renderDiscussionNote
+   */
+  renderDiscussionNote(noteEntity, $form) {
+    var discussionContainer, form, row, lineType, diffAvatarContainer;
+    if (!Notes.isNewNote(noteEntity, this.note_ids)) {
+      return;
+    }
+    this.note_ids.push(noteEntity.id);
+    form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`);
+    row = form.closest('tr');
+    lineType = this.isParallelView() ? form.find('#line_type').val() : 'old';
+    diffAvatarContainer = row.prevAll('.line_holder').first().find('.js-avatar-container.' + lineType + '_line');
+    // is this the first note of discussion?
+    discussionContainer = $(`.notes[data-discussion-id="${noteEntity.discussion_id}"]`);
+    if (!discussionContainer.length) {
+      discussionContainer = form.closest('.discussion').find('.notes');
+    }
+    if (discussionContainer.length === 0) {
+      if (noteEntity.diff_discussion_html) {
+        var $discussion = $(noteEntity.diff_discussion_html).renderGFM();
 
-        if (ResolveService != null) {
-          ResolveService.toggleResolveForDiscussion(mergeRequestId, discussionId);
+        if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) {
+          // insert the note and the reply button after the temp row
+          row.after($discussion);
+        } else {
+          // Merge new discussion HTML in
+          var $notes = $discussion.find(`.notes[data-discussion-id="${noteEntity.discussion_id}"]`);
+          var contentContainerClass = '.' + $notes.closest('.notes_content')
+            .attr('class')
+            .split(' ')
+            .join('.');
+
+          row.find(contentContainerClass + ' .content').append($notes.closest('.content').children());
         }
       }
-
-      this.renderNote(note, $form);
-      // cleanup after successfully creating a diff/discussion note
-      if (isNewDiffComment) {
-        this.removeDiscussionNoteForm($form);
+      // Init discussion on 'Discussion' page if it is merge request page
+      const page = $('body').attr('data-page');
+      if ((page && page.indexOf('projects:merge_request') !== -1) || !noteEntity.diff_discussion_html) {
+        Notes.animateAppendNote(noteEntity.discussion_html, $('.main-notes-list'));
       }
-    };
+    } else {
+      // append new note to all matching discussions
+      Notes.animateAppendNote(noteEntity.html, discussionContainer);
+    }
 
-    /*
-    Called in response to the edit note form being submitted
+    if (typeof gl.diffNotesCompileComponents !== 'undefined' && noteEntity.discussion_resolvable) {
+      gl.diffNotesCompileComponents();
+      this.renderDiscussionAvatar(diffAvatarContainer, noteEntity);
+    }
 
-    Updates the current note field.
-     */
+    gl.utils.localTimeAgo($('.js-timeago'), false);
+    Notes.checkMergeRequestStatus();
+    return this.updateNotesCount(1);
+  }
 
-    Notes.prototype.updateNote = function(noteEntity, $targetNote) {
-      var $noteEntityEl, $note_li;
-      // Convert returned HTML to a jQuery object so we can modify it further
-      $noteEntityEl = $(noteEntity.html);
-      $noteEntityEl.addClass('fade-in-full');
-      this.revertNoteEditForm($targetNote);
-      $noteEntityEl.renderGFM();
-      // Find the note's `li` element by ID and replace it with the updated HTML
-      $note_li = $('.note-row-' + noteEntity.id);
+  getLineHolder(changesDiscussionContainer) {
+    return $(changesDiscussionContainer).closest('.notes_holder')
+      .prevAll('.line_holder')
+      .first()
+      .get(0);
+  }
 
-      $note_li.replaceWith($noteEntityEl);
-      this.setupNewNote($noteEntityEl);
+  renderDiscussionAvatar(diffAvatarContainer, noteEntity) {
+    var commentButton = diffAvatarContainer.find('.js-add-diff-note-button');
+    var avatarHolder = diffAvatarContainer.find('.diff-comment-avatar-holders');
 
-      if (typeof gl.diffNotesCompileComponents !== 'undefined') {
-        gl.diffNotesCompileComponents();
-      }
-    };
+    if (!avatarHolder.length) {
+      avatarHolder = document.createElement('diff-note-avatars');
+      avatarHolder.setAttribute('discussion-id', noteEntity.discussion_id);
 
-    Notes.prototype.checkContentToAllowEditing = function($el) {
-      var initialContent = $el.find('.original-note-content').text().trim();
-      var currentContent = $el.find('.js-note-text').val();
-      var isAllowed = true;
+      diffAvatarContainer.append(avatarHolder);
 
-      if (currentContent === initialContent) {
-        this.removeNoteEditForm($el);
-      }
-      else {
-        var $buttons = $el.find('.note-form-actions');
-        var isWidgetVisible = gl.utils.isInViewport($el.get(0));
-
-        if (!isWidgetVisible) {
-          gl.utils.scrollToElement($el);
-        }
+      gl.diffNotesCompileComponents();
+    }
 
-        $el.find('.js-finish-edit-warning').show();
-        isAllowed = false;
-      }
+    if (commentButton.length) {
+      commentButton.remove();
+    }
+  }
+
+  /**
+   * Called in response the main target form has been successfully submitted.
+   *
+   * Removes any errors.
+   * Resets text and preview.
+   * Resets buttons.
+   */
+  resetMainTargetForm(e) {
+    var form;
+    form = $('.js-main-target-form');
+    // remove validation errors
+    form.find('.js-errors').remove();
+    // reset text and preview
+    form.find('.js-md-write-button').click();
+    form.find('.js-note-text').val('').trigger('input');
+    form.find('.js-note-text').data('autosave').reset();
+
+    var event = document.createEvent('Event');
+    event.initEvent('autosize:update', true, false);
+    form.find('.js-autosize')[0].dispatchEvent(event);
+
+    this.updateTargetButtons(e);
+  }
+
+  reenableTargetFormSubmitButton() {
+    var form;
+    form = $('.js-main-target-form');
+    return form.find('.js-note-text').trigger('input');
+  }
+
+  /**
+   * Shows the main form and does some setup on it.
+   *
+   * Sets some hidden fields in the form.
+   */
+  setupMainTargetNoteForm() {
+    var form;
+    // find the form
+    form = $('.js-new-note-form');
+    // Set a global clone of the form for later cloning
+    this.formClone = form.clone();
+    // show the form
+    this.setupNoteForm(form);
+    // fix classes
+    form.removeClass('js-new-note-form');
+    form.addClass('js-main-target-form');
+    form.find('#note_line_code').remove();
+    form.find('#note_position').remove();
+    form.find('#note_type').val('');
+    form.find('#in_reply_to_discussion_id').remove();
+    form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove();
+    this.parentTimeline = form.parents('.timeline');
+
+    if (form.length) {
+      Notes.initCommentTypeToggle(form.get(0));
+    }
+  }
+
+  /**
+   * General note form setup.
+   *
+   * deactivates the submit button when text is empty
+   * hides the preview button when text is empty
+   * setup GFM auto complete
+   * show the form
+   */
+  setupNoteForm(form) {
+    var textarea, key;
+    new gl.GLForm(form, this.enableGFM);
+    textarea = form.find('.js-note-text');
+    key = [
+      'Note',
+      form.find('#note_noteable_type').val(),
+      form.find('#note_noteable_id').val(),
+      form.find('#note_commit_id').val(),
+      form.find('#note_type').val(),
+      form.find('#in_reply_to_discussion_id').val(),
 
-      return isAllowed;
-    };
+      // LegacyDiffNote
+      form.find('#note_line_code').val(),
 
-    /*
-    Called in response to clicking the edit note link
+      // DiffNote
+      form.find('#note_position').val()
+    ];
+    return new Autosave(textarea, key);
+  }
+
+  /**
+   * Called in response to the new note form being submitted
+   *
+   * Adds new note to list.
+   */
+  addNote($form, note) {
+    return this.renderNote(note);
+  }
+
+  addNoteError($form) {
+    let formParentTimeline;
+    if ($form.hasClass('js-main-target-form')) {
+      formParentTimeline = $form.parents('.timeline');
+    } else if ($form.hasClass('js-discussion-note-form')) {
+      formParentTimeline = $form.closest('.discussion-notes').find('.notes');
+    }
+    return this.addFlash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', formParentTimeline);
+  }
+
+  updateNoteError($parentTimeline) {
+    new Flash('Your comment could not be updated! Please check your network connection and try again.');
+  }
+
+  /**
+   * Called in response to the new note form being submitted
+   *
+   * Adds new note to list.
+   */
+  addDiscussionNote($form, note, isNewDiffComment) {
+    if ($form.attr('data-resolve-all') != null) {
+      var projectPath = $form.data('project-path');
+      var discussionId = $form.data('discussion-id');
+      var mergeRequestId = $form.data('noteable-iid');
+
+      if (ResolveService != null) {
+        ResolveService.toggleResolveForDiscussion(mergeRequestId, discussionId);
+      }
+    }
 
-    Replaces the note text with the note edit form
-    Adds a data attribute to the form with the original content of the note for cancellations
-    */
-    Notes.prototype.showEditForm = function(e, scrollTo, myLastNote) {
-      e.preventDefault();
+    this.renderNote(note, $form);
+    // cleanup after successfully creating a diff/discussion note
+    if (isNewDiffComment) {
+      this.removeDiscussionNoteForm($form);
+    }
+  }
+
+  /**
+   * Called in response to the edit note form being submitted
+   *
+   * Updates the current note field.
+   */
+  updateNote(noteEntity, $targetNote) {
+    var $noteEntityEl, $note_li;
+    // Convert returned HTML to a jQuery object so we can modify it further
+    $noteEntityEl = $(noteEntity.html);
+    $noteEntityEl.addClass('fade-in-full');
+    this.revertNoteEditForm($targetNote);
+    $noteEntityEl.renderGFM();
+    // Find the note's `li` element by ID and replace it with the updated HTML
+    $note_li = $('.note-row-' + noteEntity.id);
+
+    $note_li.replaceWith($noteEntityEl);
+    this.setupNewNote($noteEntityEl);
+
+    if (typeof gl.diffNotesCompileComponents !== 'undefined') {
+      gl.diffNotesCompileComponents();
+    }
+  }
 
-      var $target = $(e.target);
-      var $editForm = $(this.getEditFormSelector($target));
-      var $note = $target.closest('.note');
-      var $currentlyEditing = $('.note.is-editing:visible');
+  checkContentToAllowEditing($el) {
+    var initialContent = $el.find('.original-note-content').text().trim();
+    var currentContent = $el.find('.js-note-text').val();
+    var isAllowed = true;
 
-      if ($currentlyEditing.length) {
-        var isEditAllowed = this.checkContentToAllowEditing($currentlyEditing);
+    if (currentContent === initialContent) {
+      this.removeNoteEditForm($el);
+    }
+    else {
+      var $buttons = $el.find('.note-form-actions');
+      var isWidgetVisible = gl.utils.isInViewport($el.get(0));
 
-        if (!isEditAllowed) {
-          return;
-        }
+      if (!isWidgetVisible) {
+        gl.utils.scrollToElement($el);
       }
 
-      $note.find('.js-note-attachment-delete').show();
-      $editForm.addClass('current-note-edit-form');
-      $note.addClass('is-editing');
-      this.putEditFormInPlace($target);
-    };
+      $el.find('.js-finish-edit-warning').show();
+      isAllowed = false;
+    }
 
-    /*
-    Called in response to clicking the edit note link
+    return isAllowed;
+  }
 
-    Hides edit form and restores the original note text to the editor textarea.
-     */
+  /**
+   * Called in response to clicking the edit note link
+   *
+   * Replaces the note text with the note edit form
+   * Adds a data attribute to the form with the original content of the note for cancellations
+   */
+  showEditForm(e, scrollTo, myLastNote) {
+    e.preventDefault();
 
-    Notes.prototype.cancelEdit = function(e) {
-      e.preventDefault();
-      const $target = $(e.target);
-      const $note = $target.closest('.note');
-      const noteId = $note.attr('data-note-id');
+    var $target = $(e.target);
+    var $editForm = $(this.getEditFormSelector($target));
+    var $note = $target.closest('.note');
+    var $currentlyEditing = $('.note.is-editing:visible');
 
-      this.revertNoteEditForm($target);
+    if ($currentlyEditing.length) {
+      var isEditAllowed = this.checkContentToAllowEditing($currentlyEditing);
 
-      if (this.updatedNotesTrackingMap[noteId]) {
-        const $newNote = $(this.updatedNotesTrackingMap[noteId].html);
-        $note.replaceWith($newNote);
-        this.setupNewNote($newNote);
-        // Now that we have taken care of the update, clear it out
-        delete this.updatedNotesTrackingMap[noteId];
-      }
-      else {
-        $note.find('.js-finish-edit-warning').hide();
-        this.removeNoteEditForm($note);
+      if (!isEditAllowed) {
+        return;
       }
-    };
-
-    Notes.prototype.revertNoteEditForm = function($target) {
-      $target = $target || $('.note.is-editing:visible');
-      var selector = this.getEditFormSelector($target);
-      var $editForm = $(selector);
+    }
 
-      $editForm.insertBefore('.notes-form');
-      $editForm.find('.js-comment-save-button').enable();
-      $editForm.find('.js-finish-edit-warning').hide();
-    };
+    $note.find('.js-note-attachment-delete').show();
+    $editForm.addClass('current-note-edit-form');
+    $note.addClass('is-editing');
+    this.putEditFormInPlace($target);
+  }
+
+  /**
+   * Called in response to clicking the edit note link
+   *
+   * Hides edit form and restores the original note text to the editor textarea.
+   */
+  cancelEdit(e) {
+    e.preventDefault();
+    const $target = $(e.target);
+    const $note = $target.closest('.note');
+    const noteId = $note.attr('data-note-id');
+
+    this.revertNoteEditForm($target);
+
+    if (this.updatedNotesTrackingMap[noteId]) {
+      const $newNote = $(this.updatedNotesTrackingMap[noteId].html);
+      $note.replaceWith($newNote);
+      this.setupNewNote($newNote);
+      // Now that we have taken care of the update, clear it out
+      delete this.updatedNotesTrackingMap[noteId];
+    }
+    else {
+      $note.find('.js-finish-edit-warning').hide();
+      this.removeNoteEditForm($note);
+    }
+  }
 
-    Notes.prototype.getEditFormSelector = function($el) {
-      var selector = '.note-edit-form:not(.mr-note-edit-form)';
+  revertNoteEditForm($target) {
+    $target = $target || $('.note.is-editing:visible');
+    var selector = this.getEditFormSelector($target);
+    var $editForm = $(selector);
 
-      if ($el.parents('#diffs').length) {
-        selector = '.note-edit-form.mr-note-edit-form';
-      }
+    $editForm.insertBefore('.notes-form');
+    $editForm.find('.js-comment-save-button').enable();
+    $editForm.find('.js-finish-edit-warning').hide();
+  }
 
-      return selector;
-    };
+  getEditFormSelector($el) {
+    var selector = '.note-edit-form:not(.mr-note-edit-form)';
 
-    Notes.prototype.removeNoteEditForm = function($note) {
-      var form = $note.find('.current-note-edit-form');
-      $note.removeClass('is-editing');
-      form.removeClass('current-note-edit-form');
-      form.find('.js-finish-edit-warning').hide();
-      // Replace markdown textarea text with original note text.
-      return form.find('.js-note-text').val(form.find('form.edit-note').data('original-note'));
-    };
+    if ($el.parents('#diffs').length) {
+      selector = '.note-edit-form.mr-note-edit-form';
+    }
 
-    /*
-    Called in response to deleting a note of any kind.
-
-    Removes the actual note from view.
-    Removes the whole discussion if the last note is being removed.
-     */
-
-    Notes.prototype.removeNote = function(e) {
-      var noteElId, noteId, dataNoteId, $note, lineHolder;
-      $note = $(e.currentTarget).closest('.note');
-      noteElId = $note.attr('id');
-      noteId = $note.attr('data-note-id');
-      lineHolder = $(e.currentTarget).closest('.notes[data-discussion-id]')
-        .closest('.notes_holder')
-        .prev('.line_holder');
-      $(`.note[id="${noteElId}"]`).each((function(_this) {
-        // A same note appears in the "Discussion" and in the "Changes" tab, we have
-        // to remove all. Using $('.note[id='noteId']') ensure we get all the notes,
-        // where $('#noteId') would return only one.
-        return function(i, el) {
-          var $note, $notes;
-          $note = $(el);
-          $notes = $note.closest('.discussion-notes');
-
-          if (typeof gl.diffNotesCompileComponents !== 'undefined') {
-            if (gl.diffNoteApps[noteElId]) {
-              gl.diffNoteApps[noteElId].$destroy();
-            }
+    return selector;
+  }
+
+  removeNoteEditForm($note) {
+    var form = $note.find('.current-note-edit-form');
+    $note.removeClass('is-editing');
+    form.removeClass('current-note-edit-form');
+    form.find('.js-finish-edit-warning').hide();
+    // Replace markdown textarea text with original note text.
+    return form.find('.js-note-text').val(form.find('form.edit-note').data('original-note'));
+  }
+
+  /**
+   * Called in response to deleting a note of any kind.
+   *
+   * Removes the actual note from view.
+   * Removes the whole discussion if the last note is being removed.
+   */
+  removeNote(e) {
+    var noteElId, noteId, dataNoteId, $note, lineHolder;
+    $note = $(e.currentTarget).closest('.note');
+    noteElId = $note.attr('id');
+    noteId = $note.attr('data-note-id');
+    lineHolder = $(e.currentTarget).closest('.notes[data-discussion-id]')
+      .closest('.notes_holder')
+      .prev('.line_holder');
+    $(`.note[id="${noteElId}"]`).each((function(_this) {
+      // A same note appears in the "Discussion" and in the "Changes" tab, we have
+      // to remove all. Using $('.note[id='noteId']') ensure we get all the notes,
+      // where $('#noteId') would return only one.
+      return function(i, el) {
+        var $note, $notes;
+        $note = $(el);
+        $notes = $note.closest('.discussion-notes');
+
+        if (typeof gl.diffNotesCompileComponents !== 'undefined') {
+          if (gl.diffNoteApps[noteElId]) {
+            gl.diffNoteApps[noteElId].$destroy();
           }
+        }
 
-          $note.remove();
+        $note.remove();
 
-          // check if this is the last note for this line
-          if ($notes.find('.note').length === 0) {
-            var notesTr = $notes.closest('tr');
+        // check if this is the last note for this line
+        if ($notes.find('.note').length === 0) {
+          var notesTr = $notes.closest('tr');
 
-            // "Discussions" tab
-            $notes.closest('.timeline-entry').remove();
+          // "Discussions" tab
+          $notes.closest('.timeline-entry').remove();
 
-            // The notes tr can contain multiple lists of notes, like on the parallel diff
-            if (notesTr.find('.discussion-notes').length > 1) {
-              $notes.remove();
-            } else {
-              notesTr.remove();
-            }
+          // The notes tr can contain multiple lists of notes, like on the parallel diff
+          if (notesTr.find('.discussion-notes').length > 1) {
+            $notes.remove();
+          } else {
+            notesTr.remove();
           }
-        };
-      })(this));
-
-      Notes.checkMergeRequestStatus();
-      return this.updateNotesCount(-1);
-    };
-
-    /*
-    Called in response to clicking the delete attachment link
-
-    Removes the attachment wrapper view, including image tag if it exists
-    Resets the note editing form
-     */
+        }
+      };
+    })(this));
+
+    Notes.checkMergeRequestStatus();
+    return this.updateNotesCount(-1);
+  }
+
+  /**
+   * Called in response to clicking the delete attachment link
+   *
+   * Removes the attachment wrapper view, including image tag if it exists
+   * Resets the note editing form
+   */
+  removeAttachment() {
+    const $note = $(this).closest('.note');
+    $note.find('.note-attachment').remove();
+    $note.find('.note-body > .note-text').show();
+    $note.find('.note-header').show();
+    return $note.find('.current-note-edit-form').remove();
+  }
+
+  /**
+   * Called when clicking on the "reply" button for a diff line.
+   *
+   * Shows the note form below the notes.
+   */
+  onReplyToDiscussionNote(e) {
+    this.replyToDiscussionNote(e.target);
+  }
+
+  replyToDiscussionNote(target) {
+    var form, replyLink;
+    form = this.cleanForm(this.formClone.clone());
+    replyLink = $(target).closest('.js-discussion-reply-button');
+    // insert the form after the button
+    replyLink
+      .closest('.discussion-reply-holder')
+      .hide()
+      .after(form);
+    // show the form
+    return this.setupDiscussionNoteForm(replyLink, form);
+  }
+
+  /**
+   * Shows the diff or discussion form and does some setup on it.
+   *
+   * Sets some hidden fields in the form.
+   *
+   * Note: dataHolder must have the "discussionId" and "lineCode" data attributes set.
+   */
+  setupDiscussionNoteForm(dataHolder, form) {
+    // setup note target
+    var discussionID = dataHolder.data('discussionId');
+
+    if (discussionID) {
+      form.attr('data-discussion-id', discussionID);
+      form.find('#in_reply_to_discussion_id').val(discussionID);
+    }
 
-    Notes.prototype.removeAttachment = function() {
-      const $note = $(this).closest('.note');
-      $note.find('.note-attachment').remove();
-      $note.find('.note-body > .note-text').show();
-      $note.find('.note-header').show();
-      return $note.find('.current-note-edit-form').remove();
-    };
+    form.attr('data-line-code', dataHolder.data('lineCode'));
+    form.find('#line_type').val(dataHolder.data('lineType'));
 
-    /*
-    Called when clicking on the "reply" button for a diff line.
+    form.find('#note_noteable_type').val(dataHolder.data('noteableType'));
+    form.find('#note_noteable_id').val(dataHolder.data('noteableId'));
+    form.find('#note_commit_id').val(dataHolder.data('commitId'));
+    form.find('#note_type').val(dataHolder.data('noteType'));
 
-    Shows the note form below the notes.
-     */
+    // LegacyDiffNote
+    form.find('#note_line_code').val(dataHolder.data('lineCode'));
 
-    Notes.prototype.onReplyToDiscussionNote = function(e) {
-      this.replyToDiscussionNote(e.target);
-    };
+    // DiffNote
+    form.find('#note_position').val(dataHolder.attr('data-position'));
 
-    Notes.prototype.replyToDiscussionNote = function(target) {
-      var form, replyLink;
-      form = this.cleanForm(this.formClone.clone());
-      replyLink = $(target).closest('.js-discussion-reply-button');
-      // insert the form after the button
-      replyLink
-        .closest('.discussion-reply-holder')
-        .hide()
-        .after(form);
-      // show the form
-      return this.setupDiscussionNoteForm(replyLink, form);
-    };
+    form.find('.js-note-discard').show().removeClass('js-note-discard').addClass('js-close-discussion-note-form').text(form.find('.js-close-discussion-note-form').data('cancel-text'));
+    form.find('.js-note-target-close').remove();
+    form.find('.js-note-new-discussion').remove();
+    this.setupNoteForm(form);
 
-    /*
-    Shows the diff or discussion form and does some setup on it.
+    form
+      .removeClass('js-main-target-form')
+      .addClass('discussion-form js-discussion-note-form');
 
-    Sets some hidden fields in the form.
+    if (typeof gl.diffNotesCompileComponents !== 'undefined') {
+      var $commentBtn = form.find('comment-and-resolve-btn');
+      $commentBtn.attr(':discussion-id', `'${discussionID}'`);
 
-    Note: dataHolder must have the "discussionId" and "lineCode" data attributes set.
-     */
+      gl.diffNotesCompileComponents();
+    }
 
-    Notes.prototype.setupDiscussionNoteForm = function(dataHolder, form) {
-      // setup note target
-      var discussionID = dataHolder.data('discussionId');
+    form.find('.js-note-text').focus();
+    form
+      .find('.js-comment-resolve-button')
+      .attr('data-discussion-id', discussionID);
+  }
+
+  /**
+   * Called when clicking on the "add a comment" button on the side of a diff line.
+   *
+   * Inserts a temporary row for the form below the line.
+   * Sets up the form and shows it.
+   */
+  onAddDiffNote(e) {
+    e.preventDefault();
+    const link = e.currentTarget || e.target;
+    const $link = $(link);
+    const showReplyInput = !$link.hasClass('js-diff-comment-avatar');
+    this.toggleDiffNote({
+      target: $link,
+      lineType: link.dataset.lineType,
+      showReplyInput
+    });
+  }
+
+  toggleDiffNote({
+    target,
+    lineType,
+    forceShow,
+    showReplyInput = false,
+  }) {
+    var $link, addForm, hasNotes, newForm, noteForm, replyButton, row, rowCssToAdd, targetContent, isDiffCommentAvatar;
+    $link = $(target);
+    row = $link.closest('tr');
+    const nextRow = row.next();
+    let targetRow = row;
+    if (nextRow.is('.notes_holder')) {
+      targetRow = nextRow;
+    }
 
-      if (discussionID) {
-        form.attr('data-discussion-id', discussionID);
-        form.find('#in_reply_to_discussion_id').val(discussionID);
+    hasNotes = nextRow.is('.notes_holder');
+    addForm = false;
+    let lineTypeSelector = '';
+    rowCssToAdd = '<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"><div class="content"></div></td></tr>';
+    // In parallel view, look inside the correct left/right pane
+    if (this.isParallelView()) {
+      lineTypeSelector = `.${lineType}`;
+      rowCssToAdd = '<tr class="notes_holder js-temp-notes-holder"><td class="notes_line old"></td><td class="notes_content parallel old"><div class="content"></div></td><td class="notes_line new"></td><td class="notes_content parallel new"><div class="content"></div></td></tr>';
+    }
+    const notesContentSelector = `.notes_content${lineTypeSelector} .content`;
+    let notesContent = targetRow.find(notesContentSelector);
+
+    if (hasNotes && showReplyInput) {
+      targetRow.show();
+      notesContent = targetRow.find(notesContentSelector);
+      if (notesContent.length) {
+        notesContent.show();
+        replyButton = notesContent.find('.js-discussion-reply-button:visible');
+        if (replyButton.length) {
+          this.replyToDiscussionNote(replyButton[0]);
+        } else {
+          // In parallel view, the form may not be present in one of the panes
+          noteForm = notesContent.find('.js-discussion-note-form');
+          if (noteForm.length === 0) {
+            addForm = true;
+          }
+        }
       }
+    } else if (showReplyInput) {
+      // add a notes row and insert the form
+      row.after(rowCssToAdd);
+      targetRow = row.next();
+      notesContent = targetRow.find(notesContentSelector);
+      addForm = true;
+    } else {
+      const isCurrentlyShown = targetRow.find('.content:not(:empty)').is(':visible');
+      const isForced = forceShow === true || forceShow === false;
+      const showNow = forceShow === true || (!isCurrentlyShown && !isForced);
+
+      targetRow.toggle(showNow);
+      notesContent.toggle(showNow);
+    }
 
-      form.attr('data-line-code', dataHolder.data('lineCode'));
-      form.find('#line_type').val(dataHolder.data('lineType'));
-
-      form.find('#note_noteable_type').val(dataHolder.data('noteableType'));
-      form.find('#note_noteable_id').val(dataHolder.data('noteableId'));
-      form.find('#note_commit_id').val(dataHolder.data('commitId'));
-      form.find('#note_type').val(dataHolder.data('noteType'));
-
-      // LegacyDiffNote
-      form.find('#note_line_code').val(dataHolder.data('lineCode'));
-
-      // DiffNote
-      form.find('#note_position').val(dataHolder.attr('data-position'));
-
-      form.find('.js-note-discard').show().removeClass('js-note-discard').addClass('js-close-discussion-note-form').text(form.find('.js-close-discussion-note-form').data('cancel-text'));
-      form.find('.js-note-target-close').remove();
-      form.find('.js-note-new-discussion').remove();
-      this.setupNoteForm(form);
-
-      form
-        .removeClass('js-main-target-form')
-        .addClass('discussion-form js-discussion-note-form');
-
-      if (typeof gl.diffNotesCompileComponents !== 'undefined') {
-        var $commentBtn = form.find('comment-and-resolve-btn');
-        $commentBtn.attr(':discussion-id', `'${discussionID}'`);
-
-        gl.diffNotesCompileComponents();
+    if (addForm) {
+      newForm = this.cleanForm(this.formClone.clone());
+      newForm.appendTo(notesContent);
+      // show the form
+      return this.setupDiscussionNoteForm($link, newForm);
+    }
+  }
+
+  /**
+   * Called in response to "cancel" on a diff note form.
+   *
+   * Shows the reply button again.
+   * Removes the form and if necessary it's temporary row.
+   */
+  removeDiscussionNoteForm(form) {
+    var glForm, row;
+    row = form.closest('tr');
+    glForm = form.data('gl-form');
+    glForm.destroy();
+    form.find('.js-note-text').data('autosave').reset();
+    // show the reply button (will only work for replies)
+    form
+      .prev('.discussion-reply-holder')
+      .show();
+    if (row.is('.js-temp-notes-holder')) {
+      // remove temporary row for diff lines
+      return row.remove();
+    } else {
+      // only remove the form
+      return form.remove();
+    }
+  }
+
+  cancelDiscussionForm(e) {
+    var form;
+    e.preventDefault();
+    form = $(e.target).closest('.js-discussion-note-form');
+    return this.removeDiscussionNoteForm(form);
+  }
+
+  /**
+   * Called after an attachment file has been selected.
+   *
+   * Updates the file name for the selected attachment.
+   */
+  updateFormAttachment() {
+    var filename, form;
+    form = $(this).closest('form');
+    // get only the basename
+    filename = $(this).val().replace(/^.*[\\\/]/, '');
+    return form.find('.js-attachment-filename').text(filename);
+  }
+
+  /**
+   * Called when the tab visibility changes
+   */
+  visibilityChange() {
+    return this.refresh();
+  }
+
+  updateTargetButtons(e) {
+    var closebtn, closetext, discardbtn, form, reopenbtn, reopentext, textarea;
+    textarea = $(e.target);
+    form = textarea.parents('form');
+    reopenbtn = form.find('.js-note-target-reopen');
+    closebtn = form.find('.js-note-target-close');
+    discardbtn = form.find('.js-note-discard');
+
+    if (textarea.val().trim().length > 0) {
+      reopentext = reopenbtn.attr('data-alternative-text');
+      closetext = closebtn.attr('data-alternative-text');
+      if (reopenbtn.text() !== reopentext) {
+        reopenbtn.text(reopentext);
       }
-
-      form.find('.js-note-text').focus();
-      form
-        .find('.js-comment-resolve-button')
-        .attr('data-discussion-id', discussionID);
-    };
-
-    /*
-    Called when clicking on the "add a comment" button on the side of a diff line.
-
-    Inserts a temporary row for the form below the line.
-    Sets up the form and shows it.
-     */
-
-    Notes.prototype.onAddDiffNote = function(e) {
-      e.preventDefault();
-      const link = e.currentTarget || e.target;
-      const $link = $(link);
-      const showReplyInput = !$link.hasClass('js-diff-comment-avatar');
-      this.toggleDiffNote({
-        target: $link,
-        lineType: link.dataset.lineType,
-        showReplyInput
-      });
-    };
-
-    Notes.prototype.toggleDiffNote = function({
-      target,
-      lineType,
-      forceShow,
-      showReplyInput = false,
-    }) {
-      var $link, addForm, hasNotes, newForm, noteForm, replyButton, row, rowCssToAdd, targetContent, isDiffCommentAvatar;
-      $link = $(target);
-      row = $link.closest('tr');
-      const nextRow = row.next();
-      let targetRow = row;
-      if (nextRow.is('.notes_holder')) {
-        targetRow = nextRow;
+      if (closebtn.text() !== closetext) {
+        closebtn.text(closetext);
       }
-
-      hasNotes = nextRow.is('.notes_holder');
-      addForm = false;
-      let lineTypeSelector = '';
-      rowCssToAdd = '<tr class="notes_holder js-temp-notes-holder"><td class="notes_line" colspan="2"></td><td class="notes_content"><div class="content"></div></td></tr>';
-      // In parallel view, look inside the correct left/right pane
-      if (this.isParallelView()) {
-        lineTypeSelector = `.${lineType}`;
-        rowCssToAdd = '<tr class="notes_holder js-temp-notes-holder"><td class="notes_line old"></td><td class="notes_content parallel old"><div class="content"></div></td><td class="notes_line new"></td><td class="notes_content parallel new"><div class="content"></div></td></tr>';
+      if (reopenbtn.is(':not(.btn-comment-and-reopen)')) {
+        reopenbtn.addClass('btn-comment-and-reopen');
       }
-      const notesContentSelector = `.notes_content${lineTypeSelector} .content`;
-      let notesContent = targetRow.find(notesContentSelector);
-
-      if (hasNotes && showReplyInput) {
-        targetRow.show();
-        notesContent = targetRow.find(notesContentSelector);
-        if (notesContent.length) {
-          notesContent.show();
-          replyButton = notesContent.find('.js-discussion-reply-button:visible');
-          if (replyButton.length) {
-            this.replyToDiscussionNote(replyButton[0]);
-          } else {
-            // In parallel view, the form may not be present in one of the panes
-            noteForm = notesContent.find('.js-discussion-note-form');
-            if (noteForm.length === 0) {
-              addForm = true;
-            }
-          }
-        }
-      } else if (showReplyInput) {
-        // add a notes row and insert the form
-        row.after(rowCssToAdd);
-        targetRow = row.next();
-        notesContent = targetRow.find(notesContentSelector);
-        addForm = true;
-      } else {
-        const isCurrentlyShown = targetRow.find('.content:not(:empty)').is(':visible');
-        const isForced = forceShow === true || forceShow === false;
-        const showNow = forceShow === true || (!isCurrentlyShown && !isForced);
-
-        targetRow.toggle(showNow);
-        notesContent.toggle(showNow);
+      if (closebtn.is(':not(.btn-comment-and-close)')) {
+        closebtn.addClass('btn-comment-and-close');
       }
-
-      if (addForm) {
-        newForm = this.cleanForm(this.formClone.clone());
-        newForm.appendTo(notesContent);
-        // show the form
-        return this.setupDiscussionNoteForm($link, newForm);
+      if (discardbtn.is(':hidden')) {
+        return discardbtn.show();
       }
-    };
-
-    /*
-    Called in response to "cancel" on a diff note form.
-
-    Shows the reply button again.
-    Removes the form and if necessary it's temporary row.
-     */
-
-    Notes.prototype.removeDiscussionNoteForm = function(form) {
-      var glForm, row;
-      row = form.closest('tr');
-      glForm = form.data('gl-form');
-      glForm.destroy();
-      form.find('.js-note-text').data('autosave').reset();
-      // show the reply button (will only work for replies)
-      form
-        .prev('.discussion-reply-holder')
-        .show();
-      if (row.is('.js-temp-notes-holder')) {
-        // remove temporary row for diff lines
-        return row.remove();
-      } else {
-        // only remove the form
-        return form.remove();
+    } else {
+      reopentext = reopenbtn.data('original-text');
+      closetext = closebtn.data('original-text');
+      if (reopenbtn.text() !== reopentext) {
+        reopenbtn.text(reopentext);
       }
-    };
-
-    Notes.prototype.cancelDiscussionForm = function(e) {
-      var form;
-      e.preventDefault();
-      form = $(e.target).closest('.js-discussion-note-form');
-      return this.removeDiscussionNoteForm(form);
-    };
-
-    /*
-    Called after an attachment file has been selected.
-
-    Updates the file name for the selected attachment.
-     */
-
-    Notes.prototype.updateFormAttachment = function() {
-      var filename, form;
-      form = $(this).closest('form');
-      // get only the basename
-      filename = $(this).val().replace(/^.*[\\\/]/, '');
-      return form.find('.js-attachment-filename').text(filename);
-    };
-
-    /*
-    Called when the tab visibility changes
-     */
-
-    Notes.prototype.visibilityChange = function() {
-      return this.refresh();
-    };
-
-    Notes.prototype.updateTargetButtons = function(e) {
-      var closebtn, closetext, discardbtn, form, reopenbtn, reopentext, textarea;
-      textarea = $(e.target);
-      form = textarea.parents('form');
-      reopenbtn = form.find('.js-note-target-reopen');
-      closebtn = form.find('.js-note-target-close');
-      discardbtn = form.find('.js-note-discard');
-
-      if (textarea.val().trim().length > 0) {
-        reopentext = reopenbtn.attr('data-alternative-text');
-        closetext = closebtn.attr('data-alternative-text');
-        if (reopenbtn.text() !== reopentext) {
-          reopenbtn.text(reopentext);
-        }
-        if (closebtn.text() !== closetext) {
-          closebtn.text(closetext);
-        }
-        if (reopenbtn.is(':not(.btn-comment-and-reopen)')) {
-          reopenbtn.addClass('btn-comment-and-reopen');
-        }
-        if (closebtn.is(':not(.btn-comment-and-close)')) {
-          closebtn.addClass('btn-comment-and-close');
-        }
-        if (discardbtn.is(':hidden')) {
-          return discardbtn.show();
-        }
-      } else {
-        reopentext = reopenbtn.data('original-text');
-        closetext = closebtn.data('original-text');
-        if (reopenbtn.text() !== reopentext) {
-          reopenbtn.text(reopentext);
-        }
-        if (closebtn.text() !== closetext) {
-          closebtn.text(closetext);
-        }
-        if (reopenbtn.is('.btn-comment-and-reopen')) {
-          reopenbtn.removeClass('btn-comment-and-reopen');
-        }
-        if (closebtn.is('.btn-comment-and-close')) {
-          closebtn.removeClass('btn-comment-and-close');
-        }
-        if (discardbtn.is(':visible')) {
-          return discardbtn.hide();
-        }
+      if (closebtn.text() !== closetext) {
+        closebtn.text(closetext);
       }
-    };
-
-    Notes.prototype.putEditFormInPlace = function($el) {
-      var $editForm = $(this.getEditFormSelector($el));
-      var $note = $el.closest('.note');
-
-      $editForm.insertAfter($note.find('.note-text'));
-
-      var $originalContentEl = $note.find('.original-note-content');
-      var originalContent = $originalContentEl.text().trim();
-      var postUrl = $originalContentEl.data('post-url');
-      var targetId = $originalContentEl.data('target-id');
-      var targetType = $originalContentEl.data('target-type');
-
-      new gl.GLForm($editForm.find('form'), this.enableGFM);
-
-      $editForm.find('form')
-        .attr('action', postUrl)
-        .attr('data-remote', 'true');
-      $editForm.find('.js-form-target-id').val(targetId);
-      $editForm.find('.js-form-target-type').val(targetType);
-      $editForm.find('.js-note-text').focus().val(originalContent);
-      $editForm.find('.js-md-write-button').trigger('click');
-      $editForm.find('.referenced-users').hide();
-    };
-
-    Notes.prototype.putConflictEditWarningInPlace = function(noteEntity, $note) {
-      if ($note.find('.js-conflict-edit-warning').length === 0) {
-        const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
-          This comment has changed since you started editing, please review the
-          <a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">
-            updated comment
-          </a>
-          to ensure information is not lost
-        </div>`);
-        $alert.insertAfter($note.find('.note-text'));
+      if (reopenbtn.is('.btn-comment-and-reopen')) {
+        reopenbtn.removeClass('btn-comment-and-reopen');
       }
-    };
-
-    Notes.prototype.updateNotesCount = function(updateCount) {
-      return this.notesCountBadge.text(parseInt(this.notesCountBadge.text(), 10) + updateCount);
-    };
-
-    Notes.prototype.toggleCommitList = function(e) {
-      const $element = $(e.currentTarget);
-      const $closestSystemCommitList = $element.siblings('.system-note-commit-list');
-
-      $element.find('.fa').toggleClass('fa-angle-down').toggleClass('fa-angle-up');
-      $closestSystemCommitList.toggleClass('hide-shade');
-    };
-
-    /**
-    Scans system notes with `ul` elements in system note body
-    then collapse long commit list pushed by user to make it less
-    intrusive.
-     */
-    Notes.prototype.collapseLongCommitList = function() {
-      const systemNotes = $('#notes-list').find('li.system-note').has('ul');
-
-      $.each(systemNotes, function(index, systemNote) {
-        const $systemNote = $(systemNote);
-        const headerMessage = $systemNote.find('.note-text').find('p:first').text().replace(':', '');
-
-        $systemNote.find('.note-header .system-note-message').html(headerMessage);
-
-        if ($systemNote.find('li').length > MAX_VISIBLE_COMMIT_LIST_COUNT) {
-          $systemNote.find('.note-text').addClass('system-note-commit-list');
-          $systemNote.find('.system-note-commit-list-toggler').show();
-        } else {
-          $systemNote.find('.note-text').addClass('system-note-commit-list hide-shade');
-        }
-      });
-    };
-
-    Notes.prototype.addFlash = function(...flashParams) {
-      this.flashInstance = new Flash(...flashParams);
-    };
-
-    Notes.prototype.clearFlash = function() {
-      if (this.flashInstance && this.flashInstance.flashContainer) {
-        this.flashInstance.flashContainer.hide();
-        this.flashInstance = null;
+      if (closebtn.is('.btn-comment-and-close')) {
+        closebtn.removeClass('btn-comment-and-close');
       }
-    };
-
-    Notes.prototype.cleanForm = function($form) {
-      // Remove JS classes that are not needed here
-      $form
-        .find('.js-comment-type-dropdown')
-        .removeClass('btn-group');
-
-      // Remove dropdown
-      $form
-        .find('.dropdown-menu')
-        .remove();
-
-      return $form;
-    };
-
-    /**
-     * Check if note does not exists on page
-     */
-    Notes.isNewNote = function(noteEntity, noteIds) {
-      return $.inArray(noteEntity.id, noteIds) === -1;
-    };
-
-    /**
-     * Check if $note already contains the `noteEntity` content
-     */
-    Notes.isUpdatedNote = function(noteEntity, $note) {
-      // There can be CRLF vs LF mismatches if we don't sanitize and compare the same way
-      const sanitizedNoteEntityText = normalizeNewlines(noteEntity.note.trim());
-      const currentNoteText = normalizeNewlines(
-        $note.find('.original-note-content').first().text().trim()
-      );
-      return sanitizedNoteEntityText !== currentNoteText;
-    };
-
-    Notes.checkMergeRequestStatus = function() {
-      if (gl.utils.getPagePath(1) === 'merge_requests') {
-        gl.mrWidget.checkStatus();
+      if (discardbtn.is(':visible')) {
+        return discardbtn.hide();
       }
-    };
+    }
+  }
+
+  putEditFormInPlace($el) {
+    var $editForm = $(this.getEditFormSelector($el));
+    var $note = $el.closest('.note');
+
+    $editForm.insertAfter($note.find('.note-text'));
+
+    var $originalContentEl = $note.find('.original-note-content');
+    var originalContent = $originalContentEl.text().trim();
+    var postUrl = $originalContentEl.data('post-url');
+    var targetId = $originalContentEl.data('target-id');
+    var targetType = $originalContentEl.data('target-type');
+
+    new gl.GLForm($editForm.find('form'), this.enableGFM);
+
+    $editForm.find('form')
+      .attr('action', postUrl)
+      .attr('data-remote', 'true');
+    $editForm.find('.js-form-target-id').val(targetId);
+    $editForm.find('.js-form-target-type').val(targetType);
+    $editForm.find('.js-note-text').focus().val(originalContent);
+    $editForm.find('.js-md-write-button').trigger('click');
+    $editForm.find('.referenced-users').hide();
+  }
+
+  putConflictEditWarningInPlace(noteEntity, $note) {
+    if ($note.find('.js-conflict-edit-warning').length === 0) {
+      const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
+        This comment has changed since you started editing, please review the
+        <a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">
+          updated comment
+        </a>
+        to ensure information is not lost
+      </div>`);
+      $alert.insertAfter($note.find('.note-text'));
+    }
+  }
 
-    Notes.animateAppendNote = function(noteHtml, $notesList) {
-      const $note = $(noteHtml);
+  updateNotesCount(updateCount) {
+    return this.notesCountBadge.text(parseInt(this.notesCountBadge.text(), 10) + updateCount);
+  }
 
-      $note.addClass('fade-in-full').renderGFM();
-      $notesList.append($note);
-      return $note;
-    };
+  toggleCommitList(e) {
+    const $element = $(e.currentTarget);
+    const $closestSystemCommitList = $element.siblings('.system-note-commit-list');
 
-    Notes.animateUpdateNote = function(noteHtml, $note) {
-      const $updatedNote = $(noteHtml);
+    $element.find('.fa').toggleClass('fa-angle-down').toggleClass('fa-angle-up');
+    $closestSystemCommitList.toggleClass('hide-shade');
+  }
 
-      $updatedNote.addClass('fade-in').renderGFM();
-      $note.replaceWith($updatedNote);
-      return $updatedNote;
-    };
+  /**
+   * Scans system notes with `ul` elements in system note body
+   * then collapse long commit list pushed by user to make it less
+   * intrusive.
+   */
+  collapseLongCommitList() {
+    const systemNotes = $('#notes-list').find('li.system-note').has('ul');
 
-    /**
-     * Get data from Form attributes to use for saving/submitting comment.
-     */
-    Notes.prototype.getFormData = function($form) {
-      return {
-        formData: $form.serialize(),
-        formContent: _.escape($form.find('.js-note-text').val()),
-        formAction: $form.attr('action'),
-      };
-    };
+    $.each(systemNotes, function(index, systemNote) {
+      const $systemNote = $(systemNote);
+      const headerMessage = $systemNote.find('.note-text').find('p:first').text().replace(':', '');
 
-    /**
-     * Identify if comment has any quick actions
-     */
-    Notes.prototype.hasQuickActions = function(formContent) {
-      return REGEX_QUICK_ACTIONS.test(formContent);
-    };
-
-    /**
-     * Remove quick actions and leave comment with pure message
-     */
-    Notes.prototype.stripQuickActions = function(formContent) {
-      return formContent.replace(REGEX_QUICK_ACTIONS, '').trim();
-    };
+      $systemNote.find('.note-header .system-note-message').html(headerMessage);
 
-    /**
-     * Gets appropriate description from quick actions found in provided `formContent`
-     */
-    Notes.prototype.getQuickActionDescription = function (formContent, availableQuickActions = []) {
-      let tempFormContent;
+      if ($systemNote.find('li').length > MAX_VISIBLE_COMMIT_LIST_COUNT) {
+        $systemNote.find('.note-text').addClass('system-note-commit-list');
+        $systemNote.find('.system-note-commit-list-toggler').show();
+      } else {
+        $systemNote.find('.note-text').addClass('system-note-commit-list hide-shade');
+      }
+    });
+  }
 
-      // Identify executed quick actions from `formContent`
-      const executedCommands = availableQuickActions.filter((command, index) => {
-        const commandRegex = new RegExp(`/${command.name}`);
-        return commandRegex.test(formContent);
-      });
+  addFlash(...flashParams) {
+    this.flashInstance = new Flash(...flashParams);
+  }
 
-      if (executedCommands && executedCommands.length) {
-        if (executedCommands.length > 1) {
-          tempFormContent = 'Applying multiple commands';
-        } else {
-          const commandDescription = executedCommands[0].description.toLowerCase();
-          tempFormContent = `Applying command to ${commandDescription}`;
-        }
+  clearFlash() {
+    if (this.flashInstance && this.flashInstance.flashContainer) {
+      this.flashInstance.flashContainer.hide();
+      this.flashInstance = null;
+    }
+  }
+
+  cleanForm($form) {
+    // Remove JS classes that are not needed here
+    $form
+      .find('.js-comment-type-dropdown')
+      .removeClass('btn-group');
+
+    // Remove dropdown
+    $form
+      .find('.dropdown-menu')
+      .remove();
+
+    return $form;
+  }
+
+  /**
+   * Check if note does not exists on page
+   */
+  static isNewNote(noteEntity, noteIds) {
+    return $.inArray(noteEntity.id, noteIds) === -1;
+  }
+
+  /**
+   * Check if $note already contains the `noteEntity` content
+   */
+  static isUpdatedNote(noteEntity, $note) {
+    // There can be CRLF vs LF mismatches if we don't sanitize and compare the same way
+    const sanitizedNoteEntityText = normalizeNewlines(noteEntity.note.trim());
+    const currentNoteText = normalizeNewlines(
+      $note.find('.original-note-content').first().text().trim()
+    );
+    return sanitizedNoteEntityText !== currentNoteText;
+  }
+
+  static checkMergeRequestStatus() {
+    if (gl.utils.getPagePath(1) === 'merge_requests') {
+      gl.mrWidget.checkStatus();
+    }
+  }
+
+  static animateAppendNote(noteHtml, $notesList) {
+    const $note = $(noteHtml);
+
+    $note.addClass('fade-in-full').renderGFM();
+    $notesList.append($note);
+    return $note;
+  }
+
+  static animateUpdateNote(noteHtml, $note) {
+    const $updatedNote = $(noteHtml);
+
+    $updatedNote.addClass('fade-in').renderGFM();
+    $note.replaceWith($updatedNote);
+    return $updatedNote;
+  }
+
+  /**
+   * Get data from Form attributes to use for saving/submitting comment.
+   */
+  getFormData($form) {
+    return {
+      formData: $form.serialize(),
+      formContent: _.escape($form.find('.js-note-text').val()),
+      formAction: $form.attr('action'),
+    };
+  }
+
+  /**
+   * Identify if comment has any quick actions
+   */
+  hasQuickActions(formContent) {
+    return REGEX_QUICK_ACTIONS.test(formContent);
+  }
+
+  /**
+   * Remove quick actions and leave comment with pure message
+   */
+  stripQuickActions(formContent) {
+    return formContent.replace(REGEX_QUICK_ACTIONS, '').trim();
+  }
+
+  /**
+   * Gets appropriate description from quick actions found in provided `formContent`
+   */
+  getQuickActionDescription(formContent, availableQuickActions = []) {
+    let tempFormContent;
+
+    // Identify executed quick actions from `formContent`
+    const executedCommands = availableQuickActions.filter((command, index) => {
+      const commandRegex = new RegExp(`/${command.name}`);
+      return commandRegex.test(formContent);
+    });
+
+    if (executedCommands && executedCommands.length) {
+      if (executedCommands.length > 1) {
+        tempFormContent = 'Applying multiple commands';
       } else {
-        tempFormContent = 'Applying command';
+        const commandDescription = executedCommands[0].description.toLowerCase();
+        tempFormContent = `Applying command to ${commandDescription}`;
       }
+    } else {
+      tempFormContent = 'Applying command';
+    }
 
-      return tempFormContent;
-    };
-
-    /**
-     * Create placeholder note DOM element populated with comment body
-     * that we will show while comment is being posted.
-     * Once comment is _actually_ posted on server, we will have final element
-     * in response that we will show in place of this temporary element.
-     */
-    Notes.prototype.createPlaceholderNote = function ({ formContent, uniqueId, isDiscussionNote, currentUsername, currentUserFullname, currentUserAvatar }) {
-      const discussionClass = isDiscussionNote ? 'discussion' : '';
-      const $tempNote = $(
-        `<li id="${uniqueId}" class="note being-posted fade-in-half timeline-entry">
-           <div class="timeline-entry-inner">
-              <div class="timeline-icon">
-                 <a href="/${currentUsername}">
-                   <img class="avatar s40" src="${currentUserAvatar}">
-                 </a>
-              </div>
-              <div class="timeline-content ${discussionClass}">
-                 <div class="note-header">
-                    <div class="note-header-info">
-                       <a href="/${currentUsername}">
-                         <span class="hidden-xs">${currentUserFullname}</span>
-                         <span class="note-headline-light">@${currentUsername}</span>
-                       </a>
-                    </div>
+    return tempFormContent;
+  }
+
+  /**
+   * Create placeholder note DOM element populated with comment body
+   * that we will show while comment is being posted.
+   * Once comment is _actually_ posted on server, we will have final element
+   * in response that we will show in place of this temporary element.
+   */
+  createPlaceholderNote({ formContent, uniqueId, isDiscussionNote, currentUsername, currentUserFullname, currentUserAvatar }) {
+    const discussionClass = isDiscussionNote ? 'discussion' : '';
+    const $tempNote = $(
+      `<li id="${uniqueId}" class="note being-posted fade-in-half timeline-entry">
+         <div class="timeline-entry-inner">
+            <div class="timeline-icon">
+               <a href="/${currentUsername}">
+                 <img class="avatar s40" src="${currentUserAvatar}">
+               </a>
+            </div>
+            <div class="timeline-content ${discussionClass}">
+               <div class="note-header">
+                  <div class="note-header-info">
+                     <a href="/${currentUsername}">
+                       <span class="hidden-xs">${currentUserFullname}</span>
+                       <span class="note-headline-light">@${currentUsername}</span>
+                     </a>
+                  </div>
+               </div>
+               <div class="note-body">
+                 <div class="note-text">
+                   <p>${formContent}</p>
                  </div>
-                 <div class="note-body">
-                   <div class="note-text">
-                     <p>${formContent}</p>
-                   </div>
-                 </div>
-              </div>
+               </div>
+            </div>
+         </div>
+      </li>`
+    );
+
+    return $tempNote;
+  }
+
+  /**
+   * Create Placeholder System Note DOM element populated with quick action description
+   */
+  createPlaceholderSystemNote({ formContent, uniqueId }) {
+    const $tempNote = $(
+      `<li id="${uniqueId}" class="note system-note timeline-entry being-posted fade-in-half">
+         <div class="timeline-entry-inner">
+           <div class="timeline-content">
+             <i>${formContent}</i>
            </div>
-        </li>`
-      );
-
-      return $tempNote;
-    };
-
-    /**
-     * Create Placeholder System Note DOM element populated with quick action description
-     */
-    Notes.prototype.createPlaceholderSystemNote = function ({ formContent, uniqueId }) {
-      const $tempNote = $(
-        `<li id="${uniqueId}" class="note system-note timeline-entry being-posted fade-in-half">
-           <div class="timeline-entry-inner">
-             <div class="timeline-content">
-               <i>${formContent}</i>
-             </div>
-           </div>
-         </li>`
-      );
+         </div>
+       </li>`
+    );
+
+    return $tempNote;
+  }
+
+  /**
+   * This method does following tasks step-by-step whenever a new comment
+   * is submitted by user (both main thread comments as well as discussion comments).
+   *
+   * 1) Get Form metadata
+   * 2) Identify comment type; a) Main thread b) Discussion thread c) Discussion resolve
+   * 3) Build temporary placeholder element (using `createPlaceholderNote`)
+   * 4) Show placeholder note on UI
+   * 5) Perform network request to submit the note using `gl.utils.ajaxPost`
+   *    a) If request is successfully completed
+   *        1. Remove placeholder element
+   *        2. Show submitted Note element
+   *        3. Perform post-submit errands
+   *           a. Mark discussion as resolved if comment submission was for resolve.
+   *           b. Reset comment form to original state.
+   *    b) If request failed
+   *        1. Remove placeholder element
+   *        2. Show error Flash message about failure
+   */
+  postComment(e) {
+    e.preventDefault();
+
+    // Get Form metadata
+    const $submitBtn = $(e.target);
+    let $form = $submitBtn.parents('form');
+    const $closeBtn = $form.find('.js-note-target-close');
+    const isDiscussionNote = $submitBtn.parent().find('li.droplab-item-selected').attr('id') === 'discussion';
+    const isMainForm = $form.hasClass('js-main-target-form');
+    const isDiscussionForm = $form.hasClass('js-discussion-note-form');
+    const isDiscussionResolve = $submitBtn.hasClass('js-comment-resolve-button');
+    const { formData, formContent, formAction } = this.getFormData($form);
+    let noteUniqueId;
+    let systemNoteUniqueId;
+    let hasQuickActions = false;
+    let $notesContainer;
+    let tempFormContent;
+
+    // Get reference to notes container based on type of comment
+    if (isDiscussionForm) {
+      $notesContainer = $form.parent('.discussion-notes').find('.notes');
+    } else if (isMainForm) {
+      $notesContainer = $('ul.main-notes-list');
+    }
 
-      return $tempNote;
-    };
+    // If comment is to resolve discussion, disable submit buttons while
+    // comment posting is finished.
+    if (isDiscussionResolve) {
+      $submitBtn.disable();
+      $form.find('.js-comment-submit-button').disable();
+    }
 
-    /**
-     * This method does following tasks step-by-step whenever a new comment
-     * is submitted by user (both main thread comments as well as discussion comments).
-     *
-     * 1) Get Form metadata
-     * 2) Identify comment type; a) Main thread b) Discussion thread c) Discussion resolve
-     * 3) Build temporary placeholder element (using `createPlaceholderNote`)
-     * 4) Show placeholder note on UI
-     * 5) Perform network request to submit the note using `gl.utils.ajaxPost`
-     *    a) If request is successfully completed
-     *        1. Remove placeholder element
-     *        2. Show submitted Note element
-     *        3. Perform post-submit errands
-     *           a. Mark discussion as resolved if comment submission was for resolve.
-     *           b. Reset comment form to original state.
-     *    b) If request failed
-     *        1. Remove placeholder element
-     *        2. Show error Flash message about failure
-     */
-    Notes.prototype.postComment = function(e) {
-      e.preventDefault();
-
-      // Get Form metadata
-      const $submitBtn = $(e.target);
-      let $form = $submitBtn.parents('form');
-      const $closeBtn = $form.find('.js-note-target-close');
-      const isDiscussionNote = $submitBtn.parent().find('li.droplab-item-selected').attr('id') === 'discussion';
-      const isMainForm = $form.hasClass('js-main-target-form');
-      const isDiscussionForm = $form.hasClass('js-discussion-note-form');
-      const isDiscussionResolve = $submitBtn.hasClass('js-comment-resolve-button');
-      const { formData, formContent, formAction } = this.getFormData($form);
-      let noteUniqueId;
-      let systemNoteUniqueId;
-      let hasQuickActions = false;
-      let $notesContainer;
-      let tempFormContent;
-
-      // Get reference to notes container based on type of comment
-      if (isDiscussionForm) {
-        $notesContainer = $form.parent('.discussion-notes').find('.notes');
-      } else if (isMainForm) {
-        $notesContainer = $('ul.main-notes-list');
-      }
+    tempFormContent = formContent;
+    if (this.hasQuickActions(formContent)) {
+      tempFormContent = this.stripQuickActions(formContent);
+      hasQuickActions = true;
+    }
 
-      // If comment is to resolve discussion, disable submit buttons while
-      // comment posting is finished.
-      if (isDiscussionResolve) {
-        $submitBtn.disable();
-        $form.find('.js-comment-submit-button').disable();
-      }
+    // Show placeholder note
+    if (tempFormContent) {
+      noteUniqueId = _.uniqueId('tempNote_');
+      $notesContainer.append(this.createPlaceholderNote({
+        formContent: tempFormContent,
+        uniqueId: noteUniqueId,
+        isDiscussionNote,
+        currentUsername: gon.current_username,
+        currentUserFullname: gon.current_user_fullname,
+        currentUserAvatar: gon.current_user_avatar_url,
+      }));
+    }
 
-      tempFormContent = formContent;
-      if (this.hasQuickActions(formContent)) {
-        tempFormContent = this.stripQuickActions(formContent);
-        hasQuickActions = true;
-      }
+    // Show placeholder system note
+    if (hasQuickActions) {
+      systemNoteUniqueId = _.uniqueId('tempSystemNote_');
+      $notesContainer.append(this.createPlaceholderSystemNote({
+        formContent: this.getQuickActionDescription(formContent, AjaxCache.get(gl.GfmAutoComplete.dataSources.commands)),
+        uniqueId: systemNoteUniqueId,
+      }));
+    }
 
-      // Show placeholder note
-      if (tempFormContent) {
-        noteUniqueId = _.uniqueId('tempNote_');
-        $notesContainer.append(this.createPlaceholderNote({
-          formContent: tempFormContent,
-          uniqueId: noteUniqueId,
-          isDiscussionNote,
-          currentUsername: gon.current_username,
-          currentUserFullname: gon.current_user_fullname,
-          currentUserAvatar: gon.current_user_avatar_url,
-        }));
+    // Clear the form textarea
+    if ($notesContainer.length) {
+      if (isMainForm) {
+        this.resetMainTargetForm(e);
+      } else if (isDiscussionForm) {
+        this.removeDiscussionNoteForm($form);
       }
+    }
 
-      // Show placeholder system note
-      if (hasQuickActions) {
-        systemNoteUniqueId = _.uniqueId('tempSystemNote_');
-        $notesContainer.append(this.createPlaceholderSystemNote({
-          formContent: this.getQuickActionDescription(formContent, AjaxCache.get(gl.GfmAutoComplete.dataSources.commands)),
-          uniqueId: systemNoteUniqueId,
-        }));
-      }
+    /* eslint-disable promise/catch-or-return */
+    // Make request to submit comment on server
+    gl.utils.ajaxPost(formAction, formData)
+      .then((note) => {
+        // Submission successful! remove placeholder
+        $notesContainer.find(`#${noteUniqueId}`).remove();
 
-      // Clear the form textarea
-      if ($notesContainer.length) {
-        if (isMainForm) {
-          this.resetMainTargetForm(e);
-        } else if (isDiscussionForm) {
-          this.removeDiscussionNoteForm($form);
+        // Reset cached commands list when command is applied
+        if (hasQuickActions) {
+          $form.find('textarea.js-note-text').trigger('clear-commands-cache.atwho');
         }
-      }
-
-      /* eslint-disable promise/catch-or-return */
-      // Make request to submit comment on server
-      gl.utils.ajaxPost(formAction, formData)
-        .then((note) => {
-          // Submission successful! remove placeholder
-          $notesContainer.find(`#${noteUniqueId}`).remove();
 
-          // Reset cached commands list when command is applied
-          if (hasQuickActions) {
-            $form.find('textarea.js-note-text').trigger('clear-commands-cache.atwho');
-          }
-
-          // Clear previous form errors
-          this.clearFlashWrapper();
+        // Clear previous form errors
+        this.clearFlashWrapper();
 
-          // Check if this was discussion comment
-          if (isDiscussionForm) {
-            // Remove flash-container
-            $notesContainer.find('.flash-container').remove();
+        // Check if this was discussion comment
+        if (isDiscussionForm) {
+          // Remove flash-container
+          $notesContainer.find('.flash-container').remove();
 
-            // If comment intends to resolve discussion, do the same.
-            if (isDiscussionResolve) {
-              $form
-                .attr('data-discussion-id', $submitBtn.data('discussion-id'))
-                .attr('data-resolve-all', 'true')
-                .attr('data-project-path', $submitBtn.data('project-path'));
-            }
+          // If comment intends to resolve discussion, do the same.
+          if (isDiscussionResolve) {
+            $form
+              .attr('data-discussion-id', $submitBtn.data('discussion-id'))
+              .attr('data-resolve-all', 'true')
+              .attr('data-project-path', $submitBtn.data('project-path'));
+          }
 
-            // Show final note element on UI
-            this.addDiscussionNote($form, note, $notesContainer.length === 0);
+          // Show final note element on UI
+          this.addDiscussionNote($form, note, $notesContainer.length === 0);
 
-            // append flash-container to the Notes list
-            if ($notesContainer.length) {
-              $notesContainer.append('<div class="flash-container" style="display: none;"></div>');
-            }
-          } else if (isMainForm) { // Check if this was main thread comment
-            // Show final note element on UI and perform form and action buttons cleanup
-            this.addNote($form, note);
-            this.reenableTargetFormSubmitButton(e);
+          // append flash-container to the Notes list
+          if ($notesContainer.length) {
+            $notesContainer.append('<div class="flash-container" style="display: none;"></div>');
           }
+        } else if (isMainForm) { // Check if this was main thread comment
+          // Show final note element on UI and perform form and action buttons cleanup
+          this.addNote($form, note);
+          this.reenableTargetFormSubmitButton(e);
+        }
 
-          if (note.commands_changes) {
-            this.handleQuickActions(note);
-          }
+        if (note.commands_changes) {
+          this.handleQuickActions(note);
+        }
 
-          $form.trigger('ajax:success', [note]);
-        }).fail(() => {
-          // Submission failed, remove placeholder note and show Flash error message
-          $notesContainer.find(`#${noteUniqueId}`).remove();
+        $form.trigger('ajax:success', [note]);
+      }).fail(() => {
+        // Submission failed, remove placeholder note and show Flash error message
+        $notesContainer.find(`#${noteUniqueId}`).remove();
 
-          if (hasQuickActions) {
-            $notesContainer.find(`#${systemNoteUniqueId}`).remove();
-          }
+        if (hasQuickActions) {
+          $notesContainer.find(`#${systemNoteUniqueId}`).remove();
+        }
 
-          // Show form again on UI on failure
-          if (isDiscussionForm && $notesContainer.length) {
-            const replyButton = $notesContainer.parent().find('.js-discussion-reply-button');
-            this.replyToDiscussionNote(replyButton[0]);
-            $form = $notesContainer.parent().find('form');
-          }
+        // Show form again on UI on failure
+        if (isDiscussionForm && $notesContainer.length) {
+          const replyButton = $notesContainer.parent().find('.js-discussion-reply-button');
+          this.replyToDiscussionNote(replyButton[0]);
+          $form = $notesContainer.parent().find('form');
+        }
 
-          $form.find('.js-note-text').val(formContent);
-          this.reenableTargetFormSubmitButton(e);
-          this.addNoteError($form);
-        });
+        $form.find('.js-note-text').val(formContent);
+        this.reenableTargetFormSubmitButton(e);
+        this.addNoteError($form);
+      });
 
-      return $closeBtn.text($closeBtn.data('original-text'));
-    };
+    return $closeBtn.text($closeBtn.data('original-text'));
+  }
+
+  /**
+   * This method does following tasks step-by-step whenever an existing comment
+   * is updated by user (both main thread comments as well as discussion comments).
+   *
+   * 1) Get Form metadata
+   * 2) Update note element with new content
+   * 3) Perform network request to submit the updated note using `gl.utils.ajaxPost`
+   *    a) If request is successfully completed
+   *        1. Show submitted Note element
+   *    b) If request failed
+   *        1. Revert Note element to original content
+   *        2. Show error Flash message about failure
+   */
+  updateComment(e) {
+    e.preventDefault();
+
+    // Get Form metadata
+    const $submitBtn = $(e.target);
+    const $form = $submitBtn.parents('form');
+    const $closeBtn = $form.find('.js-note-target-close');
+    const $editingNote = $form.parents('.note.is-editing');
+    const $noteBody = $editingNote.find('.js-task-list-container');
+    const $noteBodyText = $noteBody.find('.note-text');
+    const { formData, formContent, formAction } = this.getFormData($form);
+
+    // Cache original comment content
+    const cachedNoteBodyText = $noteBodyText.html();
+
+    // Show updated comment content temporarily
+    $noteBodyText.html(_.escape(formContent));
+    $editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half');
+    $editingNote.find('.note-headline-meta a').html('<i class="fa fa-spinner fa-spin" aria-label="Comment is being updated" aria-hidden="true"></i>');
+
+    /* eslint-disable promise/catch-or-return */
+    // Make request to update comment on server
+    gl.utils.ajaxPost(formAction, formData)
+      .then((note) => {
+        // Submission successful! render final note element
+        this.updateNote(note, $editingNote);
+      })
+      .fail(() => {
+        // Submission failed, revert back to original note
+        $noteBodyText.html(_.escape(cachedNoteBodyText));
+        $editingNote.removeClass('being-posted fade-in');
+        $editingNote.find('.fa.fa-spinner').remove();
+
+        // Show Flash message about failure
+        this.updateNoteError();
+      });
 
-    /**
-     * This method does following tasks step-by-step whenever an existing comment
-     * is updated by user (both main thread comments as well as discussion comments).
-     *
-     * 1) Get Form metadata
-     * 2) Update note element with new content
-     * 3) Perform network request to submit the updated note using `gl.utils.ajaxPost`
-     *    a) If request is successfully completed
-     *        1. Show submitted Note element
-     *    b) If request failed
-     *        1. Revert Note element to original content
-     *        2. Show error Flash message about failure
-     */
-    Notes.prototype.updateComment = function(e) {
-      e.preventDefault();
-
-      // Get Form metadata
-      const $submitBtn = $(e.target);
-      const $form = $submitBtn.parents('form');
-      const $closeBtn = $form.find('.js-note-target-close');
-      const $editingNote = $form.parents('.note.is-editing');
-      const $noteBody = $editingNote.find('.js-task-list-container');
-      const $noteBodyText = $noteBody.find('.note-text');
-      const { formData, formContent, formAction } = this.getFormData($form);
-
-      // Cache original comment content
-      const cachedNoteBodyText = $noteBodyText.html();
-
-      // Show updated comment content temporarily
-      $noteBodyText.html(_.escape(formContent));
-      $editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half');
-      $editingNote.find('.note-headline-meta a').html('<i class="fa fa-spinner fa-spin" aria-label="Comment is being updated" aria-hidden="true"></i>');
-
-      /* eslint-disable promise/catch-or-return */
-      // Make request to update comment on server
-      gl.utils.ajaxPost(formAction, formData)
-        .then((note) => {
-          // Submission successful! render final note element
-          this.updateNote(note, $editingNote);
-        })
-        .fail(() => {
-          // Submission failed, revert back to original note
-          $noteBodyText.html(_.escape(cachedNoteBodyText));
-          $editingNote.removeClass('being-posted fade-in');
-          $editingNote.find('.fa.fa-spinner').remove();
-
-          // Show Flash message about failure
-          this.updateNoteError();
-        });
-
-      return $closeBtn.text($closeBtn.data('original-text'));
-    };
+    return $closeBtn.text($closeBtn.data('original-text'));
+  }
+}
 
-    return Notes;
-  })();
-}).call(window);
+window.Notes = Notes;
-- 
cgit v1.2.1


From 516a3b788078b9296a86bfa6b8d3160ea742f851 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 22 Jun 2017 17:07:19 -0700
Subject: Revert "Annotate" to "Blame"

---
 app/assets/stylesheets/framework/files.scss                      | 2 +-
 app/views/projects/blame/show.html.haml                          | 2 +-
 app/views/projects/blob/_breadcrumb.html.haml                    | 2 +-
 changelogs/unreleased/10378-promote-blameless-culture.yml        | 4 ----
 features/steps/project/source/browse_files.rb                    | 1 -
 spec/features/projects/blobs/blob_line_permalink_updater_spec.rb | 2 +-
 spec/features/projects/files/browse_files_spec.rb                | 2 +-
 7 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 changelogs/unreleased/10378-promote-blameless-culture.yml

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index da03e4f5b5e..f9f0e60bcb5 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -123,7 +123,7 @@
     }
 
     /**
-     *  Annotate file
+     *  Blame file
      */
     &.blame {
       table {
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index ce937ee1842..3627f72f5e1 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - project_duration = age_map_duration(@blame_groups, @project)
-- page_title "Annotate", @blob.path, @ref
+- page_title "Blame", @blob.path, @ref
 = render "projects/commits/head"
 
 %div{ class: container_class }
diff --git a/app/views/projects/blob/_breadcrumb.html.haml b/app/views/projects/blob/_breadcrumb.html.haml
index 5840e9863f4..2c944b516a4 100644
--- a/app/views/projects/blob/_breadcrumb.html.haml
+++ b/app/views/projects/blob/_breadcrumb.html.haml
@@ -27,7 +27,7 @@
           = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id),
               class: 'btn'
         - else
-          = link_to 'Annotate', namespace_project_blame_path(@project.namespace, @project, @id),
+          = link_to 'Blame', namespace_project_blame_path(@project.namespace, @project, @id),
               class: 'btn js-blob-blame-link' unless blob.empty?
 
       = link_to 'History', namespace_project_commits_path(@project.namespace, @project, @id),
diff --git a/changelogs/unreleased/10378-promote-blameless-culture.yml b/changelogs/unreleased/10378-promote-blameless-culture.yml
deleted file mode 100644
index 8cf64dfd793..00000000000
--- a/changelogs/unreleased/10378-promote-blameless-culture.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Changed Blame to Annotate in the UI to promote blameless culture
-merge_request: 10378
-author: Ilya Vassilevsky
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 80aa3a047a0..9ed4f8ea1f9 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -369,7 +369,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
       expect(page).to have_content 'Permalink'
       expect(page).not_to have_content 'Edit'
       expect(page).not_to have_content 'Blame'
-      expect(page).not_to have_content 'Annotate'
       expect(page).to have_content 'Delete'
       expect(page).to have_content 'Replace'
     end
diff --git a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
index 53c5a52ce3a..d94204230f6 100644
--- a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
+++ b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
@@ -55,7 +55,7 @@ feature 'Blob button line permalinks (BlobLinePermalinkUpdater)', feature: true,
       end
     end
 
-    describe 'Click "Annotate" button' do
+    describe 'Click "Blame" button' do
       it 'works with no initial line number fragment hash' do
         visit_blob
 
diff --git a/spec/features/projects/files/browse_files_spec.rb b/spec/features/projects/files/browse_files_spec.rb
index 2a82c3ac179..34aef958ec6 100644
--- a/spec/features/projects/files/browse_files_spec.rb
+++ b/spec/features/projects/files/browse_files_spec.rb
@@ -12,7 +12,7 @@ feature 'user browses project', feature: true, js: true do
 
   scenario "can see blame of '.gitignore'" do
     click_link ".gitignore"
-    click_link 'Annotate'
+    click_link 'Blame'
 
     expect(page).to have_content "*.rb"
     expect(page).to have_content "Dmitriy Zaporozhets"
-- 
cgit v1.2.1


From c79540c6585f8676fd976e9ff5ef67374acfe6fc Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas Lopez <jvargas@gitlab.com>
Date: Fri, 23 Jun 2017 00:54:51 +0000
Subject: Fix dropdown position for the new button on mobile for the top navbar

---
 app/assets/stylesheets/framework/dropdowns.scss | 5 +++++
 app/assets/stylesheets/framework/header.scss    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index cba890ce831..4f54ca24940 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -395,6 +395,11 @@
 .dropdown-menu-align-right {
   left: auto;
   right: 0;
+  margin-top: -5px;
+
+  @media (max-width: $screen-xs-max) {
+    left: 0;
+  }
 }
 
 .dropdown-menu-selectable {
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index d8645afb7da..94986badaf9 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -346,6 +346,7 @@ header {
     width: auto;
     min-width: 140px;
     margin-top: -5px;
+    left: auto;
 
     .current-user {
       padding: 5px 18px;
-- 
cgit v1.2.1


From 6cb575d612cd2470ee4224159fa16458f5426f73 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 6 Jun 2017 15:46:31 -0500
Subject: Add support for multiple tooltips in the same Vue component

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33223
---
 .../components/environment_actions.vue             | 11 ++--
 .../components/environment_external_url.vue        |  9 +++-
 .../components/environment_monitoring.vue          |  9 +++-
 .../environments/components/environment_stop.vue   |  8 ++-
 .../components/environment_terminal_button.vue     |  8 ++-
 .../issue_show/components/fields/project_move.vue  | 12 ++---
 .../pipelines/components/async_button.vue          | 11 ++--
 .../components/graph/action_component.vue          | 11 ++--
 .../components/graph/dropdown_action_component.vue | 11 ++--
 .../components/graph/dropdown_job_component.vue    | 12 ++---
 .../pipelines/components/graph/job_component.vue   | 14 +++--
 .../pipelines/components/pipeline_url.vue          | 16 +++---
 .../pipelines/components/pipelines_actions.vue     | 10 ++--
 .../pipelines/components/pipelines_artifacts.vue   | 12 ++---
 .../javascripts/pipelines/components/stage.vue     | 10 ++--
 .../javascripts/pipelines/components/time_ago.vue  |  8 +--
 .../vue_shared/components/header_ci_component.vue  | 12 ++---
 .../vue_shared/components/markdown/header.vue      | 12 ++---
 .../components/markdown/toolbar_button.vue         | 10 ++--
 .../vue_shared/components/time_ago_tooltip.vue     | 12 +++--
 .../components/user_avatar/user_avatar_image.vue   |  8 +--
 .../javascripts/vue_shared/directives/tooltip.js   | 13 +++++
 .../javascripts/vue_shared/mixins/tooltip.js       | 13 -----
 doc/development/fe_guide/style_guide_js.md         | 12 +++--
 .../environments/environment_actions_spec.js       |  9 +++-
 .../environments/environment_monitoring_spec.js    | 19 +++++--
 .../environments/environment_stop_spec.js          |  9 +++-
 .../environment_terminal_button_spec.js            |  9 +++-
 .../vue_shared/components/time_ago_tooltip_spec.js |  1 -
 .../vue_shared/directives/tooltip_spec.js          | 63 ++++++++++++++++++++++
 30 files changed, 251 insertions(+), 123 deletions(-)
 create mode 100644 app/assets/javascripts/vue_shared/directives/tooltip.js
 delete mode 100644 app/assets/javascripts/vue_shared/mixins/tooltip.js
 create mode 100644 spec/javascripts/vue_shared/directives/tooltip_spec.js

diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue
index a2448520a5f..e7495677e7c 100644
--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
@@ -2,6 +2,7 @@
 import playIconSvg from 'icons/_icon_play.svg';
 import eventHub from '../event_hub';
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -12,6 +13,10 @@ export default {
     },
   },
 
+  directives: {
+    tooltip,
+  },
+
   components: {
     loadingIcon,
   },
@@ -33,8 +38,6 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $(this.$refs.tooltip).tooltip('destroy');
-
       eventHub.$emit('postAction', endpoint);
     },
 
@@ -53,11 +56,11 @@ export default {
     class="btn-group"
     role="group">
     <button
+      v-tooltip
       type="button"
-      class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
+      class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container"
       data-container="body"
       data-toggle="dropdown"
-      ref="tooltip"
       :title="title"
       :aria-label="title"
       :disabled="isLoading">
diff --git a/app/assets/javascripts/environments/components/environment_external_url.vue b/app/assets/javascripts/environments/components/environment_external_url.vue
index eaeec2bc53c..6b749814ea4 100644
--- a/app/assets/javascripts/environments/components/environment_external_url.vue
+++ b/app/assets/javascripts/environments/components/environment_external_url.vue
@@ -1,4 +1,6 @@
 <script>
+import tooltip from '../../vue_shared/directives/tooltip';
+
 /**
  * Renders the external url link in environments table.
  */
@@ -10,6 +12,10 @@ export default {
     },
   },
 
+  directives: {
+    tooltip,
+  },
+
   computed: {
     title() {
       return 'Open';
@@ -19,7 +25,8 @@ export default {
 </script>
 <template>
   <a
-    class="btn external-url has-tooltip"
+    v-tooltip
+    class="btn external-url"
     data-container="body"
     target="_blank"
     rel="noopener noreferrer nofollow"
diff --git a/app/assets/javascripts/environments/components/environment_monitoring.vue b/app/assets/javascripts/environments/components/environment_monitoring.vue
index 07cf92281a0..1655561cdd3 100644
--- a/app/assets/javascripts/environments/components/environment_monitoring.vue
+++ b/app/assets/javascripts/environments/components/environment_monitoring.vue
@@ -2,6 +2,8 @@
 /**
  * Renders the Monitoring (Metrics) link in environments table.
  */
+import tooltip from '../../vue_shared/directives/tooltip';
+
 export default {
   props: {
     monitoringUrl: {
@@ -10,6 +12,10 @@ export default {
     },
   },
 
+  directives: {
+    tooltip,
+  },
+
   computed: {
     title() {
       return 'Monitoring';
@@ -19,7 +25,8 @@ export default {
 </script>
 <template>
   <a
-    class="btn monitoring-url has-tooltip hidden-xs hidden-sm"
+    v-tooltip
+    class="btn monitoring-url hidden-xs hidden-sm"
     data-container="body"
     rel="noopener noreferrer nofollow"
     :href="monitoringUrl"
diff --git a/app/assets/javascripts/environments/components/environment_stop.vue b/app/assets/javascripts/environments/components/environment_stop.vue
index 091c543860b..85f11d2071b 100644
--- a/app/assets/javascripts/environments/components/environment_stop.vue
+++ b/app/assets/javascripts/environments/components/environment_stop.vue
@@ -5,6 +5,7 @@
  */
 import eventHub from '../event_hub';
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -14,6 +15,10 @@ export default {
     },
   },
 
+  directives: {
+    tooltip,
+  },
+
   data() {
     return {
       isLoading: false,
@@ -46,8 +51,9 @@ export default {
 </script>
 <template>
   <button
+    v-tooltip
     type="button"
-    class="btn stop-env-link has-tooltip hidden-xs hidden-sm"
+    class="btn stop-env-link hidden-xs hidden-sm"
     data-container="body"
     @click="onClick"
     :disabled="isLoading"
diff --git a/app/assets/javascripts/environments/components/environment_terminal_button.vue b/app/assets/javascripts/environments/components/environment_terminal_button.vue
index 1ca65a79951..2037bf618e3 100644
--- a/app/assets/javascripts/environments/components/environment_terminal_button.vue
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.vue
@@ -4,6 +4,7 @@
  * Used in environments table.
  */
 import terminalIconSvg from 'icons/_icon_terminal.svg';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -14,6 +15,10 @@ export default {
     },
   },
 
+  directives: {
+    tooltip,
+  },
+
   data() {
     return {
       terminalIconSvg,
@@ -29,7 +34,8 @@ export default {
 </script>
 <template>
   <a
-    class="btn terminal-button has-tooltip hidden-xs hidden-sm"
+    v-tooltip
+    class="btn terminal-button hidden-xs hidden-sm"
     data-container="body"
     :title="title"
     :aria-label="title"
diff --git a/app/assets/javascripts/issue_show/components/fields/project_move.vue b/app/assets/javascripts/issue_show/components/fields/project_move.vue
index f811fb0de24..7bf2be8b28a 100644
--- a/app/assets/javascripts/issue_show/components/fields/project_move.vue
+++ b/app/assets/javascripts/issue_show/components/fields/project_move.vue
@@ -1,10 +1,10 @@
 <script>
-  import tooltipMixin from '../../../vue_shared/mixins/tooltip';
+  import tooltip from '../../../vue_shared/directives/tooltip';
 
   export default {
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
     props: {
       formState: {
         type: Object,
@@ -71,9 +71,9 @@
         data-placeholder="Move to a different project" />
     </div>
     <span
+      v-tooltip
       data-placement="auto top"
-      title="Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location."
-      ref="tooltip">
+      title="Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.">
       <i
         class="fa fa-question-circle"
         aria-hidden="true">
diff --git a/app/assets/javascripts/pipelines/components/async_button.vue b/app/assets/javascripts/pipelines/components/async_button.vue
index abcd0c4ecea..16cc0761fc1 100644
--- a/app/assets/javascripts/pipelines/components/async_button.vue
+++ b/app/assets/javascripts/pipelines/components/async_button.vue
@@ -3,7 +3,7 @@
 
 import eventHub from '../event_hub';
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-import tooltipMixin from '../../vue_shared/mixins/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -28,12 +28,12 @@ export default {
       required: false,
     },
   },
+  directives: {
+    tooltip,
+  },
   components: {
     loadingIcon,
   },
-  mixins: [
-    tooltipMixin,
-  ],
   data() {
     return {
       isLoading: false,
@@ -58,7 +58,6 @@ export default {
     makeRequest() {
       this.isLoading = true;
 
-      $(this.$refs.tooltip).tooltip('destroy');
       eventHub.$emit('postAction', this.endpoint);
     },
   },
@@ -67,6 +66,7 @@ export default {
 
 <template>
   <button
+    v-tooltip
     type="button"
     @click="onClick"
     :class="buttonClass"
@@ -74,7 +74,6 @@ export default {
     :aria-label="title"
     data-container="body"
     data-placement="top"
-    ref="tooltip"
     :disabled="isLoading">
     <i
       :class="iconClass"
diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue
index 1f9e3d39779..54227425d2a 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -1,6 +1,6 @@
 <script>
   import getActionIcon from '../../../vue_shared/ci_action_icons';
-  import tooltipMixin from '../../../vue_shared/mixins/tooltip';
+  import tooltip from '../../../vue_shared/directives/tooltip';
 
   /**
    * Renders either a cancel, retry or play icon pointing to the given path.
@@ -29,9 +29,9 @@
       },
     },
 
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
 
     computed: {
       actionIconSvg() {
@@ -46,12 +46,11 @@
 </script>
 <template>
   <a
+    v-tooltip
     :data-method="actionMethod"
     :title="tooltipText"
     :href="link"
-    ref="tooltip"
     class="ci-action-icon-container"
-    data-toggle="tooltip"
     data-container="body">
 
     <i
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
index 19cafff4e1c..18fe1847eef 100644
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue
@@ -1,6 +1,6 @@
 <script>
   import getActionIcon from '../../../vue_shared/ci_action_icons';
-  import tooltipMixin from '../../../vue_shared/mixins/tooltip';
+  import tooltip from '../../../vue_shared/directives/tooltip';
 
   /**
    * Renders either a cancel, retry or play icon pointing to the given path.
@@ -29,9 +29,9 @@
       },
     },
 
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
 
     computed: {
       actionIconSvg() {
@@ -42,13 +42,12 @@
 </script>
 <template>
   <a
+    v-tooltip
     :data-method="actionMethod"
     :title="tooltipText"
     :href="link"
-    ref="tooltip"
     rel="nofollow"
     class="ci-action-icon-wrapper js-ci-status-icon"
-    data-toggle="tooltip"
     data-container="body"
     v-html="actionIconSvg"
     aria-label="Job's action">
diff --git a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
index d597af8dfb5..2944689a5a7 100644
--- a/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
@@ -1,7 +1,7 @@
 <script>
   import jobNameComponent from './job_name_component.vue';
   import jobComponent from './job_component.vue';
-  import tooltipMixin from '../../../vue_shared/mixins/tooltip';
+  import tooltip from '../../../vue_shared/directives/tooltip';
 
   /**
    * Renders the dropdown for the pipeline graph.
@@ -34,9 +34,9 @@
       },
     },
 
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
 
     components: {
       jobComponent,
@@ -53,12 +53,12 @@
 <template>
   <div>
     <button
+      v-tooltip
       type="button"
       data-toggle="dropdown"
       data-container="body"
       class="dropdown-menu-toggle build-content"
-      :title="tooltipText"
-      ref="tooltip">
+      :title="tooltipText">
 
       <job-name-component
         :name="job.name"
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue
index b39c936101e..1f5ed3f1074 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue
@@ -2,7 +2,7 @@
   import actionComponent from './action_component.vue';
   import dropdownActionComponent from './dropdown_action_component.vue';
   import jobNameComponent from './job_name_component.vue';
-  import tooltipMixin from '../../../vue_shared/mixins/tooltip';
+  import tooltip from '../../../vue_shared/directives/tooltip';
 
   /**
    * Renders the badge for the pipeline graph and the job's dropdown.
@@ -54,9 +54,9 @@
       jobNameComponent,
     },
 
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
 
     computed: {
       tooltipText() {
@@ -77,12 +77,11 @@
 <template>
   <div>
     <a
+      v-tooltip
       v-if="job.status.details_path"
       :href="job.status.details_path"
       :title="tooltipText"
       :class="cssClassJobName"
-      ref="tooltip"
-      data-toggle="tooltip"
       data-container="body">
 
       <job-name-component
@@ -93,10 +92,9 @@
 
     <div
       v-else
+      v-tooltip
       :title="tooltipText"
       :class="cssClassJobName"
-      ref="tooltip"
-      data-toggle="tooltip"
       data-container="body">
 
       <job-name-component
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue
index 8333ec0fbc3..2ca5ac2912f 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_url.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue
@@ -1,6 +1,6 @@
 <script>
 import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
-import tooltipMixin from '../../vue_shared/mixins/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -12,9 +12,9 @@ export default {
   components: {
     userAvatarLink,
   },
-  mixins: [
-    tooltipMixin,
-  ],
+  directives: {
+    tooltip,
+  },
   computed: {
     user() {
       return this.pipeline.user;
@@ -45,16 +45,16 @@ export default {
     <div class="label-container">
       <span
         v-if="pipeline.flags.latest"
+        v-tooltip
         class="js-pipeline-url-latest label label-success"
-        title="Latest pipeline for this branch"
-        ref="tooltip">
+        title="Latest pipeline for this branch">
         latest
       </span>
       <span
         v-if="pipeline.flags.yaml_errors"
+        v-tooltip
         class="js-pipeline-url-yaml label label-danger"
-        :title="pipeline.yaml_errors"
-        ref="tooltip">
+        :title="pipeline.yaml_errors">
         yaml invalid
       </span>
       <span
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
index a6fc4f04237..01dfe51cc17 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
@@ -4,6 +4,7 @@
   import playIconSvg from 'icons/_icon_play.svg';
   import eventHub from '../event_hub';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+  import tooltip from '../../vue_shared/directives/tooltip';
 
   export default {
     props: {
@@ -12,6 +13,9 @@
         required: true,
       },
     },
+    directives: {
+      tooltip,
+    },
     components: {
       loadingIcon,
     },
@@ -25,8 +29,6 @@
       onClickAction(endpoint) {
         this.isLoading = true;
 
-        $(this.$refs.tooltip).tooltip('destroy');
-
         eventHub.$emit('postAction', endpoint);
       },
 
@@ -43,13 +45,13 @@
 <template>
   <div class="btn-group">
     <button
+      v-tooltip
       type="button"
-      class="dropdown-new btn btn-default has-tooltip js-pipeline-dropdown-manual-actions"
+      class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
       title="Manual job"
       data-toggle="dropdown"
       data-placement="top"
       aria-label="Manual job"
-      ref="tooltip"
       :disabled="isLoading">
       <span v-html="playIconSvg"></span>
       <i
diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
index b4520481cdc..b19bd509a00 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
@@ -1,5 +1,5 @@
 <script>
-  import tooltipMixin from '../../vue_shared/mixins/tooltip';
+  import tooltip from '../../vue_shared/directives/tooltip';
 
   export default {
     props: {
@@ -8,9 +8,9 @@
         required: true,
       },
     },
-    mixins: [
-      tooltipMixin,
-    ],
+    directives: {
+      tooltip,
+    },
   };
 </script>
 <template>
@@ -18,12 +18,12 @@
     class="btn-group"
     role="group">
     <button
+      v-tooltip
       class="dropdown-toggle btn btn-default build-artifacts js-pipeline-dropdown-download"
       title="Artifacts"
       data-placement="top"
       data-toggle="dropdown"
-      aria-label="Artifacts"
-      ref="tooltip">
+      aria-label="Artifacts">
       <i
         class="fa fa-download"
         aria-hidden="true">
diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue
index c05c76c9a64..e98f35bb58c 100644
--- a/app/assets/javascripts/pipelines/components/stage.vue
+++ b/app/assets/javascripts/pipelines/components/stage.vue
@@ -16,7 +16,7 @@
 /* global Flash */
 import { borderlessStatusIconEntityMap } from '../../vue_shared/ci_status_icons';
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-import tooltipMixin from '../../vue_shared/mixins/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
 
 export default {
   props: {
@@ -32,9 +32,9 @@ export default {
     },
   },
 
-  mixins: [
-    tooltipMixin,
-  ],
+  directives: {
+    tooltip,
+  },
 
   data() {
     return {
@@ -132,7 +132,7 @@ export default {
 <template>
   <div class="dropdown">
     <button
-      ref="tooltip"
+      v-tooltip
       :class="triggerButtonClass"
       @click="onClickStage"
       class="mini-pipeline-graph-dropdown-toggle js-builds-dropdown-button"
diff --git a/app/assets/javascripts/pipelines/components/time_ago.vue b/app/assets/javascripts/pipelines/components/time_ago.vue
index be3f32afa09..037684b4e72 100644
--- a/app/assets/javascripts/pipelines/components/time_ago.vue
+++ b/app/assets/javascripts/pipelines/components/time_ago.vue
@@ -1,7 +1,7 @@
 <script>
   import iconTimerSvg from 'icons/_icon_timer.svg';
   import '../../lib/utils/datetime_utility';
-  import tooltipMixin from '../../vue_shared/mixins/tooltip';
+  import tooltip from '../../vue_shared/directives/tooltip';
   import timeagoMixin from '../../vue_shared/mixins/timeago';
 
   export default {
@@ -16,9 +16,11 @@
       },
     },
     mixins: [
-      tooltipMixin,
       timeagoMixin,
     ],
+    directives: {
+      tooltip,
+    },
     data() {
       return {
         iconTimerSvg,
@@ -81,7 +83,7 @@
         </i>
 
         <time
-          ref="tooltip"
+          v-tooltip
           data-placement="top"
           data-container="body"
           :title="tooltipTitle(finishedTime)">
diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
index 1d4d90f75b6..bdc059f4a03 100644
--- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue
+++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue
@@ -2,7 +2,7 @@
 import ciIconBadge from './ci_badge_link.vue';
 import loadingIcon from './loading_icon.vue';
 import timeagoTooltip from './time_ago_tooltip.vue';
-import tooltipMixin from '../mixins/tooltip';
+import tooltip from '../directives/tooltip';
 import userAvatarImage from './user_avatar/user_avatar_image.vue';
 
 /**
@@ -47,9 +47,9 @@ export default {
     },
   },
 
-  mixins: [
-    tooltipMixin,
-  ],
+  directives: {
+    tooltip,
+  },
 
   components: {
     ciIconBadge,
@@ -90,10 +90,10 @@ export default {
 
       <template v-if="user">
         <a
+          v-tooltip
           :href="user.path"
           :title="user.email"
-          class="js-user-link commit-committer-link"
-          ref="tooltip">
+          class="js-user-link commit-committer-link">
 
           <user-avatar-image
             :img-src="user.avatar_url"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 1a11f493b7f..5bf2a90cc3b 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -1,17 +1,17 @@
 <script>
-  import tooltipMixin from '../../mixins/tooltip';
+  import tooltip from '../../directives/tooltip';
   import toolbarButton from './toolbar_button.vue';
 
   export default {
-    mixins: [
-      tooltipMixin,
-    ],
     props: {
       previewMarkdown: {
         type: Boolean,
         required: true,
       },
     },
+    directives: {
+      tooltip,
+    },
     components: {
       toolbarButton,
     },
@@ -94,13 +94,13 @@
         </div>
         <div class="toolbar-group">
           <button
+            v-tooltip
             aria-label="Go full screen"
             class="toolbar-btn js-zen-enter"
             data-container="body"
             tabindex="-1"
             title="Go full screen"
-            type="button"
-            ref="tooltip">
+            type="button">
             <i
               aria-hidden="true"
               class="fa fa-arrows-alt fa-fw">
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
index 096be507625..f7da7ebfcfe 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
@@ -1,10 +1,7 @@
 <script>
-  import tooltipMixin from '../../mixins/tooltip';
+  import tooltip from '../../directives/tooltip';
 
   export default {
-    mixins: [
-      tooltipMixin,
-    ],
     props: {
       buttonTitle: {
         type: String,
@@ -29,6 +26,9 @@
         default: false,
       },
     },
+    directives: {
+      tooltip,
+    },
     computed: {
       iconClass() {
         return `fa-${this.icon}`;
@@ -39,10 +39,10 @@
 
 <template>
   <button
+    v-tooltip
     type="button"
     class="toolbar-btn js-md hidden-xs"
     tabindex="-1"
-    ref="tooltip"
     data-container="body"
     :data-md-tag="tag"
     :data-md-block="tagBlock"
diff --git a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
index 1c6ef071a6d..3ff7f6e2c4e 100644
--- a/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
+++ b/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
@@ -1,5 +1,5 @@
 <script>
-import tooltipMixin from '../mixins/tooltip';
+import tooltip from '../directives/tooltip';
 import timeagoMixin from '../mixins/timeago';
 import '../../lib/utils/datetime_utility';
 
@@ -28,19 +28,21 @@ export default {
   },
 
   mixins: [
-    tooltipMixin,
     timeagoMixin,
   ],
+
+  directives: {
+    tooltip,
+  },
 };
 </script>
 <template>
   <time
+    v-tooltip
     :class="cssClass"
-    class="js-vue-timeago"
     :title="tooltipTitle(time)"
     :data-placement="tooltipPlacement"
-    data-container="body"
-    ref="tooltip">
+    data-container="body">
     {{timeFormated(time)}}
   </time>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
index cd6f8c7aee4..dd9a2ebb184 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
@@ -16,11 +16,10 @@
 */
 
 import defaultAvatarUrl from 'images/no_avatar.png';
-import TooltipMixin from '../../mixins/tooltip';
+import tooltip from '../../directives/tooltip';
 
 export default {
   name: 'UserAvatarImage',
-  mixins: [TooltipMixin],
   props: {
     imgSrc: {
       type: String,
@@ -53,6 +52,9 @@ export default {
       default: 'top',
     },
   },
+  directives: {
+    tooltip,
+  },
   computed: {
     tooltipContainer() {
       return this.tooltipText ? 'body' : null;
@@ -72,6 +74,7 @@ export default {
 
 <template>
   <img
+    v-tooltip
     class="avatar"
     :class="[avatarSizeClass, cssClasses]"
     :src="imageSource"
@@ -81,6 +84,5 @@ export default {
     :data-container="tooltipContainer"
     :data-placement="tooltipPlacement"
     :title="tooltipText"
-    ref="tooltip"
   />
 </template>
diff --git a/app/assets/javascripts/vue_shared/directives/tooltip.js b/app/assets/javascripts/vue_shared/directives/tooltip.js
new file mode 100644
index 00000000000..dc896cf5c7d
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/directives/tooltip.js
@@ -0,0 +1,13 @@
+export default {
+  bind(el) {
+    $(el).tooltip();
+  },
+
+  componentUpdated(el) {
+    $(el).tooltip('fixTitle');
+  },
+
+  unbind(el) {
+    $(el).tooltip('destroy');
+  },
+};
diff --git a/app/assets/javascripts/vue_shared/mixins/tooltip.js b/app/assets/javascripts/vue_shared/mixins/tooltip.js
deleted file mode 100644
index 995c0c98505..00000000000
--- a/app/assets/javascripts/vue_shared/mixins/tooltip.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  mounted() {
-    $(this.$refs.tooltip).tooltip();
-  },
-
-  updated() {
-    $(this.$refs.tooltip).tooltip('fixTitle');
-  },
-
-  beforeDestroy() {
-    $(this.$refs.tooltip).tooltip('destroy');
-  },
-};
diff --git a/doc/development/fe_guide/style_guide_js.md b/doc/development/fe_guide/style_guide_js.md
index d2d89517241..ae844fa1051 100644
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
@@ -463,20 +463,24 @@ A forEach will cause side effects, it will be mutating the array being iterated.
   1. `destroyed`
 
 #### Vue and Boostrap
-1. Tooltips: Do not rely on `has-tooltip` class name for vue components
+1. Tooltips: Do not rely on `has-tooltip` class name for Vue components
   ```javascript
     // bad
-    <span class="has-tooltip">
+    <span
+      class="has-tooltip"
+      title="Some tooltip text">
       Text
     </span>
 
     // good
-    <span data-toggle="tooltip">
+    <span
+      v-tooltip
+      title="Some tooltip text">
       Text
     </span>
   ```
 
-1. Tooltips: When using a tooltip, include the tooltip mixin
+1. Tooltips: When using a tooltip, include the tooltip directive, `./app/assets/javascripts/vue_shared/directives/tooltip.js`
 
 1. Don't change `data-original-title`.
   ```javascript
diff --git a/spec/javascripts/environments/environment_actions_spec.js b/spec/javascripts/environments/environment_actions_spec.js
index 596d812c724..ea40a1fcd4b 100644
--- a/spec/javascripts/environments/environment_actions_spec.js
+++ b/spec/javascripts/environments/environment_actions_spec.js
@@ -32,9 +32,16 @@ describe('Actions Component', () => {
     }).$mount();
   });
 
+  describe('computed', () => {
+    it('title', () => {
+      expect(component.title).toEqual('Deploy to...');
+    });
+  });
+
   it('should render a dropdown button with icon and title attribute', () => {
     expect(component.$el.querySelector('.fa-caret-down')).toBeDefined();
-    expect(component.$el.querySelector('.dropdown-new').getAttribute('title')).toEqual('Deploy to...');
+    expect(component.$el.querySelector('.dropdown-new').getAttribute('data-original-title')).toEqual('Deploy to...');
+    expect(component.$el.querySelector('.dropdown-new').getAttribute('aria-label')).toEqual('Deploy to...');
   });
 
   it('should render a dropdown with the provided list of actions', () => {
diff --git a/spec/javascripts/environments/environment_monitoring_spec.js b/spec/javascripts/environments/environment_monitoring_spec.js
index 0f3dba66230..f8d8223967a 100644
--- a/spec/javascripts/environments/environment_monitoring_spec.js
+++ b/spec/javascripts/environments/environment_monitoring_spec.js
@@ -3,21 +3,30 @@ import monitoringComp from '~/environments/components/environment_monitoring.vue
 
 describe('Monitoring Component', () => {
   let MonitoringComponent;
+  let component;
+
+  const monitoringUrl = 'https://gitlab.com';
 
   beforeEach(() => {
     MonitoringComponent = Vue.extend(monitoringComp);
-  });
 
-  it('should render a link to environment monitoring page', () => {
-    const monitoringUrl = 'https://gitlab.com';
-    const component = new MonitoringComponent({
+    component = new MonitoringComponent({
       propsData: {
         monitoringUrl,
       },
     }).$mount();
+  });
 
+  describe('computed', () => {
+    it('title', () => {
+      expect(component.title).toEqual('Monitoring');
+    });
+  });
+
+  it('should render a link to environment monitoring page', () => {
     expect(component.$el.getAttribute('href')).toEqual(monitoringUrl);
     expect(component.$el.querySelector('.fa-area-chart')).toBeDefined();
-    expect(component.$el.getAttribute('title')).toEqual('Monitoring');
+    expect(component.$el.getAttribute('data-original-title')).toEqual('Monitoring');
+    expect(component.$el.getAttribute('aria-label')).toEqual('Monitoring');
   });
 });
diff --git a/spec/javascripts/environments/environment_stop_spec.js b/spec/javascripts/environments/environment_stop_spec.js
index 8131f1e5b11..3f95faf466a 100644
--- a/spec/javascripts/environments/environment_stop_spec.js
+++ b/spec/javascripts/environments/environment_stop_spec.js
@@ -17,8 +17,15 @@ describe('Stop Component', () => {
     }).$mount();
   });
 
+  describe('computed', () => {
+    it('title', () => {
+      expect(component.title).toEqual('Stop');
+    });
+  });
+
   it('should render a button to stop the environment', () => {
     expect(component.$el.tagName).toEqual('BUTTON');
-    expect(component.$el.getAttribute('title')).toEqual('Stop');
+    expect(component.$el.getAttribute('data-original-title')).toEqual('Stop');
+    expect(component.$el.getAttribute('aria-label')).toEqual('Stop');
   });
 });
diff --git a/spec/javascripts/environments/environment_terminal_button_spec.js b/spec/javascripts/environments/environment_terminal_button_spec.js
index 858472af4b6..f1576b19d1b 100644
--- a/spec/javascripts/environments/environment_terminal_button_spec.js
+++ b/spec/javascripts/environments/environment_terminal_button_spec.js
@@ -16,9 +16,16 @@ describe('Stop Component', () => {
     }).$mount();
   });
 
+  describe('computed', () => {
+    it('title', () => {
+      expect(component.title).toEqual('Terminal');
+    });
+  });
+
   it('should render a link to open a web terminal with the provided path', () => {
     expect(component.$el.tagName).toEqual('A');
-    expect(component.$el.getAttribute('title')).toEqual('Terminal');
+    expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
+    expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
     expect(component.$el.getAttribute('href')).toEqual(terminalPath);
   });
 });
diff --git a/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js b/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
index f3b4adc0b70..b4c1f70ed1e 100644
--- a/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
+++ b/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
@@ -22,7 +22,6 @@ describe('Time ago with tooltip component', () => {
     }).$mount();
 
     expect(vm.$el.tagName).toEqual('TIME');
-    expect(vm.$el.classList.contains('js-vue-timeago')).toEqual(true);
     expect(
       vm.$el.getAttribute('data-original-title'),
     ).toEqual(gl.utils.formatDate('2017-05-08T14:57:39.781Z'));
diff --git a/spec/javascripts/vue_shared/directives/tooltip_spec.js b/spec/javascripts/vue_shared/directives/tooltip_spec.js
new file mode 100644
index 00000000000..b1b3071527b
--- /dev/null
+++ b/spec/javascripts/vue_shared/directives/tooltip_spec.js
@@ -0,0 +1,63 @@
+import Vue from 'vue';
+import tooltip from '~/vue_shared/directives/tooltip';
+
+describe('Tooltip directive', () => {
+  let vm;
+
+  afterEach(() => {
+    if (vm) {
+      vm.$destroy();
+    }
+  });
+
+  describe('with a single tooltip', () => {
+    beforeEach(() => {
+      const SomeComponent = Vue.extend({
+        directives: {
+          tooltip,
+        },
+        template: `
+          <div
+            v-tooltip
+            title="foo">
+          </div>
+        `,
+      });
+
+      vm = new SomeComponent().$mount();
+    });
+
+    it('should have tooltip plugin applied', () => {
+      expect($(vm.$el).data('bs.tooltip')).toBeDefined();
+    });
+  });
+
+  describe('with multiple tooltips', () => {
+    beforeEach(() => {
+      const SomeComponent = Vue.extend({
+        directives: {
+          tooltip,
+        },
+        template: `
+          <div>
+            <div
+              v-tooltip
+              class="js-look-for-tooltip"
+              title="foo">
+            </div>
+            <div
+              v-tooltip
+              title="bar">
+            </div>
+          </div>
+        `,
+      });
+
+      vm = new SomeComponent().$mount();
+    });
+
+    it('should have tooltip plugin applied to all instances', () => {
+      expect($(vm.$el).find('.js-look-for-tooltip').data('bs.tooltip')).toBeDefined();
+    });
+  });
+});
-- 
cgit v1.2.1


From 6695cd9d6e5c3f56ac0626d6db565199223666b3 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 23 Jun 2017 07:36:40 +0000
Subject: Fix mobile environment detail view

---
 app/assets/stylesheets/pages/environments.scss       |  1 +
 app/assets/stylesheets/pages/pipelines.scss          |  2 +-
 app/views/projects/deployments/_deployment.html.haml | 17 +++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 89bd437b362..1046ebfa2e2 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -83,6 +83,7 @@
 
       .avatar {
         float: none;
+        margin-right: 0;
       }
     }
 
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index a85ba3a5955..9637d26e56d 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -133,7 +133,7 @@
       overflow: hidden;
       display: inline-block;
       white-space: nowrap;
-      vertical-align: top;
+      vertical-align: middle;
       text-overflow: ellipsis;
     }
 
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index 9b2ec9ae41c..26f3c297260 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -3,24 +3,25 @@
     .table-mobile-header{ role: 'rowheader' } ID
     %strong.table-mobile-content ##{deployment.iid}
 
-  .table-section.section-40{ role: 'gridcell' }
+  .table-section.section-30{ role: 'gridcell' }
     .table-mobile-header{ role: 'rowheader' } Commit
     = render 'projects/deployments/commit', deployment: deployment
 
-  .table-section.section-15.build-column{ role: 'gridcell' }
+  .table-section.section-25.build-column{ role: 'gridcell' }
     .table-mobile-header{ role: 'rowheader' } Job
     - if deployment.deployable
-      = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link table-mobile-content' do
-        #{deployment.deployable.name} (##{deployment.deployable.id})
-      - if deployment.user
-        by
-        = user_avatar(user: deployment.user, size: 20)
+      .table-mobile-content
+        = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
+          #{deployment.deployable.name} (##{deployment.deployable.id})
+        - if deployment.user
+          by
+          = user_avatar(user: deployment.user, size: 20)
 
   .table-section.section-15{ role: 'gridcell' }
     .table-mobile-header{ role: 'rowheader' } Created
     %span.table-mobile-content= time_ago_with_tooltip(deployment.created_at)
 
   .table-section.section-20.table-button-footer{ role: 'gridcell' }
-    .btn-group.table-action-button
+    .btn-group.table-action-buttons
       = render 'projects/deployments/actions', deployment: deployment
       = render 'projects/deployments/rollback', deployment: deployment
-- 
cgit v1.2.1


From 588d55646d21dbd47e439f9cb1f2b0743e88a257 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 23 Jun 2017 08:24:15 +0000
Subject: Fix offset for fixed nav

---
 app/assets/javascripts/lib/utils/common_utils.js | 11 +++++++++--
 app/assets/javascripts/merge_request_tabs.js     |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 2aca86189fd..122ec138c59 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -86,18 +86,25 @@
       // This is required to handle non-unicode characters in hash
       hash = decodeURIComponent(hash);
 
+      var fixedTabs = document.querySelector('.js-tabs-affix');
+      var fixedNav = document.querySelector('.navbar-gitlab');
+
+      var adjustment = 0;
+      if (fixedNav) adjustment -= fixedNav.offsetHeight;
+
       // scroll to user-generated markdown anchor if we cannot find a match
       if (document.getElementById(hash) === null) {
         var target = document.getElementById('user-content-' + hash);
         if (target && target.scrollIntoView) {
           target.scrollIntoView(true);
+          window.scrollBy(0, adjustment);
         }
       } else {
         // only adjust for fixedTabs when not targeting user-generated content
-        var fixedTabs = document.querySelector('.js-tabs-affix');
         if (fixedTabs) {
-          window.scrollBy(0, -fixedTabs.offsetHeight);
+          adjustment -= fixedTabs.offsetHeight;
         }
+        window.scrollBy(0, adjustment);
       }
     };
 
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index d2c64182248..786b6014dc6 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -155,7 +155,10 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
 
     scrollToElement(container) {
       if (location.hash) {
-        const offset = -$('.js-tabs-affix').outerHeight();
+        const offset = 0 - (
+          $('.navbar-gitlab').outerHeight() +
+          $('.js-tabs-affix').outerHeight()
+        );
         const $el = $(`${container} ${location.hash}:not(.match)`);
         if ($el.length) {
           $.scrollTo($el[0], { offset });
@@ -301,6 +304,7 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
               forceShow: true,
             });
             anchor[0].scrollIntoView();
+            window.gl.utils.handleLocationHash();
             // We have multiple elements on the page with `#note_xxx`
             // (discussion and diff tabs) and `:target` only applies to the first
             anchor.addClass('target');
-- 
cgit v1.2.1


From b90f1098cf42889c32eb6f12779def005f15cbae Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@gitlab.com>
Date: Thu, 22 Jun 2017 08:35:49 +0200
Subject: Add User#full_private_access? to check if user has Private access

In CE only the admin has access to all private groups & projects. In EE also an
auditor can have full private access.

To overcome merge conflicts, or accidental incorrect access rights, abstract
this out in `User#full_private_access?`.

`User#admin?` now only should be used for admin-only features. For private
access-related features `User#full_private_access?` should be used.

Backported from gitlab-org/gitlab-ee!2199
---
 app/finders/issues_finder.rb                               |  2 +-
 app/models/project_feature.rb                              |  2 +-
 app/models/user.rb                                         |  6 ++++++
 .../tc-refactor-projects-finder-init-collection.yml        |  4 ++++
 lib/gitlab/visibility_level.rb                             |  2 +-
 spec/lib/gitlab/visibility_level_spec.rb                   |  6 +++---
 spec/models/user_spec.rb                                   | 14 ++++++++++++++
 7 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/tc-refactor-projects-finder-init-collection.yml

diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index b4c074bc69c..3da5508aefd 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -41,7 +41,7 @@ class IssuesFinder < IssuableFinder
   def self.not_restricted_by_confidentiality(user)
     return Issue.where('issues.confidential IS NOT TRUE') if user.blank?
 
-    return Issue.all if user.admin?
+    return Issue.all if user.full_private_access?
 
     Issue.where('
       issues.confidential IS NOT TRUE
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb
index dde2a11440d..48edd0738ee 100644
--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -90,7 +90,7 @@ class ProjectFeature < ActiveRecord::Base
     when DISABLED
       false
     when PRIVATE
-      user && (project.team.member?(user) || user.admin?)
+      user && (project.team.member?(user) || user.full_private_access?)
     when ENABLED
       true
     else
diff --git a/app/models/user.rb b/app/models/user.rb
index 954a30155f7..9971e43146a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -984,6 +984,12 @@ class User < ActiveRecord::Base
     self.admin = (new_level == 'admin')
   end
 
+  # Does the user have access to all private groups & projects?
+  # Overridden in EE to also check auditor?
+  def full_private_access?
+    admin?
+  end
+
   def update_two_factor_requirement
     periods = expanded_groups_requiring_two_factor_authentication.pluck(:two_factor_grace_period)
 
diff --git a/changelogs/unreleased/tc-refactor-projects-finder-init-collection.yml b/changelogs/unreleased/tc-refactor-projects-finder-init-collection.yml
new file mode 100644
index 00000000000..7bcbd6468c7
--- /dev/null
+++ b/changelogs/unreleased/tc-refactor-projects-finder-init-collection.yml
@@ -0,0 +1,4 @@
+---
+title: Add User#full_private_access? to check if user has access to all private groups & projects
+merge_request: 12373
+author:
diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index 36e5b5041a6..48f3d950779 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -28,7 +28,7 @@ module Gitlab
       def levels_for_user(user = nil)
         return [PUBLIC] unless user
 
-        if user.admin?
+        if user.full_private_access?
           [PRIVATE, INTERNAL, PUBLIC]
         elsif user.external?
           [PUBLIC]
diff --git a/spec/lib/gitlab/visibility_level_spec.rb b/spec/lib/gitlab/visibility_level_spec.rb
index 84d2484cc8a..db9d2807be6 100644
--- a/spec/lib/gitlab/visibility_level_spec.rb
+++ b/spec/lib/gitlab/visibility_level_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::VisibilityLevel, lib: true do
 
   describe '.levels_for_user' do
     it 'returns all levels for an admin' do
-      user = double(:user, admin?: true)
+      user = build(:user, :admin)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::PRIVATE,
@@ -30,7 +30,7 @@ describe Gitlab::VisibilityLevel, lib: true do
     end
 
     it 'returns INTERNAL and PUBLIC for internal users' do
-      user = double(:user, admin?: false, external?: false)
+      user = build(:user)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::INTERNAL,
@@ -38,7 +38,7 @@ describe Gitlab::VisibilityLevel, lib: true do
     end
 
     it 'returns PUBLIC for external users' do
-      user = double(:user, admin?: false, external?: true)
+      user = build(:user, :external)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::PUBLIC])
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 314f8781867..8e895ec6634 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1733,6 +1733,20 @@ describe User, models: true do
     end
   end
 
+  describe '#full_private_access?' do
+    it 'returns false for regular user' do
+      user = build(:user)
+
+      expect(user.full_private_access?).to be_falsy
+    end
+
+    it 'returns true for admin user' do
+      user = build(:user, :admin)
+
+      expect(user.full_private_access?).to be_truthy
+    end
+  end
+
   describe '.ghost' do
     it "creates a ghost user if one isn't already present" do
       ghost = User.ghost
-- 
cgit v1.2.1


From 925eea26723f2a03c50b4cafab502a9a6c55c8c0 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Fri, 23 Jun 2017 09:28:19 +0000
Subject: Make JavaScript tests fail for unhandled Promise rejections

---
 .../boards/components/board_new_issue.js           |  10 +-
 app/assets/javascripts/boards/models/list.js       |   3 +-
 .../filtered_search/filtered_search_manager.js     |   4 +
 spec/javascripts/boards/board_new_issue_spec.js    | 203 ++++++++++-----------
 spec/javascripts/boards/list_spec.js               |  37 ++++
 .../filtered_search_manager_spec.js                |  58 ++++--
 spec/javascripts/issue_show/components/app_spec.js |  85 +++++----
 spec/javascripts/test_bundle.js                    |  17 ++
 8 files changed, 257 insertions(+), 160 deletions(-)

diff --git a/app/assets/javascripts/boards/components/board_new_issue.js b/app/assets/javascripts/boards/components/board_new_issue.js
index b1c47b09c35..4af8b0c7713 100644
--- a/app/assets/javascripts/boards/components/board_new_issue.js
+++ b/app/assets/javascripts/boards/components/board_new_issue.js
@@ -17,7 +17,7 @@ export default {
   methods: {
     submit(e) {
       e.preventDefault();
-      if (this.title.trim() === '') return;
+      if (this.title.trim() === '') return Promise.resolve();
 
       this.error = false;
 
@@ -29,7 +29,10 @@ export default {
         assignees: [],
       });
 
-      this.list.newIssue(issue)
+      eventHub.$emit(`scroll-board-list-${this.list.id}`);
+      this.cancel();
+
+      return this.list.newIssue(issue)
         .then(() => {
           // Need this because our jQuery very kindly disables buttons on ALL form submissions
           $(this.$refs.submitButton).enable();
@@ -47,9 +50,6 @@ export default {
           // Show error message
           this.error = true;
         });
-
-      eventHub.$emit(`scroll-board-list-${this.list.id}`);
-      this.cancel();
     },
     cancel() {
       this.title = '';
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index 548de1a4c52..b4b09b3876e 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -112,8 +112,7 @@ class List {
       .then((resp) => {
         const data = resp.json();
         issue.id = data.iid;
-      })
-      .then(() => {
+
         if (this.issuesSize > 1) {
           const moveBeforeIid = this.issues[1].id;
           gl.boardService.moveIssue(issue.id, null, null, null, moveBeforeIid);
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index c7c8d42e677..1425769d2de 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -40,6 +40,10 @@ class FilteredSearchManager {
         return [];
       })
       .then((searches) => {
+        if (!searches) {
+          return;
+        }
+
         // Put any searches that may have come in before
         // we fetched the saved searches ahead of the already saved ones
         const resultantSearches = this.recentSearchesStore.setRecentSearches(
diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js
index 832877de71c..c0a7323a505 100644
--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -12,6 +12,7 @@ import './mock_data';
 describe('Issue boards new issue form', () => {
   let vm;
   let list;
+  let newIssueMock;
   const promiseReturn = {
     json() {
       return {
@@ -21,7 +22,11 @@ describe('Issue boards new issue form', () => {
   };
 
   const submitIssue = () => {
-    vm.$el.querySelector('.btn-success').click();
+    const dummySubmitEvent = {
+      preventDefault() {},
+    };
+    vm.$refs.submitButton = vm.$el.querySelector('.btn-success');
+    return vm.submit(dummySubmitEvent);
   };
 
   beforeEach((done) => {
@@ -32,29 +37,35 @@ describe('Issue boards new issue form', () => {
     gl.issueBoards.BoardsStore.create();
     gl.IssueBoardsApp = new Vue();
 
-    setTimeout(() => {
-      list = new List(listObj);
-
-      spyOn(gl.boardService, 'newIssue').and.callFake(() => new Promise((resolve, reject) => {
-        if (vm.title === 'error') {
-          reject();
-        } else {
-          resolve(promiseReturn);
-        }
-      }));
-
-      vm = new BoardNewIssueComp({
-        propsData: {
-          list,
-        },
-      }).$mount();
-
-      done();
-    }, 0);
+    list = new List(listObj);
+
+    newIssueMock = Promise.resolve(promiseReturn);
+    spyOn(list, 'newIssue').and.callFake(() => newIssueMock);
+
+    vm = new BoardNewIssueComp({
+      propsData: {
+        list,
+      },
+    }).$mount();
+
+    Vue.nextTick()
+      .then(done)
+      .catch(done.fail);
   });
 
-  afterEach(() => {
-    Vue.http.interceptors = _.without(Vue.http.interceptors, boardsMockInterceptor);
+  it('calls submit if submit button is clicked', (done) => {
+    spyOn(vm, 'submit');
+    vm.title = 'Testing Title';
+
+    Vue.nextTick()
+      .then(() => {
+        vm.$el.querySelector('.btn-success').click();
+
+        expect(vm.submit.calls.count()).toBe(1);
+        expect(vm.$refs['submit-button']).toBe(vm.$el.querySelector('.btn-success'));
+      })
+      .then(done)
+      .catch(done.fail);
   });
 
   it('disables submit button if title is empty', () => {
@@ -64,136 +75,122 @@ describe('Issue boards new issue form', () => {
   it('enables submit button if title is not empty', (done) => {
     vm.title = 'Testing Title';
 
-    setTimeout(() => {
-      expect(vm.$el.querySelector('.form-control').value).toBe('Testing Title');
-      expect(vm.$el.querySelector('.btn-success').disabled).not.toBe(true);
-
-      done();
-    }, 0);
+    Vue.nextTick()
+      .then(() => {
+        expect(vm.$el.querySelector('.form-control').value).toBe('Testing Title');
+        expect(vm.$el.querySelector('.btn-success').disabled).not.toBe(true);
+      })
+      .then(done)
+      .catch(done.fail);
   });
 
   it('clears title after clicking cancel', (done) => {
     vm.$el.querySelector('.btn-default').click();
 
-    setTimeout(() => {
-      expect(vm.title).toBe('');
-      done();
-    }, 0);
+    Vue.nextTick()
+      .then(() => {
+        expect(vm.title).toBe('');
+      })
+      .then(done)
+      .catch(done.fail);
   });
 
   it('does not create new issue if title is empty', (done) => {
-    submitIssue();
-
-    setTimeout(() => {
-      expect(gl.boardService.newIssue).not.toHaveBeenCalled();
-      done();
-    }, 0);
+    submitIssue()
+      .then(() => {
+        expect(list.newIssue).not.toHaveBeenCalled();
+      })
+      .then(done)
+      .catch(done.fail);
   });
 
   describe('submit success', () => {
     it('creates new issue', (done) => {
       vm.title = 'submit title';
 
-      setTimeout(() => {
-        submitIssue();
-
-        expect(gl.boardService.newIssue).toHaveBeenCalled();
-        done();
-      }, 0);
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(list.newIssue).toHaveBeenCalled();
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('enables button after submit', (done) => {
       vm.title = 'submit issue';
 
-      setTimeout(() => {
-        submitIssue();
-
-        expect(vm.$el.querySelector('.btn-success').disabled).toBe(false);
-        done();
-      }, 0);
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(vm.$el.querySelector('.btn-success').disabled).toBe(false);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('clears title after submit', (done) => {
       vm.title = 'submit issue';
 
-      Vue.nextTick(() => {
-        submitIssue();
-
-        setTimeout(() => {
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
           expect(vm.title).toBe('');
-          done();
-        }, 0);
-      });
-    });
-
-    it('adds new issue to top of list after submit request', (done) => {
-      vm.title = 'submit issue';
-
-      setTimeout(() => {
-        submitIssue();
-
-        setTimeout(() => {
-          expect(list.issues.length).toBe(2);
-          expect(list.issues[0].title).toBe('submit issue');
-          expect(list.issues[0].subscribed).toBe(true);
-          done();
-        }, 0);
-      }, 0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('sets detail issue after submit', (done) => {
       expect(gl.issueBoards.BoardsStore.detail.issue.title).toBe(undefined);
       vm.title = 'submit issue';
 
-      setTimeout(() => {
-        submitIssue();
-
-        setTimeout(() => {
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
           expect(gl.issueBoards.BoardsStore.detail.issue.title).toBe('submit issue');
-          done();
-        }, 0);
-      }, 0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('sets detail list after submit', (done) => {
       vm.title = 'submit issue';
 
-      setTimeout(() => {
-        submitIssue();
-
-        setTimeout(() => {
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
           expect(gl.issueBoards.BoardsStore.detail.list.id).toBe(list.id);
-          done();
-        }, 0);
-      }, 0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
   });
 
   describe('submit error', () => {
-    it('removes issue', (done) => {
+    beforeEach(() => {
+      newIssueMock = Promise.reject(new Error('My hovercraft is full of eels!'));
       vm.title = 'error';
+    });
 
-      setTimeout(() => {
-        submitIssue();
-
-        setTimeout(() => {
+    it('removes issue', (done) => {
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
           expect(list.issues.length).toBe(1);
-          done();
-        }, 0);
-      }, 0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('shows error', (done) => {
-      vm.title = 'error';
-
-      setTimeout(() => {
-        submitIssue();
-
-        setTimeout(() => {
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
           expect(vm.error).toBe(true);
-          done();
-        }, 0);
-      }, 0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
   });
 });
diff --git a/spec/javascripts/boards/list_spec.js b/spec/javascripts/boards/list_spec.js
index 8e3d9fd77a0..db50829a276 100644
--- a/spec/javascripts/boards/list_spec.js
+++ b/spec/javascripts/boards/list_spec.js
@@ -150,4 +150,41 @@ describe('List model', () => {
       expect(list.getIssues).toHaveBeenCalled();
     });
   });
+
+  describe('newIssue', () => {
+    beforeEach(() => {
+      spyOn(gl.boardService, 'newIssue').and.returnValue(Promise.resolve({
+        json() {
+          return {
+            iid: 42,
+          };
+        },
+      }));
+    });
+
+    it('adds new issue to top of list', (done) => {
+      list.issues.push(new ListIssue({
+        title: 'Testing',
+        iid: _.random(10000),
+        confidential: false,
+        labels: [list.label],
+        assignees: [],
+      }));
+      const dummyIssue = new ListIssue({
+        title: 'new issue',
+        iid: _.random(10000),
+        confidential: false,
+        labels: [list.label],
+        assignees: [],
+      });
+
+      list.newIssue(dummyIssue)
+        .then(() => {
+          expect(list.issues.length).toBe(2);
+          expect(list.issues[0]).toBe(dummyIssue);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
 });
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
index 8d239c9cc3f..16ae649ee60 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
@@ -48,18 +48,23 @@ describe('Filtered Search Manager', () => {
       </div>
     `);
 
+    spyOn(gl.FilteredSearchDropdownManager.prototype, 'setDropdown').and.callFake(() => {});
+  });
+
+  const initializeManager = () => {
+    /* eslint-disable jasmine/no-unsafe-spy */
     spyOn(gl.FilteredSearchManager.prototype, 'loadSearchParamsFromURL').and.callFake(() => {});
     spyOn(gl.FilteredSearchManager.prototype, 'tokenChange').and.callFake(() => {});
-    spyOn(gl.FilteredSearchDropdownManager.prototype, 'setDropdown').and.callFake(() => {});
     spyOn(gl.FilteredSearchDropdownManager.prototype, 'updateDropdownOffset').and.callFake(() => {});
     spyOn(gl.utils, 'getParameterByName').and.returnValue(null);
     spyOn(gl.FilteredSearchVisualTokens, 'unselectTokens').and.callThrough();
+    /* eslint-enable jasmine/no-unsafe-spy */
 
     input = document.querySelector('.filtered-search');
     tokensContainer = document.querySelector('.tokens-container');
     manager = new gl.FilteredSearchManager();
     manager.setup();
-  });
+  };
 
   afterEach(() => {
     manager.cleanup();
@@ -67,33 +72,34 @@ describe('Filtered Search Manager', () => {
 
   describe('class constructor', () => {
     const isLocalStorageAvailable = 'isLocalStorageAvailable';
-    let filteredSearchManager;
 
     beforeEach(() => {
       spyOn(RecentSearchesService, 'isAvailable').and.returnValue(isLocalStorageAvailable);
       spyOn(recentSearchesStoreSrc, 'default');
       spyOn(RecentSearchesRoot.prototype, 'render');
-
-      filteredSearchManager = new gl.FilteredSearchManager();
-      filteredSearchManager.setup();
-
-      return filteredSearchManager;
     });
 
     it('should instantiate RecentSearchesStore with isLocalStorageAvailable', () => {
+      manager = new gl.FilteredSearchManager();
+
       expect(RecentSearchesService.isAvailable).toHaveBeenCalled();
       expect(recentSearchesStoreSrc.default).toHaveBeenCalledWith({
         isLocalStorageAvailable,
         allowedKeys: gl.FilteredSearchTokenKeys.getKeys(),
       });
     });
+  });
+
+  describe('setup', () => {
+    beforeEach(() => {
+      manager = new gl.FilteredSearchManager();
+    });
 
     it('should not instantiate Flash if an RecentSearchesServiceError is caught', () => {
       spyOn(RecentSearchesService.prototype, 'fetch').and.callFake(() => Promise.reject(new RecentSearchesServiceError()));
       spyOn(window, 'Flash');
 
-      filteredSearchManager = new gl.FilteredSearchManager();
-      filteredSearchManager.setup();
+      manager.setup();
 
       expect(window.Flash).not.toHaveBeenCalled();
     });
@@ -102,6 +108,7 @@ describe('Filtered Search Manager', () => {
   describe('searchState', () => {
     beforeEach(() => {
       spyOn(gl.FilteredSearchManager.prototype, 'search').and.callFake(() => {});
+      initializeManager();
     });
 
     it('should blur button', () => {
@@ -148,6 +155,10 @@ describe('Filtered Search Manager', () => {
   describe('search', () => {
     const defaultParams = '?scope=all&utf8=%E2%9C%93&state=opened';
 
+    beforeEach(() => {
+      initializeManager();
+    });
+
     it('should search with a single word', (done) => {
       input.value = 'searchTerm';
 
@@ -197,6 +208,10 @@ describe('Filtered Search Manager', () => {
   });
 
   describe('handleInputPlaceholder', () => {
+    beforeEach(() => {
+      initializeManager();
+    });
+
     it('should render placeholder when there is no input', () => {
       expect(input.placeholder).toEqual(placeholder);
     });
@@ -223,6 +238,10 @@ describe('Filtered Search Manager', () => {
   });
 
   describe('checkForBackspace', () => {
+    beforeEach(() => {
+      initializeManager();
+    });
+
     describe('tokens and no input', () => {
       beforeEach(() => {
         tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
@@ -260,6 +279,10 @@ describe('Filtered Search Manager', () => {
   });
 
   describe('removeToken', () => {
+    beforeEach(() => {
+      initializeManager();
+    });
+
     it('removes token even when it is already selected', () => {
       tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
         FilteredSearchSpecHelper.createFilterVisualTokenHTML('milestone', 'none', true),
@@ -291,6 +314,7 @@ describe('Filtered Search Manager', () => {
 
   describe('removeSelectedTokenKeydown', () => {
     beforeEach(() => {
+      initializeManager();
       tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
         FilteredSearchSpecHelper.createFilterVisualTokenHTML('milestone', 'none', true),
       );
@@ -344,27 +368,39 @@ describe('Filtered Search Manager', () => {
       spyOn(gl.FilteredSearchVisualTokens, 'removeSelectedToken').and.callThrough();
       spyOn(gl.FilteredSearchManager.prototype, 'handleInputPlaceholder').and.callThrough();
       spyOn(gl.FilteredSearchManager.prototype, 'toggleClearSearchButton').and.callThrough();
-      manager.removeSelectedToken();
+      initializeManager();
     });
 
     it('calls FilteredSearchVisualTokens.removeSelectedToken', () => {
+      manager.removeSelectedToken();
+
       expect(gl.FilteredSearchVisualTokens.removeSelectedToken).toHaveBeenCalled();
     });
 
     it('calls handleInputPlaceholder', () => {
+      manager.removeSelectedToken();
+
       expect(manager.handleInputPlaceholder).toHaveBeenCalled();
     });
 
     it('calls toggleClearSearchButton', () => {
+      manager.removeSelectedToken();
+
       expect(manager.toggleClearSearchButton).toHaveBeenCalled();
     });
 
     it('calls update dropdown offset', () => {
+      manager.removeSelectedToken();
+
       expect(manager.dropdownManager.updateDropdownOffset).toHaveBeenCalled();
     });
   });
 
   describe('toggleInputContainerFocus', () => {
+    beforeEach(() => {
+      initializeManager();
+    });
+
     it('toggles on focus', () => {
       input.focus();
       expect(document.querySelector('.filtered-search-box').classList.contains('focus')).toEqual(true);
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js
index 276e01fc82f..9df92318864 100644
--- a/spec/javascripts/issue_show/components/app_spec.js
+++ b/spec/javascripts/issue_show/components/app_spec.js
@@ -3,17 +3,9 @@ import '~/render_math';
 import '~/render_gfm';
 import issuableApp from '~/issue_show/components/app.vue';
 import eventHub from '~/issue_show/event_hub';
+import Poll from '~/lib/utils/poll';
 import issueShowData from '../mock_data';
 
-const issueShowInterceptor = data => (request, next) => {
-  next(request.respondWith(JSON.stringify(data), {
-    status: 200,
-    headers: {
-      'POLL-INTERVAL': 1,
-    },
-  }));
-};
-
 function formatText(text) {
   return text.trim().replace(/\s\s+/g, ' ');
 }
@@ -24,10 +16,10 @@ describe('Issuable output', () => {
   let vm;
 
   beforeEach(() => {
-    const IssuableDescriptionComponent = Vue.extend(issuableApp);
-    Vue.http.interceptors.push(issueShowInterceptor(issueShowData.initialRequest));
-
     spyOn(eventHub, '$emit');
+    spyOn(Poll.prototype, 'makeRequest');
+
+    const IssuableDescriptionComponent = Vue.extend(issuableApp);
 
     vm = new IssuableDescriptionComponent({
       propsData: {
@@ -54,9 +46,18 @@ describe('Issuable output', () => {
   });
 
   it('should render a title/description/edited and update title/description/edited on update', (done) => {
-    setTimeout(() => {
-      const editedText = vm.$el.querySelector('.edited-text');
+    vm.poll.options.successCallback({
+      json() {
+        return issueShowData.initialRequest;
+      },
+    });
 
+    let editedText;
+    Vue.nextTick()
+    .then(() => {
+      editedText = vm.$el.querySelector('.edited-text');
+    })
+    .then(() => {
       expect(document.querySelector('title').innerText).toContain('this is a title (#1)');
       expect(vm.$el.querySelector('.title').innerHTML).toContain('<p>this is a title</p>');
       expect(vm.$el.querySelector('.wiki').innerHTML).toContain('<p>this is a description!</p>');
@@ -64,22 +65,27 @@ describe('Issuable output', () => {
       expect(formatText(editedText.innerText)).toMatch(/Edited[\s\S]+?by Some User/);
       expect(editedText.querySelector('.author_link').href).toMatch(/\/some_user$/);
       expect(editedText.querySelector('time')).toBeTruthy();
-
-      Vue.http.interceptors.push(issueShowInterceptor(issueShowData.secondRequest));
-
-      setTimeout(() => {
-        expect(document.querySelector('title').innerText).toContain('2 (#1)');
-        expect(vm.$el.querySelector('.title').innerHTML).toContain('<p>2</p>');
-        expect(vm.$el.querySelector('.wiki').innerHTML).toContain('<p>42</p>');
-        expect(vm.$el.querySelector('.js-task-list-field').value).toContain('42');
-        expect(vm.$el.querySelector('.edited-text')).toBeTruthy();
-        expect(formatText(vm.$el.querySelector('.edited-text').innerText)).toMatch(/Edited[\s\S]+?by Other User/);
-        expect(editedText.querySelector('.author_link').href).toMatch(/\/other_user$/);
-        expect(editedText.querySelector('time')).toBeTruthy();
-
-        done();
+    })
+    .then(() => {
+      vm.poll.options.successCallback({
+        json() {
+          return issueShowData.secondRequest;
+        },
       });
-    });
+    })
+    .then(Vue.nextTick)
+    .then(() => {
+      expect(document.querySelector('title').innerText).toContain('2 (#1)');
+      expect(vm.$el.querySelector('.title').innerHTML).toContain('<p>2</p>');
+      expect(vm.$el.querySelector('.wiki').innerHTML).toContain('<p>42</p>');
+      expect(vm.$el.querySelector('.js-task-list-field').value).toContain('42');
+      expect(vm.$el.querySelector('.edited-text')).toBeTruthy();
+      expect(formatText(vm.$el.querySelector('.edited-text').innerText)).toMatch(/Edited[\s\S]+?by Other User/);
+      expect(editedText.querySelector('.author_link').href).toMatch(/\/other_user$/);
+      expect(editedText.querySelector('time')).toBeTruthy();
+    })
+    .then(done)
+    .catch(done.fail);
   });
 
   it('shows actions if permissions are correct', (done) => {
@@ -344,21 +350,23 @@ describe('Issuable output', () => {
 
   describe('open form', () => {
     it('shows locked warning if form is open & data is different', (done) => {
-      Vue.http.interceptors.push(issueShowInterceptor(issueShowData.initialRequest));
+      vm.poll.options.successCallback({
+        json() {
+          return issueShowData.initialRequest;
+        },
+      });
 
       Vue.nextTick()
-        .then(() => new Promise((resolve) => {
-          setTimeout(resolve);
-        }))
         .then(() => {
           vm.openForm();
 
-          Vue.http.interceptors.push(issueShowInterceptor(issueShowData.secondRequest));
-
-          return new Promise((resolve) => {
-            setTimeout(resolve);
+          vm.poll.options.successCallback({
+            json() {
+              return issueShowData.secondRequest;
+            },
           });
         })
+        .then(Vue.nextTick)
         .then(() => {
           expect(
             vm.formState.lockedWarningVisible,
@@ -367,9 +375,8 @@ describe('Issuable output', () => {
           expect(
             vm.$el.querySelector('.alert'),
           ).not.toBeNull();
-
-          done();
         })
+        .then(done)
         .catch(done.fail);
     });
   });
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index f0d51bd0902..075b72f35b2 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -22,6 +22,19 @@ window.gl = window.gl || {};
 window.gl.TEST_HOST = 'http://test.host';
 window.gon = window.gon || {};
 
+let hasUnhandledPromiseRejections = false;
+
+window.addEventListener('unhandledrejection', (event) => {
+  hasUnhandledPromiseRejections = true;
+  console.error('Unhandled promise rejection:');
+  console.error(event.reason.stack || event.reason);
+});
+
+const checkUnhandledPromiseRejections = (done) => {
+  expect(hasUnhandledPromiseRejections).toBe(false);
+  done();
+};
+
 // HACK: Chrome 59 disconnects if there are too many synchronous tests in a row
 // because it appears to lock up the thread that communicates to Karma's socket
 // This async beforeEach gets called on every spec and releases the JS thread long
@@ -63,6 +76,10 @@ testsContext.keys().forEach(function (path) {
   }
 });
 
+it('has no unhandled Promise rejections', (done) => {
+  setTimeout(checkUnhandledPromiseRejections(done), 1000);
+});
+
 // if we're generating coverage reports, make sure to include all files so
 // that we can catch files with 0% coverage
 // see: https://github.com/deepsweet/istanbul-instrumenter-loader/issues/15
-- 
cgit v1.2.1


From 5f0e7873ae71a1f4d23a1c564bf7eb8830ebd888 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 13 Jun 2017 11:32:21 +0200
Subject: ported EE user service to CE

---
 app/services/users/update_service.rb       | 24 ++++++++++++++++++++++
 spec/features/profiles/password_spec.rb    |  2 +-
 spec/models/user_spec.rb                   | 13 ++++++++++++
 spec/requests/api/users_spec.rb            | 10 ++++++++-
 spec/services/users/update_service_spec.rb | 33 ++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 app/services/users/update_service.rb
 create mode 100644 spec/services/users/update_service_spec.rb

diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
new file mode 100644
index 00000000000..ac20473b6eb
--- /dev/null
+++ b/app/services/users/update_service.rb
@@ -0,0 +1,24 @@
+module Users
+  # Service for creating a new user.
+  class UpdateService < BaseService
+    def initialize(current_user, user, params = {})
+      @current_user = current_user
+      @user = user
+      @params = params.dup
+    end
+
+    def execute(skip_authorization: false)
+      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
+
+      if @user.update_attributes(params)
+        success
+      else
+        error('Project could not be updated')
+      end
+    end
+
+    def can_update_user?
+      current_user == @user || current_user&.admin?
+    end
+  end
+end
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 2d36f3d020f..86c9df5ff86 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -25,7 +25,7 @@ describe 'Profile > Password', feature: true do
         end
       end
 
-      it 'does not contains the current password field after an error' do
+      it 'does not contain the current password field after an error' do
         fill_passwords('mypassword', 'mypassword2')
 
         expect(page).to have_no_field('user[current_password]')
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 314f8781867..25ce545a1d7 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1899,4 +1899,17 @@ describe User, models: true do
       user.invalidate_merge_request_cache_counts
     end
   end
+
+
+  describe 'audit changes' do
+    let!(:user) { create(:user) }
+
+    it 'audits an email change' do
+      expect { user.update!(email: 'test@example.com') }.to change { AuditEvent.count }.by(1)
+    end
+
+    it 'audits a password change' do
+      expect { user.update!(password: 'asdfasdf', password_confirmation: 'asdfasdf') }.to change { AuditEvent.count }.by(1)
+    end
+  end
 end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 18000d91795..a34c277112b 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -374,6 +374,7 @@ describe API::Users do
 
       expect(response).to have_http_status(200)
       expect(user.reload.password_expires_at).to be <= Time.now
+      expect(AuditEvent.count).to eq(1)
     end
 
     it "updates user with organization" do
@@ -401,6 +402,13 @@ describe API::Users do
       expect(user.reload.email).to eq(user.email)
     end
 
+    it 'updates user with a new email' do
+      put api("/users/#{user.id}", admin), email: 'new@email.com'
+      expect(response).to have_http_status(200)
+      expect(user.reload.notification_email).to eq('new@email.com')
+      expect(AuditEvent.count).to eq(1)
+    end
+
     it 'updates user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username
       expect(response).to have_http_status(200)
@@ -643,7 +651,7 @@ describe API::Users do
       email_attrs = attributes_for :email
       expect do
         post api("/users/#{user.id}/emails", admin), email_attrs
-      end.to change { user.emails.count }.by(1)
+      end.to change { user.emails.count }.by(1).and change { AuditEvent.count }.by(1)
     end
 
     it "returns a 400 for invalid ID" do
diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
new file mode 100644
index 00000000000..73af9af7507
--- /dev/null
+++ b/spec/services/users/update_service_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Users::UpdateService, services: true do
+  let(:user) { create(:user) }
+  let(:admin) { create(:admin) }
+  let(:user) { create(:empty_user, creator_id: user.id, namespace: user.namespace) }
+
+  describe '#execute' do
+    it 'updates the name' do
+      result = update_user(user, user, name: 'New Name')
+      expect(result).to eq({ status: :success })
+      expect(user.name).to eq('New Name')
+    end
+
+    context 'when updated by an admin' do
+      it 'updates the name' do
+        result = update_user(user, admin, name: 'New Name')
+        expect(result).to eq({ status: :success })
+        expect(user.name).to eq('New Name')
+      end
+    end
+
+    it 'returns an error result when record cannot be updated' do
+      result = update_user(user, create(:user), { name: 'New Name' })
+
+      expect(result).to eq({ status: :error, message: 'User could not be updated' })
+    end
+
+    def update_user(current_user, user, opts)
+      described_class.new(user, user, opts).execute
+    end
+  end
+end
-- 
cgit v1.2.1


From 11044ab1a02ffc681c46f1edb083dea163954b99 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 13 Jun 2017 13:52:20 +0200
Subject: fix spec

---
 spec/services/users/update_service_spec.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index 73af9af7507..87a3957bc3b 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Users::UpdateService, services: true do
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }
-  let(:user) { create(:empty_user, creator_id: user.id, namespace: user.namespace) }
 
   describe '#execute' do
     it 'updates the name' do
@@ -14,20 +13,20 @@ describe Users::UpdateService, services: true do
 
     context 'when updated by an admin' do
       it 'updates the name' do
-        result = update_user(user, admin, name: 'New Name')
+        result = update_user(admin, user, name: 'New Name')
         expect(result).to eq({ status: :success })
         expect(user.name).to eq('New Name')
       end
     end
 
     it 'returns an error result when record cannot be updated' do
-      result = update_user(user, create(:user), { name: 'New Name' })
-
-      expect(result).to eq({ status: :error, message: 'User could not be updated' })
+      expect do
+        update_user(user, create(:user), { name: 'New Name' })
+      end.to raise_error Gitlab::Access::AccessDeniedError
     end
 
     def update_user(current_user, user, opts)
-      described_class.new(user, user, opts).execute
+      described_class.new(current_user, user, opts).execute
     end
   end
 end
-- 
cgit v1.2.1


From cf6286313d2e5296e1009c3bcae7da50d7e438a4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 13 Jun 2017 16:24:36 +0200
Subject: added bang option to spec

---
 spec/services/users/update_service_spec.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index 87a3957bc3b..fd32a4f0f33 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -7,6 +7,7 @@ describe Users::UpdateService, services: true do
   describe '#execute' do
     it 'updates the name' do
       result = update_user(user, user, name: 'New Name')
+
       expect(result).to eq({ status: :success })
       expect(user.name).to eq('New Name')
     end
@@ -14,6 +15,7 @@ describe Users::UpdateService, services: true do
     context 'when updated by an admin' do
       it 'updates the name' do
         result = update_user(admin, user, name: 'New Name')
+
         expect(result).to eq({ status: :success })
         expect(user.name).to eq('New Name')
       end
@@ -29,4 +31,32 @@ describe Users::UpdateService, services: true do
       described_class.new(current_user, user, opts).execute
     end
   end
+
+  describe '#execute!' do
+    it 'updates the name' do
+      result = update_user(user, user, name: 'New Name')
+
+      expect(result).to be true
+      expect(user.name).to eq('New Name')
+    end
+
+    context 'when updated by an admin' do
+      it 'updates the name' do
+        result = update_user(admin, user, name: 'New Name')
+
+        expect(result).to be true
+        expect(user.name).to eq('New Name')
+      end
+    end
+
+    it 'returns an error result when record cannot be updated' do
+      expect do
+        update_user(user, create(:user), { name: 'New Name' })
+      end.to raise_error Gitlab::Access::AccessDeniedError
+    end
+
+    def update_user(current_user, user, opts)
+      described_class.new(current_user, user, opts).execute!
+    end
+  end
 end
-- 
cgit v1.2.1


From 59c3968c40a1146f5370ae3b634aac2d4a045733 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 14 Jun 2017 11:35:58 +0200
Subject: use update service on ldap call and updated specs and service

---
 app/services/users/update_service.rb | 24 ++++++++++++++++++++----
 lib/gitlab/o_auth/user.rb            |  2 +-
 spec/models/user_spec.rb             |  1 -
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index ac20473b6eb..866eb070913 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -7,16 +7,32 @@ module Users
       @params = params.dup
     end
 
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
+    def execute(skip_authorization: false, &block)
+      assign_attributes(skip_authorization, &block)
 
-      if @user.update_attributes(params)
+      if @user.save
         success
       else
-        error('Project could not be updated')
+        error('User could not be updated')
       end
     end
 
+    def execute!(skip_authorization: false, &block)
+      assign_attributes(skip_authorization, &block)
+
+      @user.save!
+    end
+
+    private
+
+    def assign_attributes(skip_authorization, &block)
+      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
+
+      yield(@user) if block_given?
+
+      @user.assign_attributes(params) if params.any?
+    end
+
     def can_update_user?
       current_user == @user || current_user&.admin?
     end
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 7307f8c2c87..8f37f96dcab 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -32,7 +32,7 @@ module Gitlab
 
         block_after_save = needs_blocking?
 
-        gl_user.save!
+        Users::UpdateService.new(gl_user, gl_user).execute!
 
         gl_user.block if block_after_save
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 25ce545a1d7..89b0eef6ae1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1900,7 +1900,6 @@ describe User, models: true do
     end
   end
 
-
   describe 'audit changes' do
     let!(:user) { create(:user) }
 
-- 
cgit v1.2.1


From 01378ab4a57dfbca589efdffb6d13e1830913106 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 14 Jun 2017 12:39:58 +0200
Subject: update profiles controller to use new service

---
 app/controllers/profiles_controller.rb | 28 ++++++++++++++++++----------
 app/services/users/update_service.rb   |  6 +++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index f98a9e24de1..09161daa7ed 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -12,39 +12,47 @@ class ProfilesController < Profiles::ApplicationController
     user_params.except!(:email) if @user.external_email?
 
     respond_to do |format|
-      if @user.update_attributes(user_params)
+      status = Users::UpdateService.new(current_user, @user, user_params).execute
+
+      if status[:success]
         message = "Profile was successfully updated"
+
         format.html { redirect_back_or_default(default: { action: 'show' }, options: { notice: message }) }
         format.json { render json: { message: message } }
       else
-        message = @user.errors.full_messages.uniq.join('. ')
-        format.html { redirect_back_or_default(default: { action: 'show' }, options: { alert: "Failed to update profile. #{message}" }) }
-        format.json { render json: { message: message }, status: :unprocessable_entity }
+        format.html { redirect_back_or_default(default: { action: 'show' }, options: { alert: status[:message] }) }
+        format.json { render json: status }
       end
     end
   end
 
   def reset_private_token
-    if current_user.reset_authentication_token!
-      flash[:notice] = "Private token was successfully reset"
+    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+      user.reset_authentication_token!
     end
 
+    flash[:notice] = "Private token was successfully reset"
+
     redirect_to profile_account_path
   end
 
   def reset_incoming_email_token
-    if current_user.reset_incoming_email_token!
-      flash[:notice] = "Incoming email token was successfully reset"
+    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+      user.reset_incoming_email_token!
     end
 
+    flash[:notice] = "Incoming email token was successfully reset"
+
     redirect_to profile_account_path
   end
 
   def reset_rss_token
-    if current_user.reset_rss_token!
-      flash[:notice] = "RSS token was successfully reset"
+    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+      user.reset_rss_token!
     end
 
+    flash[:notice] = "RSS token was successfully reset"
+
     redirect_to profile_account_path
   end
 
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 866eb070913..977124298bf 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -10,17 +10,17 @@ module Users
     def execute(skip_authorization: false, &block)
       assign_attributes(skip_authorization, &block)
 
-      if @user.save
+      if @user.save || !@user.changed?
         success
       else
-        error('User could not be updated')
+        error("User could not be updated #{@user.errors.full_messages.uniq.join('. ')}" )
       end
     end
 
     def execute!(skip_authorization: false, &block)
       assign_attributes(skip_authorization, &block)
 
-      @user.save!
+      @user.save! if @user.changed?
     end
 
     private
-- 
cgit v1.2.1


From 1c14805ff185bcc5b8a23ad081f9d7012479e30d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 14 Jun 2017 15:32:25 +0200
Subject: refactor profiles controller and update service

---
 app/controllers/profiles_controller.rb | 21 +++++++++++----------
 app/services/users/update_service.rb   |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 09161daa7ed..65098f2f223 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -12,16 +12,16 @@ class ProfilesController < Profiles::ApplicationController
     user_params.except!(:email) if @user.external_email?
 
     respond_to do |format|
-      status = Users::UpdateService.new(current_user, @user, user_params).execute
+      result = Users::UpdateService.new(current_user, @user, user_params).execute
 
-      if status[:success]
+      if result[:success]
         message = "Profile was successfully updated"
 
         format.html { redirect_back_or_default(default: { action: 'show' }, options: { notice: message }) }
         format.json { render json: { message: message } }
       else
-        format.html { redirect_back_or_default(default: { action: 'show' }, options: { alert: status[:message] }) }
-        format.json { render json: status }
+        format.html { redirect_back_or_default(default: { action: 'show' }, options: { alert: result[:message] }) }
+        format.json { render json: result }
       end
     end
   end
@@ -63,12 +63,13 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def update_username
-    if @user.update_attributes(username: user_params[:username])
-      options = { notice: "Username successfully changed" }
-    else
-      message = @user.errors.full_messages.uniq.join('. ')
-      options = { alert: "Username change failed - #{message}" }
-    end
+    result = Users::UpdateService.new(current_user, @user, username: user_params[:username]).execute
+
+    options = if result[:success]
+                { notice: "Username successfully changed" }
+              else
+                { alert: "Username change failed - #{result[:message]}" }
+              end
 
     redirect_back_or_default(default: { action: 'show' }, options: options)
   end
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 977124298bf..7062f0669f9 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -13,7 +13,7 @@ module Users
       if @user.save || !@user.changed?
         success
       else
-        error("User could not be updated #{@user.errors.full_messages.uniq.join('. ')}" )
+        error(@user.errors.full_messages.uniq.join('. '))
       end
     end
 
-- 
cgit v1.2.1


From 85b5a8cfa6b21d65ab09d2f1a4c270a85d6d1f0f Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 14 Jun 2017 17:41:19 +0200
Subject: update users controller

---
 app/controllers/admin/users_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b09eef17c23..f6af171fb04 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -125,14 +125,17 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       user.skip_reconfirmation!
-      if user.update_attributes(user_params_with_pass)
+
+      result = Users::UpdateService.new(current_user, @user, user_params_with_pass).execute
+
+      if result[:succcess]
         format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
         format.json { head :ok }
       else
         # restore username to keep form action url.
         user.username = params[:id]
         format.html { render "edit" }
-        format.json { render json: user.errors, status: :unprocessable_entity }
+        format.json { render json: result[:message], status: result[:status] }
       end
     end
   end
-- 
cgit v1.2.1


From aa158dd73189d643a5bb9cb3e9e5c519991750ac Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 15 Jun 2017 10:57:27 +0200
Subject: finish off refactoring users controller

---
 app/controllers/admin/users_controller.rb | 35 ++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f6af171fb04..dbdfd8b7e37 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -54,7 +54,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def block
-    if user.block
+    if update_user { |user| user.block }
       redirect_back_or_admin_user(notice: "Successfully blocked")
     else
       redirect_back_or_admin_user(alert: "Error occurred. User was not blocked")
@@ -64,7 +64,7 @@ class Admin::UsersController < Admin::ApplicationController
   def unblock
     if user.ldap_blocked?
       redirect_back_or_admin_user(alert: "This user cannot be unlocked manually from GitLab")
-    elsif user.activate
+    elsif update_user { |user| user.activate }
       redirect_back_or_admin_user(notice: "Successfully unblocked")
     else
       redirect_back_or_admin_user(alert: "Error occurred. User was not unblocked")
@@ -72,7 +72,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def unlock
-    if user.unlock_access!
+    if update_user { |user| user.unlock_access! }
       redirect_back_or_admin_user(alert: "Successfully unlocked")
     else
       redirect_back_or_admin_user(alert: "Error occurred. User was not unlocked")
@@ -80,7 +80,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def confirm
-    if user.confirm
+    if update_user { |user| user.confirm }
       redirect_back_or_admin_user(notice: "Successfully confirmed")
     else
       redirect_back_or_admin_user(alert: "Error occurred. User was not confirmed")
@@ -88,7 +88,8 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def disable_two_factor
-    user.disable_two_factor!
+    update_user { |user| user.disable_two_factor! }
+
     redirect_to admin_user_path(user),
       notice: 'Two-factor Authentication has been disabled for this user'
   end
@@ -126,9 +127,9 @@ class Admin::UsersController < Admin::ApplicationController
     respond_to do |format|
       user.skip_reconfirmation!
 
-      result = Users::UpdateService.new(current_user, @user, user_params_with_pass).execute
+      result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute
 
-      if result[:succcess]
+      if result[:status] == :success
         format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
         format.json { head :ok }
       else
@@ -153,11 +154,17 @@ class Admin::UsersController < Admin::ApplicationController
     email = user.emails.find(params[:email_id])
     email.destroy
 
-    user.update_secondary_emails!
+    result = Users::UpdateService.new(current_user, @user).execute do
+      user.update_secondary_emails!
+    end
 
-    respond_to do |format|
+    if result[:status] == :success
       format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
-      format.js { head :ok }
+      format.json { head :ok }
+    else
+      # restore username to keep form action url.
+      format.html { redirect_back_or_admin_user(notice: result[:message]) }
+      format.json { render json: result[:message], status: result[:status] }
     end
   end
 
@@ -205,4 +212,12 @@ class Admin::UsersController < Admin::ApplicationController
       :website_url
     ]
   end
+
+  def update_user
+    result = Users::UpdateService.new(current_user, user).execute do
+      yield(user)
+    end
+
+    result[:status] == :success
+  end
 end
-- 
cgit v1.2.1


From 968809dc2df1a83519def15068b70886309930c7 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 15 Jun 2017 10:58:29 +0200
Subject: fix profiles controller

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

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 65098f2f223..9f596c3dc9c 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -14,7 +14,7 @@ class ProfilesController < Profiles::ApplicationController
     respond_to do |format|
       result = Users::UpdateService.new(current_user, @user, user_params).execute
 
-      if result[:success]
+      if result[:status] == :success
         message = "Profile was successfully updated"
 
         format.html { redirect_back_or_default(default: { action: 'show' }, options: { notice: message }) }
@@ -65,7 +65,7 @@ class ProfilesController < Profiles::ApplicationController
   def update_username
     result = Users::UpdateService.new(current_user, @user, username: user_params[:username]).execute
 
-    options = if result[:success]
+    options = if result[:status] == :success
                 { notice: "Username successfully changed" }
               else
                 { alert: "Username change failed - #{result[:message]}" }
-- 
cgit v1.2.1


From 949808529c3d7947279eb8ff89f9644fc8505550 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 15 Jun 2017 12:36:46 +0200
Subject: updated emails, notifications and passwords controller

---
 app/controllers/profiles/emails_controller.rb      |  2 +-
 .../profiles/notifications_controller.rb           |  4 +++-
 app/controllers/profiles/passwords_controller.rb   | 22 ++++++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 5655fb2ba0e..b68ae3b0843 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -20,7 +20,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
     @email = current_user.emails.find(params[:id])
     @email.destroy
 
-    current_user.update_secondary_emails!
+    Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! }
 
     respond_to do |format|
       format.html { redirect_to profile_emails_url, status: 302 }
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index a271e2dfc4b..45d7bca27bb 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -7,7 +7,9 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
 
   def update
-    if current_user.update_attributes(user_params)
+    result = Users::UpdateService.new(current_user, current_user, user_params).execute
+
+    if result[:status] == :success
       flash[:notice] = "Notification settings saved"
     else
       flash[:alert] = "Failed to save new settings"
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 6217ec5ecef..2c4c2490735 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -15,17 +15,17 @@ class Profiles::PasswordsController < Profiles::ApplicationController
       return
     end
 
-    new_password = user_params[:password]
-    new_password_confirmation = user_params[:password_confirmation]
-
-    result = @user.update_attributes(
-      password: new_password,
-      password_confirmation: new_password_confirmation,
+    password_attributes = {
+      password: user_params[:password],
+      password_confirmation: user_params[:password_confirmation],
       password_automatically_set: false
-    )
+    }
+
+    result = Users::UpdateService.new(current_user, @user, password_attributes).execute
+
+    if result[:status] == :success
+      Users::UpdateService.new(current_user, @user, password_expires_at: nil).execute
 
-    if result
-      @user.update_attributes(password_expires_at: nil)
       redirect_to root_path, notice: 'Password successfully changed'
     else
       render :new
@@ -46,7 +46,9 @@ class Profiles::PasswordsController < Profiles::ApplicationController
       return
     end
 
-    if @user.update_attributes(password_attributes)
+    result = Users::UpdateService.new(current_user, @user, password_attributes).execute
+
+    if result[:status] == :success
       flash[:notice] = "Password was successfully updated. Please login with it"
       redirect_to new_user_session_path
     else
-- 
cgit v1.2.1


From 04bb82c8b8cb3033c805ea5158b01c09284ac3db Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 15 Jun 2017 15:24:37 +0200
Subject: update preferences controller

---
 app/controllers/profiles/preferences_controller.rb       | 4 +++-
 spec/controllers/profiles/preferences_controller_spec.rb | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index 5414142e2df..6845256e9d8 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -6,7 +6,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController
 
   def update
     begin
-      if @user.update_attributes(preferences_params)
+      result = Users::UpdateService.new(current_user, user, preferences_params).execute
+
+      if result[:status] == :success
         flash[:notice] = 'Preferences saved.'
       else
         flash[:alert] = 'Failed to save preferences.'
diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb
index 7b3aa0491c7..a5f544b4f92 100644
--- a/spec/controllers/profiles/preferences_controller_spec.rb
+++ b/spec/controllers/profiles/preferences_controller_spec.rb
@@ -43,7 +43,8 @@ describe Profiles::PreferencesController do
           dashboard: 'stars'
         }.with_indifferent_access
 
-        expect(user).to receive(:update_attributes).with(prefs)
+        expect(user).to receive(:assign_attributes).with(prefs)
+        expect(user).to receive(:save)
 
         go params: prefs
       end
@@ -51,7 +52,7 @@ describe Profiles::PreferencesController do
 
     context 'on failed update' do
       it 'sets the flash' do
-        expect(user).to receive(:update_attributes).and_return(false)
+        expect(user).to receive(:save).and_return(false)
 
         go
 
-- 
cgit v1.2.1


From ef6a4240e534f2a12dbfb45c2decd31abf9a3c26 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 15 Jun 2017 16:42:14 +0200
Subject: update notification settings, fix api specs

---
 app/services/users/update_service.rb | 2 +-
 lib/api/notification_settings.rb     | 5 ++++-
 lib/api/users.rb                     | 4 +++-
 spec/requests/api/users_spec.rb      | 4 +---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 7062f0669f9..b76950ac700 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -10,7 +10,7 @@ module Users
     def execute(skip_authorization: false, &block)
       assign_attributes(skip_authorization, &block)
 
-      if @user.save || !@user.changed?
+      if @user.save || !@user.changed? && @user.errors.empty?
         success
       else
         error(@user.errors.full_messages.uniq.join('. '))
diff --git a/lib/api/notification_settings.rb b/lib/api/notification_settings.rb
index 992ea5dc24d..5f88488ccee 100644
--- a/lib/api/notification_settings.rb
+++ b/lib/api/notification_settings.rb
@@ -34,7 +34,10 @@ module API
           notification_setting.transaction do
             new_notification_email = params.delete(:notification_email)
 
-            current_user.update(notification_email: new_notification_email) if new_notification_email
+            if new_notification_email
+              ::Users::UpdateService.new(current_user, current_user, notification_email: new_notification_email).execute
+            end
+
             notification_setting.update(declared_params(include_missing: false))
           end
         rescue ArgumentError => e # catch level enum error
diff --git a/lib/api/users.rb b/lib/api/users.rb
index c10e3364382..733b65b1c8e 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -156,7 +156,9 @@ module API
 
         user_params[:password_expires_at] = Time.now if user_params[:password].present?
 
-        if user.update_attributes(user_params.except(:extern_uid, :provider))
+        result = ::Users::UpdateService.new(current_user, user, user_params.except(:extern_uid, :provider)).execute
+
+        if result[:status] == :success
           present user, with: Entities::UserPublic
         else
           render_validation_error!(user)
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index a34c277112b..efb3dc69ea8 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -374,7 +374,6 @@ describe API::Users do
 
       expect(response).to have_http_status(200)
       expect(user.reload.password_expires_at).to be <= Time.now
-      expect(AuditEvent.count).to eq(1)
     end
 
     it "updates user with organization" do
@@ -406,7 +405,6 @@ describe API::Users do
       put api("/users/#{user.id}", admin), email: 'new@email.com'
       expect(response).to have_http_status(200)
       expect(user.reload.notification_email).to eq('new@email.com')
-      expect(AuditEvent.count).to eq(1)
     end
 
     it 'updates user with his own username' do
@@ -651,7 +649,7 @@ describe API::Users do
       email_attrs = attributes_for :email
       expect do
         post api("/users/#{user.id}/emails", admin), email_attrs
-      end.to change { user.emails.count }.by(1).and change { AuditEvent.count }.by(1)
+      end.to change { user.emails.count }.by(1)
     end
 
     it "returns a 400 for invalid ID" do
-- 
cgit v1.2.1


From 36bc2e9016b5c27e6a7afbb78235b5006d3bc9cc Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 09:30:24 +0200
Subject: fix specs

---
 app/controllers/admin/users_controller.rb | 15 ++++++++-------
 spec/models/user_spec.rb                  | 12 ------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index dbdfd8b7e37..41fe359b590 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -158,13 +158,14 @@ class Admin::UsersController < Admin::ApplicationController
       user.update_secondary_emails!
     end
 
-    if result[:status] == :success
-      format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
-      format.json { head :ok }
-    else
-      # restore username to keep form action url.
-      format.html { redirect_back_or_admin_user(notice: result[:message]) }
-      format.json { render json: result[:message], status: result[:status] }
+    respond_to do |format|
+      if result[:status] == :success
+        format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
+        format.json { head :ok }
+      else
+        format.html { redirect_back_or_admin_user(alert: result[:message]) }
+        format.json { render json: result[:message], status: result[:status] }
+      end
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 89b0eef6ae1..314f8781867 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1899,16 +1899,4 @@ describe User, models: true do
       user.invalidate_merge_request_cache_counts
     end
   end
-
-  describe 'audit changes' do
-    let!(:user) { create(:user) }
-
-    it 'audits an email change' do
-      expect { user.update!(email: 'test@example.com') }.to change { AuditEvent.count }.by(1)
-    end
-
-    it 'audits a password change' do
-      expect { user.update!(password: 'asdfasdf', password_confirmation: 'asdfasdf') }.to change { AuditEvent.count }.by(1)
-    end
-  end
 end
-- 
cgit v1.2.1


From bf3a3f3652704fb261e6220e2199830ea22ec8d3 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 10:29:43 +0200
Subject: fix api and controller issues

---
 app/controllers/admin/users_controller.rb | 4 ++--
 lib/api/users.rb                          | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 41fe359b590..754d9209138 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -154,7 +154,7 @@ class Admin::UsersController < Admin::ApplicationController
     email = user.emails.find(params[:email_id])
     email.destroy
 
-    result = Users::UpdateService.new(current_user, @user).execute do
+    result = Users::UpdateService.new(current_user, @user).execute do |user|
       user.update_secondary_emails!
     end
 
@@ -215,7 +215,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def update_user
-    result = Users::UpdateService.new(current_user, user).execute do
+    result = Users::UpdateService.new(current_user, user).execute do |user|
       yield(user)
     end
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 733b65b1c8e..ba59818ba84 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -277,7 +277,10 @@ module API
         not_found!('Email') unless email
 
         email.destroy
-        user.update_secondary_emails!
+
+        Users::UpdateService.new(current_user, user).execute do |user|
+          user.update_secondary_emails!
+        end
       end
 
       desc 'Delete a user. Available only for admins.' do
@@ -508,7 +511,9 @@ module API
         not_found!('Email') unless email
 
         email.destroy
-        current_user.update_secondary_emails!
+        Users::UpdateService.new(current_user, user).execute  do |user|
+          user.update_secondary_emails!
+        end
       end
 
       desc 'Get a list of user activities'
-- 
cgit v1.2.1


From 158550cf37cc2db9590f0212962f10ecc73082de Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 11:12:06 +0200
Subject: added service in the rest of controllers and classes

---
 app/controllers/profiles/avatars_controller.rb          | 2 +-
 app/controllers/profiles/two_factor_auths_controller.rb | 6 +++---
 app/controllers/sessions_controller.rb                  | 2 +-
 app/services/users/update_service.rb                    | 6 +++---
 lib/api/internal.rb                                     | 2 +-
 lib/api/users.rb                                        | 4 ++--
 lib/gitlab/ldap/access.rb                               | 3 ++-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb
index 933e0f3bceb..538604f8866 100644
--- a/app/controllers/profiles/avatars_controller.rb
+++ b/app/controllers/profiles/avatars_controller.rb
@@ -3,7 +3,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController
     @user = current_user
     @user.remove_avatar!
 
-    @user.save
+    Users::UpdateService.new(@user, @user).execute
 
     redirect_to profile_path, status: 302
   end
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index 313cdcd1c15..a8b7e756ad1 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -10,7 +10,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
       current_user.otp_grace_period_started_at = Time.current
     end
 
-    current_user.save! if current_user.changed?
+    Users::UpdateService.new(current_user, current_user).execute!
 
     if two_factor_authentication_required? && !current_user.two_factor_enabled?
       two_factor_authentication_reason(
@@ -43,7 +43,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
     if current_user.validate_and_consume_otp!(params[:pin_code])
       current_user.otp_required_for_login = true
       @codes = current_user.generate_otp_backup_codes!
-      current_user.save!
+      Users::UpdateService.new(current_user, current_user).execute!
 
       render 'create'
     else
@@ -71,7 +71,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def codes
     @codes = current_user.generate_otp_backup_codes!
-    current_user.save!
+    Users::UpdateService.new(current_user, current_user).execute!
   end
 
   def destroy
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 0d8186dce02..f7d9d3c80c8 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -61,7 +61,7 @@ class SessionsController < Devise::SessionsController
     return unless user && user.require_password?
 
     token = user.generate_reset_token
-    user.save
+    Users::UpdateService.new(user, user).execute
 
     redirect_to edit_user_password_path(reset_password_token: token),
       notice: "Please create a password for your new account."
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index b76950ac700..a1db1dbc583 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -1,5 +1,5 @@
 module Users
-  # Service for creating a new user.
+  # Service for updating a user.
   class UpdateService < BaseService
     def initialize(current_user, user, params = {})
       @current_user = current_user
@@ -7,10 +7,10 @@ module Users
       @params = params.dup
     end
 
-    def execute(skip_authorization: false, &block)
+    def execute(skip_authorization: false, validate: true, &block)
       assign_attributes(skip_authorization, &block)
 
-      if @user.save || !@user.changed? && @user.errors.empty?
+      if @user.save(validate: validate) || !@user.changed? && @user.errors.empty?
         success
       else
         error(@user.errors.full_messages.uniq.join('. '))
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 479ee16a611..8606ff75e11 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -133,7 +133,7 @@ module API
         end
 
         codes = user.generate_otp_backup_codes!
-        user.save!
+        ::Users::UpdateService.new(user, user).execute!
 
         { success: true, recovery_codes: codes }
       end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index ba59818ba84..2c632c85243 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -278,7 +278,7 @@ module API
 
         email.destroy
 
-        Users::UpdateService.new(current_user, user).execute do |user|
+        ::Users::UpdateService.new(current_user, user).execute do |user|
           user.update_secondary_emails!
         end
       end
@@ -511,7 +511,7 @@ module API
         not_found!('Email') unless email
 
         email.destroy
-        Users::UpdateService.new(current_user, user).execute  do |user|
+        ::Users::UpdateService.new(current_user, user).execute  do |user|
           user.update_secondary_emails!
         end
       end
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 54a5b1d31cd..7430db828a3 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -17,7 +17,8 @@ module Gitlab
         self.open(user) do |access|
           if access.allowed?
             user.last_credential_check_at = Time.now
-            user.save
+            Users::UpdateService.new(user, user).execute
+
             true
           else
             false
-- 
cgit v1.2.1


From 3798e894594c6056df5bea2daa65f10bc19843d0 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 14:07:56 +0200
Subject: add emails service specs

---
 spec/services/emails/create_service_spec.rb  | 21 +++++++++++++++++++++
 spec/services/emails/destroy_service_spec.rb | 14 ++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 spec/services/emails/create_service_spec.rb
 create mode 100644 spec/services/emails/destroy_service_spec.rb

diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb
new file mode 100644
index 00000000000..c1f477f551e
--- /dev/null
+++ b/spec/services/emails/create_service_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Emails::CreateService, services: true do
+  let(:user) { create(:user) }
+  let(:opts) { { email: 'new@email.com' } }
+
+  subject(:service) { described_class.new(user, opts) }
+
+  describe '#execute' do
+    it 'creates an email with valid attributes' do
+      expect { service.execute }.to change { Email.count }.by(1)
+      expect(Email.where(opts)).not_to be_empty
+    end
+
+    it 'has the right user association' do
+      service.execute
+
+      expect(user.emails).to eq(Email.where(opts))
+    end
+  end
+end
diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb
new file mode 100644
index 00000000000..0778b3f50da
--- /dev/null
+++ b/spec/services/emails/destroy_service_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Emails::DestroyService, services: true do
+  let!(:user) { create(:user) }
+  let!(:email) { create(:email, user: user) }
+
+  subject(:service) { described_class.new(user, opts) }
+
+  describe '#execute' do
+    it 'creates an email with valid attributes' do
+      expect { service.execute }.to change { user.emails.count }.by(-1)
+    end
+  end
+end
-- 
cgit v1.2.1


From cabbfe94fcc929a48b8bf7402cd8cb1cc00612d6 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 14:30:29 +0200
Subject: add more spec examples

---
 spec/services/emails/create_service_spec.rb  | 12 +++++++++++-
 spec/services/emails/destroy_service_spec.rb | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb
index c1f477f551e..7874da88665 100644
--- a/spec/services/emails/create_service_spec.rb
+++ b/spec/services/emails/create_service_spec.rb
@@ -4,7 +4,7 @@ describe Emails::CreateService, services: true do
   let(:user) { create(:user) }
   let(:opts) { { email: 'new@email.com' } }
 
-  subject(:service) { described_class.new(user, opts) }
+  subject(:service) { described_class.new(user, user, opts) }
 
   describe '#execute' do
     it 'creates an email with valid attributes' do
@@ -17,5 +17,15 @@ describe Emails::CreateService, services: true do
 
       expect(user.emails).to eq(Email.where(opts))
     end
+
+    it 'does not create an email if the user has no permissions' do
+      expect { described_class.new(create(:user), user, opts).execute }.not_to change { Email.count }
+    end
+
+    it 'creates an email if we skip authorization' do
+      expect do
+        described_class.new(create(:user), user, opts).execute(skip_authorization: true)
+      end.to change { Email.count }.by(1)
+    end
   end
 end
diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb
index 0778b3f50da..186726951f9 100644
--- a/spec/services/emails/destroy_service_spec.rb
+++ b/spec/services/emails/destroy_service_spec.rb
@@ -4,11 +4,21 @@ describe Emails::DestroyService, services: true do
   let!(:user) { create(:user) }
   let!(:email) { create(:email, user: user) }
 
-  subject(:service) { described_class.new(user, opts) }
+  subject(:service) { described_class.new(user, user, email: email.email) }
 
   describe '#execute' do
-    it 'creates an email with valid attributes' do
+    it 'removes an email' do
       expect { service.execute }.to change { user.emails.count }.by(-1)
     end
+
+    it 'does not remove an email if the user has no permissions' do
+      expect { described_class.new(create(:user), user, opts).execute }.not_to change { Email.count }
+    end
+
+    it 'removes an email if we skip authorization' do
+      expect do
+        described_class.new(create(:user), user, opts).execute(skip_authorization: true)
+      end.to change { Email.count }.by(-1)
+    end
   end
 end
-- 
cgit v1.2.1


From 7aaf3692b3856fa4d11bfc51ef4ab18c7405fc06 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 15:06:14 +0200
Subject: add create and destroy services for emails

---
 app/services/emails/base_service.rb    | 15 +++++++++++++++
 app/services/emails/create_service.rb  |  9 +++++++++
 app/services/emails/destroy_service.rb |  9 +++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 app/services/emails/base_service.rb
 create mode 100644 app/services/emails/create_service.rb
 create mode 100644 app/services/emails/destroy_service.rb

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
new file mode 100644
index 00000000000..0f8617c08bb
--- /dev/null
+++ b/app/services/emails/base_service.rb
@@ -0,0 +1,15 @@
+module Emails
+  class BaseService
+    def initialize(current_user, user, opts)
+      @current_user = current_user
+      @user = user
+      @email = opts[:email]
+    end
+
+    private
+
+    def can_manage_emails?
+      @current_user == @user || @current_user.admin?
+    end
+  end
+end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
new file mode 100644
index 00000000000..5d5655256fa
--- /dev/null
+++ b/app/services/emails/create_service.rb
@@ -0,0 +1,9 @@
+module Emails
+  class CreateService < BaseService
+    def execute(skip_authorization: false)
+      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
+
+      @user.emails.create!(email: @email)
+    end
+  end
+end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
new file mode 100644
index 00000000000..5080c08c473
--- /dev/null
+++ b/app/services/emails/destroy_service.rb
@@ -0,0 +1,9 @@
+module Emails
+  class DestroyService < BaseService
+    def execute(skip_authorization: false)
+      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
+
+      Email.find_by_email(@email).destroy!
+    end
+  end
+end
-- 
cgit v1.2.1


From ad44af2faaaa872ee30922699f66ac78fa402336 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 16 Jun 2017 15:14:46 +0200
Subject: fixed specs

---
 lib/api/users.rb                             | 2 +-
 spec/services/emails/create_service_spec.rb  | 2 +-
 spec/services/emails/destroy_service_spec.rb | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 2c632c85243..f79b61ad85e 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -511,7 +511,7 @@ module API
         not_found!('Email') unless email
 
         email.destroy
-        ::Users::UpdateService.new(current_user, user).execute  do |user|
+        ::Users::UpdateService.new(current_user, current_user).execute  do |user|
           user.update_secondary_emails!
         end
       end
diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb
index 7874da88665..9981f5fcc2b 100644
--- a/spec/services/emails/create_service_spec.rb
+++ b/spec/services/emails/create_service_spec.rb
@@ -19,7 +19,7 @@ describe Emails::CreateService, services: true do
     end
 
     it 'does not create an email if the user has no permissions' do
-      expect { described_class.new(create(:user), user, opts).execute }.not_to change { Email.count }
+      expect { described_class.new(create(:user), user, opts).execute }.to raise_error(Gitlab::Access::AccessDeniedError)
     end
 
     it 'creates an email if we skip authorization' do
diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb
index 186726951f9..6db050148cb 100644
--- a/spec/services/emails/destroy_service_spec.rb
+++ b/spec/services/emails/destroy_service_spec.rb
@@ -12,12 +12,14 @@ describe Emails::DestroyService, services: true do
     end
 
     it 'does not remove an email if the user has no permissions' do
-      expect { described_class.new(create(:user), user, opts).execute }.not_to change { Email.count }
+      expect do
+        described_class.new(create(:user), user, email: email.email).execute
+      end.to raise_error(Gitlab::Access::AccessDeniedError)
     end
 
     it 'removes an email if we skip authorization' do
       expect do
-        described_class.new(create(:user), user, opts).execute(skip_authorization: true)
+        described_class.new(create(:user), user, email: email.email).execute(skip_authorization: true)
       end.to change { Email.count }.by(-1)
     end
   end
-- 
cgit v1.2.1


From 3bab585bec5529c06ba4b0c4ae7e953b99edf6d3 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 19 Jun 2017 10:04:14 +0200
Subject: update to use emails destroy service

---
 app/controllers/admin/users_controller.rb     | 2 +-
 app/controllers/profiles/emails_controller.rb | 2 +-
 app/models/user.rb                            | 2 +-
 app/services/emails/destroy_service.rb        | 2 +-
 lib/api/users.rb                              | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 754d9209138..4c43d12d317 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   def remove_email
     email = user.emails.find(params[:email_id])
-    email.destroy
+    Emails::DestroyService.new(current_user, self, email: email.email).execute
 
     result = Users::UpdateService.new(current_user, @user).execute do |user|
       user.update_secondary_emails!
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index b68ae3b0843..9159c217f1b 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -18,7 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
   def destroy
     @email = current_user.emails.find(params[:id])
-    @email.destroy
+    Emails::DestroyService.new(self, self, email: @email.email).execute
 
     Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! }
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 954a30155f7..bc754768ab1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -494,7 +494,7 @@ class User < ActiveRecord::Base
   def update_emails_with_primary_email
     primary_email_record = emails.find_by(email: email)
     if primary_email_record
-      primary_email_record.destroy
+      Emails::DestroyService.new(self, self, email: email).execute
       emails.create(email: email_was)
 
       update_secondary_emails!
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 5080c08c473..c5fbc32033b 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -3,7 +3,7 @@ module Emails
     def execute(skip_authorization: false)
       raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
-      Email.find_by_email(@email).destroy!
+      Email.find_by_email(@email).destroy
     end
   end
 end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index f79b61ad85e..236bae4a299 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -276,7 +276,7 @@ module API
         email = user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        email.destroy
+        Emails::DestroyService.new(current_user, self, email: email.email).execute
 
         ::Users::UpdateService.new(current_user, user).execute do |user|
           user.update_secondary_emails!
@@ -510,7 +510,8 @@ module API
         email = current_user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        email.destroy
+        Emails::DestroyService.new(current_user, self, email: email.email).execute
+
         ::Users::UpdateService.new(current_user, current_user).execute  do |user|
           user.update_secondary_emails!
         end
-- 
cgit v1.2.1


From 87bf08c96cf9f3c451d0746d11ceac149adf22db Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 19 Jun 2017 14:51:46 +0200
Subject: fix specs

---
 app/services/emails/create_service.rb  | 2 +-
 app/services/emails/destroy_service.rb | 2 +-
 lib/api/users.rb                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 5d5655256fa..95e226ec710 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -1,5 +1,5 @@
 module Emails
-  class CreateService < BaseService
+  class CreateService < ::Emails::BaseService
     def execute(skip_authorization: false)
       raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index c5fbc32033b..1275d31efb0 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,5 +1,5 @@
 module Emails
-  class DestroyService < BaseService
+  class DestroyService < ::Emails::BaseService
     def execute(skip_authorization: false)
       raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 236bae4a299..940f8b64026 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -276,7 +276,7 @@ module API
         email = user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, self, email: email.email).execute
+        Emails::DestroyService.new(current_user, user, email: email.email).execute
 
         ::Users::UpdateService.new(current_user, user).execute do |user|
           user.update_secondary_emails!
@@ -510,7 +510,7 @@ module API
         email = current_user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, self, email: email.email).execute
+        Emails::DestroyService.new(current_user, current_user, email: email.email).execute
 
         ::Users::UpdateService.new(current_user, current_user).execute  do |user|
           user.update_secondary_emails!
-- 
cgit v1.2.1


From 831b2fccf9a2efc772d62c05f52c612f23a63ea9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 19 Jun 2017 15:35:44 +0200
Subject: update missing email actions

---
 app/controllers/profiles/emails_controller.rb |  2 +-
 app/models/user.rb                            |  2 +-
 app/services/emails/create_service.rb         |  2 +-
 lib/api/users.rb                              | 10 ++++------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 9159c217f1b..40b43278439 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -7,7 +7,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
   def create
     @email = current_user.emails.new(email_params)
 
-    if @email.save
+    if Emails::CreateService.new(current_user, current_user, email_params).execute
       NotificationService.new.new_email(@email)
     else
       flash[:alert] = @email.errors.full_messages.first
diff --git a/app/models/user.rb b/app/models/user.rb
index bc754768ab1..6ca78278db8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -495,7 +495,7 @@ class User < ActiveRecord::Base
     primary_email_record = emails.find_by(email: email)
     if primary_email_record
       Emails::DestroyService.new(self, self, email: email).execute
-      emails.create(email: email_was)
+      Emails::CreateService.new(self, self, email: email_was).execute
 
       update_secondary_emails!
     end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 95e226ec710..ea65b82e418 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -3,7 +3,7 @@ module Emails
     def execute(skip_authorization: false)
       raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
-      @user.emails.create!(email: @email)
+      @user.emails.create(email: @email)
     end
   end
 end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 940f8b64026..190e2e71884 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -98,7 +98,7 @@ module API
         authenticated_as_admin!
 
         params = declared_params(include_missing: false)
-        user = ::Users::CreateService.new(current_user, params).execute
+        user = ::Users::CreateService.new(current_user, params).execute(skip_authorization: true)
 
         if user.persisted?
           present user, with: Entities::UserPublic
@@ -236,9 +236,7 @@ module API
         user = User.find_by(id: params.delete(:id))
         not_found!('User') unless user
 
-        email = user.emails.new(declared_params(include_missing: false))
-
-        if email.save
+        if Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute(skip_authorization: true)
           NotificationService.new.new_email(email)
           present email, with: Entities::Email
         else
@@ -276,7 +274,7 @@ module API
         email = user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, user, email: email.email).execute
+        Emails::DestroyService.new(current_user, user, email: email.email).execute(skip_authorization: true)
 
         ::Users::UpdateService.new(current_user, user).execute do |user|
           user.update_secondary_emails!
@@ -494,7 +492,7 @@ module API
       post "emails" do
         email = current_user.emails.new(declared_params)
 
-        if email.save
+        if Emails::CreateService.new(current_user, current_user, declared_params).execute
           NotificationService.new.new_email(email)
           present email, with: Entities::Email
         else
-- 
cgit v1.2.1


From 0c8e7f49d1ef32ed5ea1bdd7e26dd5e169bad359 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 20 Jun 2017 09:29:36 +0200
Subject: add missing user updates

---
 app/models/user.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6ca78278db8..117f54cf312 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,7 +53,7 @@ class User < ActiveRecord::Base
     lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i)
     return unless lease.try_obtain
 
-    save(validate: false)
+    Users::UpdateService.new(self, self).execute(validate: false)
   end
 
   attr_accessor :force_random_password
@@ -965,7 +965,7 @@ class User < ActiveRecord::Base
     if attempts_exceeded?
       lock_access! unless access_locked?
     else
-      save(validate: false)
+      Users::UpdateService.new(self, self).execute(validate: false)
     end
   end
 
@@ -1123,7 +1123,8 @@ class User < ActiveRecord::Base
       email: email,
       &creation_block
     )
-    user.save(validate: false)
+
+    Users::UpdateService.new(user, user).execute(validate: false)
     user
   ensure
     Gitlab::ExclusiveLease.cancel(lease_key, uuid)
-- 
cgit v1.2.1


From 785cbb79e255c8369ca5eb916207304f39d188ad Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 08:55:07 +0200
Subject: refactor emails service

---
 app/controllers/admin/users_controller.rb     |  8 ++------
 app/controllers/profiles/emails_controller.rb |  4 +---
 app/models/user.rb                            |  2 --
 app/services/emails/destroy_service.rb        | 12 +++++++++++-
 lib/api/users.rb                              |  8 --------
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 4c43d12d317..065ebf81793 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -136,7 +136,7 @@ class Admin::UsersController < Admin::ApplicationController
         # restore username to keep form action url.
         user.username = params[:id]
         format.html { render "edit" }
-        format.json { render json: result[:message], status: result[:status] }
+        format.json { render json: [result[:message]], status: result[:status] }
       end
     end
   end
@@ -152,11 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   def remove_email
     email = user.emails.find(params[:email_id])
-    Emails::DestroyService.new(current_user, self, email: email.email).execute
-
-    result = Users::UpdateService.new(current_user, @user).execute do |user|
-      user.update_secondary_emails!
-    end
+    Emails::DestroyService.new(current_user, user, email: email.email).execute
 
     respond_to do |format|
       if result[:status] == :success
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 40b43278439..5c7a5fa9a64 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -18,9 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
   def destroy
     @email = current_user.emails.find(params[:id])
-    Emails::DestroyService.new(self, self, email: @email.email).execute
-
-    Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! }
+    Emails::DestroyService.new(current_user, current_user, email: @email.email).execute
 
     respond_to do |format|
       format.html { redirect_to profile_emails_url, status: 302 }
diff --git a/app/models/user.rb b/app/models/user.rb
index 117f54cf312..d53837fbdb2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -496,8 +496,6 @@ class User < ActiveRecord::Base
     if primary_email_record
       Emails::DestroyService.new(self, self, email: email).execute
       Emails::CreateService.new(self, self, email: email_was).execute
-
-      update_secondary_emails!
     end
   end
 
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 1275d31efb0..8150918986c 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -3,7 +3,17 @@ module Emails
     def execute(skip_authorization: false)
       raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
-      Email.find_by_email(@email).destroy
+      Email.find_by_email(@email).destroy && update_secondary_emails!
+    end
+
+    private
+
+    def update_secondary_emails!
+      result = ::Users::UpdateService.new(@current_user, @current_user).execute do |user|
+        user.update_secondary_emails!
+      end
+
+      result[:status] == 'success'
     end
   end
 end
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 190e2e71884..07e7c774f2b 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -275,10 +275,6 @@ module API
         not_found!('Email') unless email
 
         Emails::DestroyService.new(current_user, user, email: email.email).execute(skip_authorization: true)
-
-        ::Users::UpdateService.new(current_user, user).execute do |user|
-          user.update_secondary_emails!
-        end
       end
 
       desc 'Delete a user. Available only for admins.' do
@@ -509,10 +505,6 @@ module API
         not_found!('Email') unless email
 
         Emails::DestroyService.new(current_user, current_user, email: email.email).execute
-
-        ::Users::UpdateService.new(current_user, current_user).execute  do |user|
-          user.update_secondary_emails!
-        end
       end
 
       desc 'Get a list of user activities'
-- 
cgit v1.2.1


From c9fd3dc42c462ce2551f6a9630035b4df00bc366 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 11:27:37 +0200
Subject: more refactoring based on feedback

---
 app/controllers/admin/users_controller.rb               |  4 ++--
 app/controllers/profiles/avatars_controller.rb          |  5 +++--
 app/controllers/profiles/two_factor_auths_controller.rb | 12 +++++++-----
 app/controllers/sessions_controller.rb                  |  7 ++++---
 app/services/emails/base_service.rb                     |  6 ------
 app/services/emails/create_service.rb                   |  4 +---
 app/services/emails/destroy_service.rb                  |  4 +---
 app/services/users/update_service.rb                    |  6 +++---
 lib/api/internal.rb                                     |  7 ++++---
 lib/gitlab/ldap/access.rb                               |  3 +--
 spec/requests/api/users_spec.rb                         | 13 +++++++++++++
 11 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 065ebf81793..73fa21d3b3c 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -152,10 +152,10 @@ class Admin::UsersController < Admin::ApplicationController
 
   def remove_email
     email = user.emails.find(params[:email_id])
-    Emails::DestroyService.new(current_user, user, email: email.email).execute
+    success = Emails::DestroyService.new(current_user, user, email: email.email).execute
 
     respond_to do |format|
-      if result[:status] == :success
+      if success
         format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
         format.json { head :ok }
       else
diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb
index 538604f8866..cab9ea24270 100644
--- a/app/controllers/profiles/avatars_controller.rb
+++ b/app/controllers/profiles/avatars_controller.rb
@@ -1,9 +1,10 @@
 class Profiles::AvatarsController < Profiles::ApplicationController
   def destroy
     @user = current_user
-    @user.remove_avatar!
 
-    Users::UpdateService.new(@user, @user).execute
+    Users::UpdateService.new(@user, @user).execute do |user|
+      user.remove_avatar!
+    end
 
     redirect_to profile_path, status: 302
   end
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index a8b7e756ad1..95e05dff80a 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -41,9 +41,10 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
-      current_user.otp_required_for_login = true
-      @codes = current_user.generate_otp_backup_codes!
-      Users::UpdateService.new(current_user, current_user).execute!
+      Users::UpdateService.new(current_user, current_user).execute! do |user|
+        user.otp_required_for_login = true
+        @codes = user.generate_otp_backup_codes!
+      end
 
       render 'create'
     else
@@ -70,8 +71,9 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
   end
 
   def codes
-    @codes = current_user.generate_otp_backup_codes!
-    Users::UpdateService.new(current_user, current_user).execute!
+    Users::UpdateService.new(current_user, current_user).execute! do |user|
+      @codes = user.generate_otp_backup_codes!
+    end
   end
 
   def destroy
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index f7d9d3c80c8..cc9038f7607 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -60,10 +60,11 @@ class SessionsController < Devise::SessionsController
 
     return unless user && user.require_password?
 
-    token = user.generate_reset_token
-    Users::UpdateService.new(user, user).execute
+    Users::UpdateService.new(user, user).execute do |user|
+      @token = user.generate_reset_token
+    end
 
-    redirect_to edit_user_password_path(reset_password_token: token),
+    redirect_to edit_user_password_path(reset_password_token: @token),
       notice: "Please create a password for your new account."
   end
 
diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index 0f8617c08bb..8810f6d8803 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -5,11 +5,5 @@ module Emails
       @user = user
       @email = opts[:email]
     end
-
-    private
-
-    def can_manage_emails?
-      @current_user == @user || @current_user.admin?
-    end
   end
 end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index ea65b82e418..b6491ee9804 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -1,8 +1,6 @@
 module Emails
   class CreateService < ::Emails::BaseService
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
-
+    def execute
       @user.emails.create(email: @email)
     end
   end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 8150918986c..94e4167d88b 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,8 +1,6 @@
 module Emails
   class DestroyService < ::Emails::BaseService
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
-
+    def execute
       Email.find_by_email(@email).destroy && update_secondary_emails!
     end
 
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index a1db1dbc583..56e8739ab5e 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -10,7 +10,7 @@ module Users
     def execute(skip_authorization: false, validate: true, &block)
       assign_attributes(skip_authorization, &block)
 
-      if @user.save(validate: validate) || !@user.changed? && @user.errors.empty?
+      if @user.save(validate: validate) || @user.errors.empty?
         success
       else
         error(@user.errors.full_messages.uniq.join('. '))
@@ -18,9 +18,9 @@ module Users
     end
 
     def execute!(skip_authorization: false, &block)
-      assign_attributes(skip_authorization, &block)
+      result = execute(*args, &block)
 
-      @user.save! if @user.changed?
+      raise SomeCustomException(result[:message]) unless result[:status] == :success
     end
 
     private
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 8606ff75e11..ecfc822ba6a 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -132,10 +132,11 @@ module API
           return { success: false, message: 'Two-factor authentication is not enabled for this user' }
         end
 
-        codes = user.generate_otp_backup_codes!
-        ::Users::UpdateService.new(user, user).execute!
+        ::Users::UpdateService.new(user, user).execute! do |user|
+          @codes = user.generate_otp_backup_codes!
+        end
 
-        { success: true, recovery_codes: codes }
+        { success: true, recovery_codes: @codes }
       end
 
       post "/notify_post_receive" do
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 7430db828a3..998a8a7eb35 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -16,8 +16,7 @@ module Gitlab
       def self.allowed?(user)
         self.open(user) do |access|
           if access.allowed?
-            user.last_credential_check_at = Time.now
-            Users::UpdateService.new(user, user).execute
+            Users::UpdateService.new(user, user, last_credential_check_a: Time.now).execute
 
             true
           else
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index efb3dc69ea8..c0174b304c8 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -364,6 +364,7 @@ describe API::Users do
 
     it "updates user with new bio" do
       put api("/users/#{user.id}", admin), { bio: 'new test bio' }
+
       expect(response).to have_http_status(200)
       expect(json_response['bio']).to eq('new test bio')
       expect(user.reload.bio).to eq('new test bio')
@@ -396,6 +397,7 @@ describe API::Users do
 
     it 'updates user with his own email' do
       put api("/users/#{user.id}", admin), email: user.email
+
       expect(response).to have_http_status(200)
       expect(json_response['email']).to eq(user.email)
       expect(user.reload.email).to eq(user.email)
@@ -403,12 +405,14 @@ describe API::Users do
 
     it 'updates user with a new email' do
       put api("/users/#{user.id}", admin), email: 'new@email.com'
+
       expect(response).to have_http_status(200)
       expect(user.reload.notification_email).to eq('new@email.com')
     end
 
     it 'updates user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username
+
       expect(response).to have_http_status(200)
       expect(json_response['username']).to eq(user.username)
       expect(user.reload.username).to eq(user.username)
@@ -416,12 +420,14 @@ describe API::Users do
 
     it "updates user's existing identity" do
       put api("/users/#{omniauth_user.id}", admin), provider: 'ldapmain', extern_uid: '654321'
+
       expect(response).to have_http_status(200)
       expect(omniauth_user.reload.identities.first.extern_uid).to eq('654321')
     end
 
     it 'updates user with new identity' do
       put api("/users/#{user.id}", admin), provider: 'github', extern_uid: 'john'
+
       expect(response).to have_http_status(200)
       expect(user.reload.identities.first.extern_uid).to eq('john')
       expect(user.reload.identities.first.provider).to eq('github')
@@ -429,12 +435,14 @@ describe API::Users do
 
     it "updates admin status" do
       put api("/users/#{user.id}", admin), { admin: true }
+
       expect(response).to have_http_status(200)
       expect(user.reload.admin).to eq(true)
     end
 
     it "updates external status" do
       put api("/users/#{user.id}", admin), { external: true }
+
       expect(response.status).to eq 200
       expect(json_response['external']).to eq(true)
       expect(user.reload.external?).to be_truthy
@@ -442,6 +450,7 @@ describe API::Users do
 
     it "does not update admin status" do
       put api("/users/#{admin_user.id}", admin), { can_create_group: false }
+
       expect(response).to have_http_status(200)
       expect(admin_user.reload.admin).to eq(true)
       expect(admin_user.can_create_group).to eq(false)
@@ -449,6 +458,7 @@ describe API::Users do
 
     it "does not allow invalid update" do
       put api("/users/#{user.id}", admin), { email: 'invalid email' }
+
       expect(response).to have_http_status(400)
       expect(user.reload.email).not_to eq('invalid email')
     end
@@ -465,6 +475,7 @@ describe API::Users do
 
     it "returns 404 for non-existing user" do
       put api("/users/999999", admin), { bio: 'update should fail' }
+
       expect(response).to have_http_status(404)
       expect(json_response['message']).to eq('404 User Not Found')
     end
@@ -515,6 +526,7 @@ describe API::Users do
 
       it 'returns 409 conflict error if email address exists' do
         put api("/users/#{@user.id}", admin), email: 'test@example.com'
+
         expect(response).to have_http_status(409)
         expect(@user.reload.email).to eq(@user.email)
       end
@@ -522,6 +534,7 @@ describe API::Users do
       it 'returns 409 conflict error if username taken' do
         @user_id = User.all.last.id
         put api("/users/#{@user.id}", admin), username: 'test'
+
         expect(response).to have_http_status(409)
         expect(@user.reload.username).to eq(@user.username)
       end
-- 
cgit v1.2.1


From 4c75fe5dfe898b7c4882c88364df936460891e2a Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 11:37:36 +0200
Subject: add missing action to block

---
 app/controllers/admin/users_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 73fa21d3b3c..97ae68495c7 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -125,9 +125,9 @@ class Admin::UsersController < Admin::ApplicationController
     end
 
     respond_to do |format|
-      user.skip_reconfirmation!
-
-      result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute
+      result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute do |user|
+        user.skip_reconfirmation!
+      end
 
       if result[:status] == :success
         format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
-- 
cgit v1.2.1


From 0ee002c70ea3711046b8d254b5cba044762e9c05 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 12:10:28 +0200
Subject: more refactoring

---
 app/controllers/profiles/avatars_controller.rb          |  4 +---
 app/controllers/profiles/emails_controller.rb           |  5 +++--
 app/controllers/profiles/two_factor_auths_controller.rb |  3 +--
 app/services/users/update_service.rb                    |  6 ++++--
 spec/services/emails/create_service_spec.rb             | 10 ----------
 spec/services/emails/destroy_service_spec.rb            | 12 ------------
 6 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb
index cab9ea24270..851885d2224 100644
--- a/app/controllers/profiles/avatars_controller.rb
+++ b/app/controllers/profiles/avatars_controller.rb
@@ -2,9 +2,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController
   def destroy
     @user = current_user
 
-    Users::UpdateService.new(@user, @user).execute do |user|
-      user.remove_avatar!
-    end
+    Users::UpdateService.new(@user, @user).execute { |user| user.remove_avatar! }
 
     redirect_to profile_path, status: 302
   end
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 5c7a5fa9a64..7ea94c59aa7 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -5,9 +5,9 @@ class Profiles::EmailsController < Profiles::ApplicationController
   end
 
   def create
-    @email = current_user.emails.new(email_params)
+    @email = Emails::CreateService.new(current_user, current_user, email_params).execute
 
-    if Emails::CreateService.new(current_user, current_user, email_params).execute
+    if @email.errors.blank?
       NotificationService.new.new_email(@email)
     else
       flash[:alert] = @email.errors.full_messages.first
@@ -18,6 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
   def destroy
     @email = current_user.emails.find(params[:id])
+
     Emails::DestroyService.new(current_user, current_user, email: @email.email).execute
 
     respond_to do |format|
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index 95e05dff80a..b590846257b 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -41,8 +41,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
-      Users::UpdateService.new(current_user, current_user).execute! do |user|
-        user.otp_required_for_login = true
+      Users::UpdateService.new(current_user, current_user, otp_required_for_login: true).execute! do |user|
         @codes = user.generate_otp_backup_codes!
       end
 
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 56e8739ab5e..33f3686c8d5 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -17,10 +17,12 @@ module Users
       end
     end
 
-    def execute!(skip_authorization: false, &block)
+    def execute!(*args, &block)
       result = execute(*args, &block)
 
-      raise SomeCustomException(result[:message]) unless result[:status] == :success
+      raise ActiveRecord::RecordInvalid(result[:message]) unless result[:status] == :success
+
+      true
     end
 
     private
diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb
index 9981f5fcc2b..76bf35d34e8 100644
--- a/spec/services/emails/create_service_spec.rb
+++ b/spec/services/emails/create_service_spec.rb
@@ -17,15 +17,5 @@ describe Emails::CreateService, services: true do
 
       expect(user.emails).to eq(Email.where(opts))
     end
-
-    it 'does not create an email if the user has no permissions' do
-      expect { described_class.new(create(:user), user, opts).execute }.to raise_error(Gitlab::Access::AccessDeniedError)
-    end
-
-    it 'creates an email if we skip authorization' do
-      expect do
-        described_class.new(create(:user), user, opts).execute(skip_authorization: true)
-      end.to change { Email.count }.by(1)
-    end
   end
 end
diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb
index 6db050148cb..3f5192b620e 100644
--- a/spec/services/emails/destroy_service_spec.rb
+++ b/spec/services/emails/destroy_service_spec.rb
@@ -10,17 +10,5 @@ describe Emails::DestroyService, services: true do
     it 'removes an email' do
       expect { service.execute }.to change { user.emails.count }.by(-1)
     end
-
-    it 'does not remove an email if the user has no permissions' do
-      expect do
-        described_class.new(create(:user), user, email: email.email).execute
-      end.to raise_error(Gitlab::Access::AccessDeniedError)
-    end
-
-    it 'removes an email if we skip authorization' do
-      expect do
-        described_class.new(create(:user), user, email: email.email).execute(skip_authorization: true)
-      end.to change { Email.count }.by(-1)
-    end
   end
 end
-- 
cgit v1.2.1


From 12dc3992ea189452532587a2b30b8765c0f09381 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 15:55:05 +0200
Subject: fix spec failures

---
 lib/api/users.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 07e7c774f2b..6d7f2e7e250 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -236,7 +236,9 @@ module API
         user = User.find_by(id: params.delete(:id))
         not_found!('User') unless user
 
-        if Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute(skip_authorization: true)
+        email = Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute
+
+        if email.errors.blank?
           NotificationService.new.new_email(email)
           present email, with: Entities::Email
         else
@@ -274,7 +276,7 @@ module API
         email = user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, user, email: email.email).execute(skip_authorization: true)
+        Emails::DestroyService.new(current_user, user, email: email.email).execute
       end
 
       desc 'Delete a user. Available only for admins.' do
@@ -486,9 +488,9 @@ module API
         requires :email, type: String, desc: 'The new email'
       end
       post "emails" do
-        email = current_user.emails.new(declared_params)
+        email = Emails::CreateService.new(current_user, current_user, declared_params).execute
 
-        if Emails::CreateService.new(current_user, current_user, declared_params).execute
+        if email.errors.blank?
           NotificationService.new.new_email(email)
           present email, with: Entities::Email
         else
-- 
cgit v1.2.1


From e2e0b175ae43bef44ba5fdc45b4a719aaae83422 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 22 Jun 2017 16:54:54 +0200
Subject: fix specs

---
 app/controllers/admin/users_controller.rb | 6 +++---
 app/services/users/update_service.rb      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 97ae68495c7..c44f381664f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -156,11 +156,11 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       if success
-        format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") }
+        format.html { redirect_back_or_admin_user(notice: 'Successfully removed email.') }
         format.json { head :ok }
       else
-        format.html { redirect_back_or_admin_user(alert: result[:message]) }
-        format.json { render json: result[:message], status: result[:status] }
+        format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
+        format.json { render json: 'There was an error removing the e-mail.', status: 400 }
       end
     end
   end
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 33f3686c8d5..36dcc69f8cf 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -10,7 +10,7 @@ module Users
     def execute(skip_authorization: false, validate: true, &block)
       assign_attributes(skip_authorization, &block)
 
-      if @user.save(validate: validate) || @user.errors.empty?
+      if @user.save(validate: validate)
         success
       else
         error(@user.errors.full_messages.uniq.join('. '))
-- 
cgit v1.2.1


From b804db26485ea09dc93269898dc969ed692130a2 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 11:34:07 +0200
Subject: refactor update user service not to do auth checks

---
 app/controllers/admin/users_controller.rb          |  4 +--
 app/controllers/profiles/avatars_controller.rb     |  2 +-
 .../profiles/notifications_controller.rb           |  2 +-
 app/controllers/profiles/passwords_controller.rb   |  6 ++--
 app/controllers/profiles/preferences_controller.rb |  2 +-
 .../profiles/two_factor_auths_controller.rb        |  6 ++--
 app/controllers/profiles_controller.rb             | 10 +++---
 app/controllers/sessions_controller.rb             |  2 +-
 app/models/user.rb                                 |  6 ++--
 app/services/emails/destroy_service.rb             |  4 +--
 app/services/users/update_service.rb               | 17 +++-------
 lib/api/internal.rb                                |  2 +-
 lib/api/notification_settings.rb                   |  2 +-
 lib/api/users.rb                                   |  2 +-
 lib/gitlab/ldap/access.rb                          |  2 +-
 lib/gitlab/o_auth/user.rb                          |  2 +-
 spec/services/users/update_service_spec.rb         | 39 ++++++----------------
 17 files changed, 42 insertions(+), 68 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index c44f381664f..3b90cd77be0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -125,7 +125,7 @@ class Admin::UsersController < Admin::ApplicationController
     end
 
     respond_to do |format|
-      result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute do |user|
+      result = Users::UpdateService.new(user, user_params_with_pass).execute do |user|
         user.skip_reconfirmation!
       end
 
@@ -211,7 +211,7 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def update_user
-    result = Users::UpdateService.new(current_user, user).execute do |user|
+    result = Users::UpdateService.new(user).execute do |user|
       yield(user)
     end
 
diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb
index 851885d2224..408650aac54 100644
--- a/app/controllers/profiles/avatars_controller.rb
+++ b/app/controllers/profiles/avatars_controller.rb
@@ -2,7 +2,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController
   def destroy
     @user = current_user
 
-    Users::UpdateService.new(@user, @user).execute { |user| user.remove_avatar! }
+    Users::UpdateService.new(@user).execute { |user| user.remove_avatar! }
 
     redirect_to profile_path, status: 302
   end
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 45d7bca27bb..960b7512602 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -7,7 +7,7 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
 
   def update
-    result = Users::UpdateService.new(current_user, current_user, user_params).execute
+    result = Users::UpdateService.new(current_user, user_params).execute
 
     if result[:status] == :success
       flash[:notice] = "Notification settings saved"
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 2c4c2490735..10145bae0d3 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -21,10 +21,10 @@ class Profiles::PasswordsController < Profiles::ApplicationController
       password_automatically_set: false
     }
 
-    result = Users::UpdateService.new(current_user, @user, password_attributes).execute
+    result = Users::UpdateService.new(@user, password_attributes).execute
 
     if result[:status] == :success
-      Users::UpdateService.new(current_user, @user, password_expires_at: nil).execute
+      Users::UpdateService.new(@user, password_expires_at: nil).execute
 
       redirect_to root_path, notice: 'Password successfully changed'
     else
@@ -46,7 +46,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController
       return
     end
 
-    result = Users::UpdateService.new(current_user, @user, password_attributes).execute
+    result = Users::UpdateService.new(@user, password_attributes).execute
 
     if result[:status] == :success
       flash[:notice] = "Password was successfully updated. Please login with it"
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index 6845256e9d8..1e557c47638 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -6,7 +6,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
 
   def update
     begin
-      result = Users::UpdateService.new(current_user, user, preferences_params).execute
+      result = Users::UpdateService.new(user, preferences_params).execute
 
       if result[:status] == :success
         flash[:notice] = 'Preferences saved.'
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index b590846257b..1a4f77639e7 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -10,7 +10,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
       current_user.otp_grace_period_started_at = Time.current
     end
 
-    Users::UpdateService.new(current_user, current_user).execute!
+    Users::UpdateService.new(current_user).execute!
 
     if two_factor_authentication_required? && !current_user.two_factor_enabled?
       two_factor_authentication_reason(
@@ -41,7 +41,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
-      Users::UpdateService.new(current_user, current_user, otp_required_for_login: true).execute! do |user|
+      Users::UpdateService.new(current_user, otp_required_for_login: true).execute! do |user|
         @codes = user.generate_otp_backup_codes!
       end
 
@@ -70,7 +70,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
   end
 
   def codes
-    Users::UpdateService.new(current_user, current_user).execute! do |user|
+    Users::UpdateService.new(current_user).execute! do |user|
       @codes = user.generate_otp_backup_codes!
     end
   end
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 9f596c3dc9c..e4985fdb2eb 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -12,7 +12,7 @@ class ProfilesController < Profiles::ApplicationController
     user_params.except!(:email) if @user.external_email?
 
     respond_to do |format|
-      result = Users::UpdateService.new(current_user, @user, user_params).execute
+      result = Users::UpdateService.new(@user, user_params).execute
 
       if result[:status] == :success
         message = "Profile was successfully updated"
@@ -27,7 +27,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_private_token
-    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
       user.reset_authentication_token!
     end
 
@@ -37,7 +37,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_incoming_email_token
-    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
       user.reset_incoming_email_token!
     end
 
@@ -47,7 +47,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_rss_token
-    Users::UpdateService.new(current_user, @user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
       user.reset_rss_token!
     end
 
@@ -63,7 +63,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def update_username
-    result = Users::UpdateService.new(current_user, @user, username: user_params[:username]).execute
+    result = Users::UpdateService.new(@user, username: user_params[:username]).execute
 
     options = if result[:status] == :success
                 { notice: "Username successfully changed" }
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index cc9038f7607..f39441a281e 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -60,7 +60,7 @@ class SessionsController < Devise::SessionsController
 
     return unless user && user.require_password?
 
-    Users::UpdateService.new(user, user).execute do |user|
+    Users::UpdateService.new(user).execute do |user|
       @token = user.generate_reset_token
     end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d53837fbdb2..e95334e2542 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,7 +53,7 @@ class User < ActiveRecord::Base
     lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i)
     return unless lease.try_obtain
 
-    Users::UpdateService.new(self, self).execute(validate: false)
+    Users::UpdateService.new(self).execute(validate: false)
   end
 
   attr_accessor :force_random_password
@@ -963,7 +963,7 @@ class User < ActiveRecord::Base
     if attempts_exceeded?
       lock_access! unless access_locked?
     else
-      Users::UpdateService.new(self, self).execute(validate: false)
+      Users::UpdateService.new(self).execute(validate: false)
     end
   end
 
@@ -1122,7 +1122,7 @@ class User < ActiveRecord::Base
       &creation_block
     )
 
-    Users::UpdateService.new(user, user).execute(validate: false)
+    Users::UpdateService.new(user).execute(validate: false)
     user
   ensure
     Gitlab::ExclusiveLease.cancel(lease_key, uuid)
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 94e4167d88b..2032f0dc3a9 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,13 +1,13 @@
 module Emails
   class DestroyService < ::Emails::BaseService
     def execute
-      Email.find_by_email(@email).destroy && update_secondary_emails!
+      Email.find_by_email!(@email).destroy && update_secondary_emails!
     end
 
     private
 
     def update_secondary_emails!
-      result = ::Users::UpdateService.new(@current_user, @current_user).execute do |user|
+      result = ::Users::UpdateService.new(@current_user).execute do |user|
         user.update_secondary_emails!
       end
 
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 36dcc69f8cf..2037664f56a 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -1,14 +1,13 @@
 module Users
   # Service for updating a user.
   class UpdateService < BaseService
-    def initialize(current_user, user, params = {})
-      @current_user = current_user
+    def initialize(user, params = {})
       @user = user
       @params = params.dup
     end
 
-    def execute(skip_authorization: false, validate: true, &block)
-      assign_attributes(skip_authorization, &block)
+    def execute(validate: true, &block)
+      assign_attributes(&block)
 
       if @user.save(validate: validate)
         success
@@ -20,23 +19,17 @@ module Users
     def execute!(*args, &block)
       result = execute(*args, &block)
 
-      raise ActiveRecord::RecordInvalid(result[:message]) unless result[:status] == :success
+      raise ActiveRecord::RecordInvalid.new(@user) unless result[:status] == :success
 
       true
     end
 
     private
 
-    def assign_attributes(skip_authorization, &block)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_user?
-
+    def assign_attributes(&block)
       yield(@user) if block_given?
 
       @user.assign_attributes(params) if params.any?
     end
-
-    def can_update_user?
-      current_user == @user || current_user&.admin?
-    end
   end
 end
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index ecfc822ba6a..9b035808693 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -132,7 +132,7 @@ module API
           return { success: false, message: 'Two-factor authentication is not enabled for this user' }
         end
 
-        ::Users::UpdateService.new(user, user).execute! do |user|
+        ::Users::UpdateService.new(user).execute! do |user|
           @codes = user.generate_otp_backup_codes!
         end
 
diff --git a/lib/api/notification_settings.rb b/lib/api/notification_settings.rb
index 5f88488ccee..5d113c94b22 100644
--- a/lib/api/notification_settings.rb
+++ b/lib/api/notification_settings.rb
@@ -35,7 +35,7 @@ module API
             new_notification_email = params.delete(:notification_email)
 
             if new_notification_email
-              ::Users::UpdateService.new(current_user, current_user, notification_email: new_notification_email).execute
+              ::Users::UpdateService.new(current_user, notification_email: new_notification_email).execute
             end
 
             notification_setting.update(declared_params(include_missing: false))
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 6d7f2e7e250..175db3a4a18 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -156,7 +156,7 @@ module API
 
         user_params[:password_expires_at] = Time.now if user_params[:password].present?
 
-        result = ::Users::UpdateService.new(current_user, user, user_params.except(:extern_uid, :provider)).execute
+        result = ::Users::UpdateService.new(user, user_params.except(:extern_uid, :provider)).execute
 
         if result[:status] == :success
           present user, with: Entities::UserPublic
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 998a8a7eb35..8779577258b 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -16,7 +16,7 @@ module Gitlab
       def self.allowed?(user)
         self.open(user) do |access|
           if access.allowed?
-            Users::UpdateService.new(user, user, last_credential_check_a: Time.now).execute
+            Users::UpdateService.new(user, last_credential_check_a: Time.now).execute
 
             true
           else
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb
index 8f37f96dcab..b3f453e506d 100644
--- a/lib/gitlab/o_auth/user.rb
+++ b/lib/gitlab/o_auth/user.rb
@@ -32,7 +32,7 @@ module Gitlab
 
         block_after_save = needs_blocking?
 
-        Users::UpdateService.new(gl_user, gl_user).execute!
+        Users::UpdateService.new(gl_user).execute!
 
         gl_user.block if block_after_save
 
diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index fd32a4f0f33..6c33a232cb0 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -2,61 +2,42 @@ require 'spec_helper'
 
 describe Users::UpdateService, services: true do
   let(:user) { create(:user) }
-  let(:admin) { create(:admin) }
 
   describe '#execute' do
     it 'updates the name' do
-      result = update_user(user, user, name: 'New Name')
+      result = update_user(user, name: 'New Name')
 
       expect(result).to eq({ status: :success })
       expect(user.name).to eq('New Name')
     end
 
-    context 'when updated by an admin' do
-      it 'updates the name' do
-        result = update_user(admin, user, name: 'New Name')
-
-        expect(result).to eq({ status: :success })
-        expect(user.name).to eq('New Name')
-      end
-    end
-
     it 'returns an error result when record cannot be updated' do
       expect do
-        update_user(user, create(:user), { name: 'New Name' })
-      end.to raise_error Gitlab::Access::AccessDeniedError
+        update_user(user, { email: 'invalid' })
+      end.not_to change { user.reload.email }
     end
 
-    def update_user(current_user, user, opts)
-      described_class.new(current_user, user, opts).execute
+    def update_user(user, opts)
+      described_class.new(user, opts).execute
     end
   end
 
   describe '#execute!' do
     it 'updates the name' do
-      result = update_user(user, user, name: 'New Name')
+      result = update_user(user, name: 'New Name')
 
       expect(result).to be true
       expect(user.name).to eq('New Name')
     end
 
-    context 'when updated by an admin' do
-      it 'updates the name' do
-        result = update_user(admin, user, name: 'New Name')
-
-        expect(result).to be true
-        expect(user.name).to eq('New Name')
-      end
-    end
-
     it 'returns an error result when record cannot be updated' do
       expect do
-        update_user(user, create(:user), { name: 'New Name' })
-      end.to raise_error Gitlab::Access::AccessDeniedError
+        update_user(user, { email: 'invalid' })
+      end.to raise_error(ActiveRecord::RecordInvalid)
     end
 
-    def update_user(current_user, user, opts)
-      described_class.new(current_user, user, opts).execute!
+    def update_user(user, opts)
+      described_class.new(user, opts).execute!
     end
   end
 end
-- 
cgit v1.2.1


From 13d39971f33e4064bd5c8da1865cc874e1005e52 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Thu, 22 Jun 2017 14:37:59 +0200
Subject: Improve performance for pipeline charts

Achieved by using another table, which both has better indexes and
is smaller. Now the data provided for the user is more valueable too.
---
 app/controllers/projects/pipelines_controller.rb  |  5 +++++
 app/helpers/graph_helper.rb                       |  9 +++------
 app/views/projects/pipelines/charts/_overall.haml | 12 ++++--------
 changelogs/unreleased/zj-faster-charts-page.yml   |  4 ++++
 lib/ci/charts.rb                                  | 10 +++++-----
 5 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 changelogs/unreleased/zj-faster-charts-page.yml

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 8effb792689..d1bb85d5b73 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -136,6 +136,11 @@ class Projects::PipelinesController < Projects::ApplicationController
     @charts[:month] = Ci::Charts::MonthChart.new(project)
     @charts[:year] = Ci::Charts::YearChart.new(project)
     @charts[:build_times] = Ci::Charts::BuildTime.new(project)
+
+    @counts = {}
+    @counts[:total] = @project.pipelines.count(:all)
+    @counts[:success] = @project.pipelines.success.count(:all)
+    @counts[:failed] = @project.pipelines.failed.count(:all)
   end
 
   private
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb
index c2ab80f2e0d..bb7bdd82281 100644
--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
@@ -17,13 +17,10 @@ module GraphHelper
     ids.zip(parent_spaces)
   end
 
-  def success_ratio(success_builds, failed_builds)
-    failed_builds = failed_builds.count(:all)
-    success_builds = success_builds.count(:all)
+  def success_ratio(success:, failed:)
+    return 100 if failed.zero?
 
-    return 100 if failed_builds.zero?
-
-    ratio = (success_builds.to_f / (success_builds + failed_builds)) * 100
+    ratio = (success.to_f / (success + failed)) * 100
     ratio.to_i
   end
 end
diff --git a/app/views/projects/pipelines/charts/_overall.haml b/app/views/projects/pipelines/charts/_overall.haml
index 0b7e3d22dd7..6ce26424050 100644
--- a/app/views/projects/pipelines/charts/_overall.haml
+++ b/app/views/projects/pipelines/charts/_overall.haml
@@ -2,18 +2,14 @@
 %ul
   %li
     Total:
-    %strong= pluralize @project.builds.count(:all), 'job'
+    %strong= pluralize @counts[:total], 'job'
   %li
     Successful:
-    %strong= pluralize @project.builds.success.count(:all), 'job'
+    %strong= pluralize @counts[:success], 'job'
   %li
     Failed:
-    %strong= pluralize @project.builds.failed.count(:all), 'job'
+    %strong= pluralize @counts[:failed], 'job'
   %li
     Success ratio:
     %strong
-      #{success_ratio(@project.builds.success, @project.builds.failed)}%
-  %li
-    Commits covered:
-    %strong
-      = @project.pipelines.count(:all)
+      #{success_ratio(@counts)}%
diff --git a/changelogs/unreleased/zj-faster-charts-page.yml b/changelogs/unreleased/zj-faster-charts-page.yml
new file mode 100644
index 00000000000..9afcf111328
--- /dev/null
+++ b/changelogs/unreleased/zj-faster-charts-page.yml
@@ -0,0 +1,4 @@
+---
+title: Improve performance of the pipeline charts page
+merge_request: 12378
+author:
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index 6063d6f45e8..ca09410838d 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -3,7 +3,7 @@ module Ci
     module DailyInterval
       def grouped_count(query)
         query
-          .group("DATE(#{Ci::Build.table_name}.created_at)")
+          .group("DATE(#{Ci::Pipeline.table_name}.created_at)")
           .count(:created_at)
           .transform_keys { |date| date.strftime(@format) }
       end
@@ -17,12 +17,12 @@ module Ci
       def grouped_count(query)
         if Gitlab::Database.postgresql?
           query
-            .group("to_char(#{Ci::Build.table_name}.created_at, '01 Month YYYY')")
+            .group("to_char(#{Ci::Pipeline.table_name}.created_at, '01 Month YYYY')")
             .count(:created_at)
             .transform_keys(&:squish)
         else
           query
-            .group("DATE_FORMAT(#{Ci::Build.table_name}.created_at, '01 %M %Y')")
+            .group("DATE_FORMAT(#{Ci::Pipeline.table_name}.created_at, '01 %M %Y')")
             .count(:created_at)
         end
       end
@@ -46,8 +46,8 @@ module Ci
       end
 
       def collect
-        query = project.builds
-          .where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", @to, @from)
+        query = project.pipelines
+          .where("? > #{Ci::Pipeline.table_name}.created_at AND #{Ci::Pipeline.table_name}.created_at > ?", @to, @from)
 
         totals_count  = grouped_count(query)
         success_count = grouped_count(query.success)
-- 
cgit v1.2.1


From 06058787839e99c2ed84f8c8329a9ff0be0e01a2 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 23 Jun 2017 05:23:06 -0500
Subject: Remove extra symbol in notifications modal

---
 app/views/shared/notifications/_custom_notifications.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml
index 752932e6045..9186c2ba9c9 100644
--- a/app/views/shared/notifications/_custom_notifications.html.haml
+++ b/app/views/shared/notifications/_custom_notifications.html.haml
@@ -3,7 +3,7 @@
     .modal-content
       .modal-header
         %button.close{ type: "button",  "aria-label": "close", data: { dismiss: "modal" } }
-          %span{ "aria-hidden": "true" } } ×
+          %span{ "aria-hidden": "true" } ×
         %h4#custom-notifications-title.modal-title
           #{ _('Custom notification events') }
 
-- 
cgit v1.2.1


From 0b7d7df7a52a7f049ed6be3bba52a06bc051e83b Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 10:33:47 +0000
Subject: Limit the width of project READMEs

---
 app/assets/stylesheets/framework/files.scss            | 6 ++++++
 app/assets/stylesheets/framework/layout.scss           | 2 +-
 app/assets/stylesheets/framework/variables.scss        | 1 +
 app/views/projects/tree/_readme.html.haml              | 2 +-
 changelogs/unreleased/project-readme-limited-width.yml | 4 ++++
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/project-readme-limited-width.yml

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index da03e4f5b5e..31220ab438e 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -12,6 +12,12 @@
 
   &.readme-holder {
     margin: $gl-padding 0;
+
+    &.limited-width-container .file-content {
+      max-width: $limited-layout-width-sm;
+      margin-left: auto;
+      margin-right: auto;
+    }
   }
 
   table {
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 49bff23452d..4a9d41b4fda 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -53,7 +53,7 @@ body {
   }
 
   &.limit-container-width-sm {
-    max-width: 790px;
+    max-width: $limited-layout-width-sm;
   }
 }
 
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 13c9c6c9fb3..476427c1593 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -161,6 +161,7 @@ $progress-color: #c0392b;
 $header-height: 50px;
 $fixed-layout-width: 1280px;
 $limited-layout-width: 990px;
+$limited-layout-width-sm: 790px;
 $gl-avatar-size: 40px;
 $error-exclamation-point: $red-500;
 $border-radius-default: 3px;
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index de57cd4ba00..f9147815427 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,5 +1,5 @@
 - if readme.rich_viewer
-  %article.file-holder.readme-holder
+  %article.file-holder.readme-holder{ class: ("limited-width-container" unless fluid_layout) }
     .js-file-title.file-title
       = blob_icon readme.mode, readme.name
       = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path)) do
diff --git a/changelogs/unreleased/project-readme-limited-width.yml b/changelogs/unreleased/project-readme-limited-width.yml
new file mode 100644
index 00000000000..17d87a5691e
--- /dev/null
+++ b/changelogs/unreleased/project-readme-limited-width.yml
@@ -0,0 +1,4 @@
+---
+title: Limit the width of the projects README text
+merge_request:
+author:
-- 
cgit v1.2.1


From c516ed4ed27e482200cd42828de2e706b238d852 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 11:37:29 +0100
Subject: updates to spacing & alignment combine logo & wordmark mobile
 improvements

---
 app/assets/stylesheets/framework/header.scss |  6 +++
 app/assets/stylesheets/new_nav.scss          | 79 ++++++++++++++++++++++++----
 app/views/layouts/header/_new.html.haml      | 10 ++--
 app/views/layouts/header/_new_dropdown.haml  |  8 ++-
 4 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 0f60a071d53..5bd6c095109 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -98,6 +98,12 @@ header {
           font-size: 14px;
         }
 
+        .fa-chevron-down {
+          position: relative;
+          top: -3px;
+          font-size: 10px;
+        }
+
         svg {
           position: relative;
           top: 2px;
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index 8d280cbe305..3c086ef15d1 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -5,6 +5,7 @@
 header.navbar-gitlab-new {
   color: $gray-normal;
   background-color: $purple-900;
+  border-bottom: 0;
 
   .header-content {
     padding-left: 0;
@@ -15,19 +16,37 @@ header.navbar-gitlab-new {
     }
 
     .title {
-      padding-top: 14px;
-      padding-right: 9px;
+      display: block;
+      height: 100%;
+      padding-right: 0;
       color: currentColor;
 
-      @media (min-width: $screen-sm-min) {
-        padding-right: $gl-padding;
-      }
+      > a {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        padding-top: 3px;
+        padding-left: 9px;
+        padding-right: 9px;
+        margin-left: -9px;
+        border-bottom: 3px solid transparent;
+
+        @media (min-width: $screen-sm-min) {
+          padding-right: $gl-padding;
+          padding-left: $gl-padding;
+          margin-left: -16px;
+        }
+
+        svg {
+          margin-top: -3px;
+          margin-right: 10px;
+        }
 
-      a {
         &:hover,
         &:focus {
           color: currentColor;
           text-decoration: none;
+          border-bottom-color: $white-light;
         }
       }
     }
@@ -52,6 +71,20 @@ header.navbar-gitlab-new {
   .navbar-collapse {
     padding-left: 0;
     color: $white-light;
+
+    @media (max-width: $screen-xs-max) {
+      margin-left: -$gl-padding;
+      margin-right: -10px;
+    }
+
+    .nav {
+      > li:not(.hidden-xs) a {
+        @media (max-width: $screen-xs-max) {
+          margin-left: 0;
+          min-width: 100%;
+        }
+      }
+    }
   }
 
   .container-fluid {
@@ -76,6 +109,12 @@ header.navbar-gitlab-new {
       @media (max-width: $screen-xs-max) {
         padding-right: 10px;
       }
+
+      li {
+        .badge {
+          box-shadow: none;
+        }
+      }
     }
 
     .nav > li > a {
@@ -90,6 +129,12 @@ header.navbar-gitlab-new {
         > svg {
           fill: $white-light;
         }
+
+        &.header-user-dropdown-toggle {
+          .header-user-avatar {
+            border: 0;
+          }
+        }
       }
     }
   }
@@ -127,11 +172,14 @@ header.navbar-gitlab-new {
   }
 
   .dropdown-chevron {
+    position: relative;
+    top: -1px;
     font-size: 10px;
   }
 }
 
-.header-user .dropdown-menu-nav {
+.header-user .dropdown-menu-nav,
+.header-new .dropdown-menu-nav {
   margin-top: 4px;
 }
 
@@ -140,7 +188,8 @@ header.navbar-gitlab-new {
     border-color: $purple-800;
 
     &:hover {
-      border-color: rgba($white-light, .5);
+      border-color: rgba($white-light, .6);
+      box-shadow: none;
     }
   }
 
@@ -158,7 +207,7 @@ header.navbar-gitlab-new {
   }
 
   .search-input::placeholder {
-    color: $white-light;
+    color: rgba($white-light, .6);
   }
 
   .location-badge {
@@ -166,9 +215,19 @@ header.navbar-gitlab-new {
     background-color: $purple-900;
   }
 
+  .search-input-wrap {
+    .search-icon {
+      color: rgba($white-light, .6);
+    }
+  }
+
   &.search-active {
     .search-input-wrap {
-      i {
+      .search-icon {
+        color: rgba($white-light, .6);
+      }
+
+      .clear-icon {
         color: $white-light;
       }
     }
diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml
index 7aa12657c03..c0833c64911 100644
--- a/app/views/layouts/header/_new.html.haml
+++ b/app/views/layouts/header/_new.html.haml
@@ -2,14 +2,12 @@
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
     .header-content
-      .header-logo
-        = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do
-          = brand_header_logo
-
       .title-container
         %h1.title
           = link_to root_path, title: 'Dashboard' do
-            GitLab
+            = brand_header_logo
+            %span.hidden-xs
+              GitLab
 
         - if current_user
           = render "layouts/nav/new_dashboard"
@@ -58,7 +56,7 @@
             %li.header-user.dropdown
               = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do
                 = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar"
-                = icon('caret-down')
+                = icon('chevron-down')
               .dropdown-menu-nav.dropdown-menu-align-right
                 %ul
                   %li.current-user
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index c7302414386..b3213c12510 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -1,7 +1,11 @@
 %li.header-new.dropdown
   = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body' } do
-    = icon('plus fw')
-    = icon('caret-down')
+    - if show_new_nav?
+      = icon('plus')
+      = icon('chevron-down')
+    - else
+      = icon('plus fw')
+      = icon('caret-down')
   .dropdown-menu-nav.dropdown-menu-align-right
     %ul
       - if @group
-- 
cgit v1.2.1


From 9fca7b437930a5fa88ec1ae7acd41a7a9a3f18bb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 10:45:08 +0000
Subject: Limit the width of commit & snippet comment sections

---
 app/assets/stylesheets/pages/issuable.scss              |  4 +++-
 app/views/projects/commit/show.html.haml                | 11 ++++++-----
 app/views/projects/snippets/show.html.haml              |  3 ++-
 app/views/shared/snippets/_header.html.haml             |  2 +-
 app/views/snippets/show.html.haml                       |  3 ++-
 changelogs/unreleased/commit-comments-limited-width.yml |  4 ++++
 spec/views/projects/commit/show.html.haml_spec.rb       |  8 +++++---
 7 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 changelogs/unreleased/commit-comments-limited-width.yml

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 20f2eec9af5..0d1a360d12c 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -11,7 +11,9 @@
   .commit-box,
   .info-well,
   .commit-ci-menu,
-  .files-changed {
+  .files-changed,
+  .limited-header-width,
+  .limited-width-notes {
     @extend .fixed-width-container;
   }
 
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml
index 3a1be3fa4b6..b778e8af121 100644
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : ''
-- limited_container_width = fluid_layout || diff_view == :inline ? '' : 'limit-container-width'
+- limited_container_width = fluid_layout ? '' : 'limit-container-width'
 - page_title        "#{@commit.title} (#{@commit.short_id})", "Commits"
 - page_description  @commit.description
 = render "projects/commits/head"
@@ -13,7 +13,8 @@
     .block-connector
   = render "projects/diffs/diffs", diffs: @diffs, environment: @environment
 
-  = render "shared/notes/notes_with_form", :autocomplete => true
-  - if can_collaborate_with_project?
-    - %w(revert cherry-pick).each do |type|
-      = render "projects/commit/change", type: type, commit: @commit, title: @commit.title
+  .limited-width-notes
+    = render "shared/notes/notes_with_form", :autocomplete => true
+    - if can_collaborate_with_project?
+      - %w(revert cherry-pick).each do |type|
+        = render "projects/commit/change", type: type, commit: @commit, title: @commit.title
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 847f3c2f348..d8e448dd2af 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,3 +1,4 @@
+- @content_class = "limit-container-width limited-inner-width-container" unless fluid_layout
 - page_title "#{@snippet.title} (#{@snippet.to_reference})", "Snippets"
 
 = render 'shared/snippets/header'
@@ -9,4 +10,4 @@
   .row-content-block.top-block.content-component-block
     = render 'award_emoji/awards_block', awardable: @snippet, inline: true
 
-  #notes= render "shared/notes/notes_with_form", :autocomplete => true
+  #notes.limited-width-notes= render "shared/notes/notes_with_form", :autocomplete => true
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 813d8d69d8d..17b34c5eeb3 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -16,7 +16,7 @@
     - else
       = render "snippets/actions"
 
-.snippet-header
+.snippet-header.limited-header-width
   %h2.snippet-title.prepend-top-0.append-bottom-0
     = markdown_field(@snippet, :title)
 
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 216184eb839..8818590362d 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,3 +1,4 @@
+- @content_class = "limit-container-width limited-inner-width-container" unless fluid_layout
 - page_title "#{@snippet.title} (#{@snippet.to_reference})", "Snippets"
 
 = render 'shared/snippets/header'
@@ -9,4 +10,4 @@
   .row-content-block.top-block.content-component-block
     = render 'award_emoji/awards_block', awardable: @snippet, inline: true
 
-  #notes= render "shared/notes/notes_with_form", :autocomplete => false
+  #notes.limited-width-notes= render "shared/notes/notes_with_form", :autocomplete => false
diff --git a/changelogs/unreleased/commit-comments-limited-width.yml b/changelogs/unreleased/commit-comments-limited-width.yml
new file mode 100644
index 00000000000..97f50105495
--- /dev/null
+++ b/changelogs/unreleased/commit-comments-limited-width.yml
@@ -0,0 +1,4 @@
+---
+title: Limit commit & snippets comments width
+merge_request:
+author:
diff --git a/spec/views/projects/commit/show.html.haml_spec.rb b/spec/views/projects/commit/show.html.haml_spec.rb
index 122075cc10e..92b4aa12d49 100644
--- a/spec/views/projects/commit/show.html.haml_spec.rb
+++ b/spec/views/projects/commit/show.html.haml_spec.rb
@@ -21,24 +21,26 @@ describe 'projects/commit/show.html.haml', :view do
   context 'inline diff view' do
     before do
       allow(view).to receive(:diff_view).and_return(:inline)
+      allow(view).to receive(:diff_view).and_return(:inline)
 
       render
     end
 
-    it 'keeps container-limited' do
-      expect(rendered).not_to have_selector('.limit-container-width')
+    it 'has limited width' do
+      expect(rendered).to have_selector('.limit-container-width')
     end
   end
 
   context 'parallel diff view' do
     before do
       allow(view).to receive(:diff_view).and_return(:parallel)
+      allow(view).to receive(:fluid_layout).and_return(true)
 
       render
     end
 
     it 'spans full width' do
-      expect(rendered).to have_selector('.limit-container-width')
+      expect(rendered).not_to have_selector('.limit-container-width')
     end
   end
 end
-- 
cgit v1.2.1


From 0925f30134c9e4291a61241536fcea16e98ce90d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 12:52:36 +0200
Subject: fix profiles spec

---
 app/controllers/profiles_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index e4985fdb2eb..076076fd1b3 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -27,7 +27,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_private_token
-    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute! do |user|
       user.reset_authentication_token!
     end
 
@@ -37,7 +37,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_incoming_email_token
-    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute! do |user|
       user.reset_incoming_email_token!
     end
 
@@ -47,7 +47,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   def reset_rss_token
-    Users::UpdateService.new(@user).execute!(skip_authorization: true) do |user|
+    Users::UpdateService.new(@user).execute! do |user|
       user.reset_rss_token!
     end
 
-- 
cgit v1.2.1


From 5a93b6f2f3d1daf941be00c0ecd89c10e2c73607 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 13:44:45 +0100
Subject: fixed `This project` badge background & text color

---
 app/assets/stylesheets/new_nav.scss | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index 3c086ef15d1..8f0e14538d5 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -211,8 +211,11 @@ header.navbar-gitlab-new {
   }
 
   .location-badge {
-    color: $white-light;
-    background-color: $purple-900;
+    font-size: 12px;
+    color: rgba($white-light, .6);
+    background-color: $purple-800;
+    transition: color 0.15s;
+    will-change: color;
   }
 
   .search-input-wrap {
@@ -222,6 +225,11 @@ header.navbar-gitlab-new {
   }
 
   &.search-active {
+    .location-badge {
+      color: $white-light;
+      background-color: $purple-800;
+    }
+
     .search-input-wrap {
       .search-icon {
         color: rgba($white-light, .6);
-- 
cgit v1.2.1


From 9b2ae90d2cac9184f9c66051e8040559771dac98 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Fri, 23 Jun 2017 12:18:52 +0200
Subject: Remove references to build in pipeline charts

Being the good boyscouts, but mainly because of [the comment in the
review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115)
the words used for classes and variables are changed to not use builds
anymore.
---
 app/controllers/projects/pipelines_controller.rb   |  2 +-
 app/helpers/graph_helper.rb                        |  6 +--
 app/views/projects/pipelines/charts.html.haml      |  4 +-
 .../projects/pipelines/charts/_build_times.haml    | 27 -----------
 app/views/projects/pipelines/charts/_builds.haml   | 56 ----------------------
 .../projects/pipelines/charts/_pipeline_times.haml | 27 +++++++++++
 .../projects/pipelines/charts/_pipelines.haml      | 56 ++++++++++++++++++++++
 lib/ci/charts.rb                                   |  8 ++--
 spec/lib/ci/charts_spec.rb                         | 10 ++--
 9 files changed, 98 insertions(+), 98 deletions(-)
 delete mode 100644 app/views/projects/pipelines/charts/_build_times.haml
 delete mode 100644 app/views/projects/pipelines/charts/_builds.haml
 create mode 100644 app/views/projects/pipelines/charts/_pipeline_times.haml
 create mode 100644 app/views/projects/pipelines/charts/_pipelines.haml

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index d1bb85d5b73..303e91a8dc0 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -135,7 +135,7 @@ class Projects::PipelinesController < Projects::ApplicationController
     @charts[:week] = Ci::Charts::WeekChart.new(project)
     @charts[:month] = Ci::Charts::MonthChart.new(project)
     @charts[:year] = Ci::Charts::YearChart.new(project)
-    @charts[:build_times] = Ci::Charts::BuildTime.new(project)
+    @charts[:pipeline_times] = Ci::Charts::PipelineTime.new(project)
 
     @counts = {}
     @counts[:total] = @project.pipelines.count(:all)
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb
index bb7bdd82281..2e9b72e9613 100644
--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
@@ -17,10 +17,10 @@ module GraphHelper
     ids.zip(parent_spaces)
   end
 
-  def success_ratio(success:, failed:)
-    return 100 if failed.zero?
+  def success_ratio(counts)
+    return 100 if counts[:failed].zero?
 
-    ratio = (success.to_f / (success + failed)) * 100
+    ratio = (counts[:success].to_f / (counts[:success] + counts[:failed])) * 100
     ratio.to_i
   end
 end
diff --git a/app/views/projects/pipelines/charts.html.haml b/app/views/projects/pipelines/charts.html.haml
index 4a5043aac3c..8ffddfe6154 100644
--- a/app/views/projects/pipelines/charts.html.haml
+++ b/app/views/projects/pipelines/charts.html.haml
@@ -15,7 +15,7 @@
       .col-md-6
         = render 'projects/pipelines/charts/overall'
       .col-md-6
-        = render 'projects/pipelines/charts/build_times'
+        = render 'projects/pipelines/charts/pipeline_times'
 
     %hr
-    = render 'projects/pipelines/charts/builds'
+    = render 'projects/pipelines/charts/pipelines'
diff --git a/app/views/projects/pipelines/charts/_build_times.haml b/app/views/projects/pipelines/charts/_build_times.haml
deleted file mode 100644
index bb0975a9535..00000000000
--- a/app/views/projects/pipelines/charts/_build_times.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-%div
-  %p.light
-    Commit duration in minutes for last 30 commits
-
-  %canvas#build_timesChart{ height: 200 }
-
-:javascript
-  var data = {
-    labels : #{@charts[:build_times].labels.to_json},
-    datasets : [
-      {
-        fillColor : "rgba(220,220,220,0.5)",
-        strokeColor : "rgba(220,220,220,1)",
-        barStrokeWidth: 1,
-        barValueSpacing: 1,
-        barDatasetSpacing: 1,
-        data : #{@charts[:build_times].build_times.to_json}
-      }
-    ]
-  }
-  var ctx = $("#build_timesChart").get(0).getContext("2d");
-  var options = { scaleOverlay: true, responsive: true, maintainAspectRatio: false };
-  if (window.innerWidth < 768) {
-    // Scale fonts if window width lower than 768px (iPad portrait)
-    options.scaleFontSize = 8
-  }
-  new Chart(ctx).Bar(data, options);
diff --git a/app/views/projects/pipelines/charts/_builds.haml b/app/views/projects/pipelines/charts/_builds.haml
deleted file mode 100644
index b6f453b9736..00000000000
--- a/app/views/projects/pipelines/charts/_builds.haml
+++ /dev/null
@@ -1,56 +0,0 @@
-%h4 Pipelines charts
-%p
-  &nbsp;
-  %span.cgreen
-    = icon("circle")
-    success
-  &nbsp;
-  %span.cgray
-    = icon("circle")
-    all
-
-.prepend-top-default
-  %p.light
-    Jobs for last week
-    (#{date_from_to(Date.today - 7.days, Date.today)})
-  %canvas#weekChart{ height: 200 }
-
-.prepend-top-default
-  %p.light
-    Jobs for last month
-    (#{date_from_to(Date.today - 30.days, Date.today)})
-  %canvas#monthChart{ height: 200 }
-
-.prepend-top-default
-  %p.light
-    Jobs for last year
-  %canvas#yearChart.padded{ height: 250 }
-
-- [:week, :month, :year].each do |scope|
-  :javascript
-    var data = {
-      labels : #{@charts[scope].labels.to_json},
-      datasets : [
-        {
-          fillColor : "#7f8fa4",
-          strokeColor : "#7f8fa4",
-          pointColor : "#7f8fa4",
-          pointStrokeColor : "#EEE",
-          data : #{@charts[scope].total.to_json}
-        },
-        {
-          fillColor : "#44aa22",
-          strokeColor : "#44aa22",
-          pointColor : "#44aa22",
-          pointStrokeColor : "#fff",
-          data : #{@charts[scope].success.to_json}
-        }
-      ]
-    }
-    var ctx = $("##{scope}Chart").get(0).getContext("2d");
-    var options = { scaleOverlay: true, responsive: true, maintainAspectRatio: false };
-    if (window.innerWidth < 768) {
-      // Scale fonts if window width lower than 768px (iPad portrait)
-      options.scaleFontSize = 8
-    }
-    new Chart(ctx).Line(data, options);
diff --git a/app/views/projects/pipelines/charts/_pipeline_times.haml b/app/views/projects/pipelines/charts/_pipeline_times.haml
new file mode 100644
index 00000000000..aee7c5492aa
--- /dev/null
+++ b/app/views/projects/pipelines/charts/_pipeline_times.haml
@@ -0,0 +1,27 @@
+%div
+  %p.light
+    Commit duration in minutes for last 30 commits
+
+  %canvas#build_timesChart{ height: 200 }
+
+:javascript
+  var data = {
+    labels : #{@charts[:pipeline_times].labels.to_json},
+    datasets : [
+      {
+        fillColor : "rgba(220,220,220,0.5)",
+        strokeColor : "rgba(220,220,220,1)",
+        barStrokeWidth: 1,
+        barValueSpacing: 1,
+        barDatasetSpacing: 1,
+        data : #{@charts[:pipeline_times].pipeline_times.to_json}
+      }
+    ]
+  }
+  var ctx = $("#build_timesChart").get(0).getContext("2d");
+  var options = { scaleOverlay: true, responsive: true, maintainAspectRatio: false };
+  if (window.innerWidth < 768) {
+    // Scale fonts if window width lower than 768px (iPad portrait)
+    options.scaleFontSize = 8
+  }
+  new Chart(ctx).Bar(data, options);
diff --git a/app/views/projects/pipelines/charts/_pipelines.haml b/app/views/projects/pipelines/charts/_pipelines.haml
new file mode 100644
index 00000000000..b6f453b9736
--- /dev/null
+++ b/app/views/projects/pipelines/charts/_pipelines.haml
@@ -0,0 +1,56 @@
+%h4 Pipelines charts
+%p
+  &nbsp;
+  %span.cgreen
+    = icon("circle")
+    success
+  &nbsp;
+  %span.cgray
+    = icon("circle")
+    all
+
+.prepend-top-default
+  %p.light
+    Jobs for last week
+    (#{date_from_to(Date.today - 7.days, Date.today)})
+  %canvas#weekChart{ height: 200 }
+
+.prepend-top-default
+  %p.light
+    Jobs for last month
+    (#{date_from_to(Date.today - 30.days, Date.today)})
+  %canvas#monthChart{ height: 200 }
+
+.prepend-top-default
+  %p.light
+    Jobs for last year
+  %canvas#yearChart.padded{ height: 250 }
+
+- [:week, :month, :year].each do |scope|
+  :javascript
+    var data = {
+      labels : #{@charts[scope].labels.to_json},
+      datasets : [
+        {
+          fillColor : "#7f8fa4",
+          strokeColor : "#7f8fa4",
+          pointColor : "#7f8fa4",
+          pointStrokeColor : "#EEE",
+          data : #{@charts[scope].total.to_json}
+        },
+        {
+          fillColor : "#44aa22",
+          strokeColor : "#44aa22",
+          pointColor : "#44aa22",
+          pointStrokeColor : "#fff",
+          data : #{@charts[scope].success.to_json}
+        }
+      ]
+    }
+    var ctx = $("##{scope}Chart").get(0).getContext("2d");
+    var options = { scaleOverlay: true, responsive: true, maintainAspectRatio: false };
+    if (window.innerWidth < 768) {
+      // Scale fonts if window width lower than 768px (iPad portrait)
+      options.scaleFontSize = 8
+    }
+    new Chart(ctx).Line(data, options);
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index ca09410838d..872e418c788 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -33,13 +33,13 @@ module Ci
     end
 
     class Chart
-      attr_reader :labels, :total, :success, :project, :build_times
+      attr_reader :labels, :total, :success, :project, :pipeline_times
 
       def initialize(project)
         @labels = []
         @total = []
         @success = []
-        @build_times = []
+        @pipeline_times = []
         @project = project
 
         collect
@@ -101,14 +101,14 @@ module Ci
       end
     end
 
-    class BuildTime < Chart
+    class PipelineTime < Chart
       def collect
         commits = project.pipelines.last(30)
 
         commits.each do |commit|
           @labels << commit.short_sha
           duration = commit.duration || 0
-          @build_times << (duration / 60)
+          @pipeline_times << (duration / 60)
         end
       end
     end
diff --git a/spec/lib/ci/charts_spec.rb b/spec/lib/ci/charts_spec.rb
index fb6cc398307..51cbfd2a848 100644
--- a/spec/lib/ci/charts_spec.rb
+++ b/spec/lib/ci/charts_spec.rb
@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe Ci::Charts, lib: true do
-  context "build_times" do
+  context "pipeline_times" do
     let(:project) { create(:empty_project) }
-    let(:chart) { Ci::Charts::BuildTime.new(project) }
+    let(:chart) { Ci::Charts::PipelineTime.new(project) }
 
-    subject { chart.build_times }
+    subject { chart.pipeline_times }
 
     before do
       create(:ci_empty_pipeline, project: project, duration: 120)
     end
 
-    it 'returns build times in minutes' do
+    it 'returns pipeline times in minutes' do
       is_expected.to contain_exactly(2)
     end
 
-    it 'handles nil build times' do
+    it 'handles nil pipeline times' do
       create(:ci_empty_pipeline, project: project, duration: nil)
 
       is_expected.to contain_exactly(2, 0)
-- 
cgit v1.2.1


From 08b3f7986536dc760a6a9b3766473fbadb1b9067 Mon Sep 17 00:00:00 2001
From: Diego de Souza Mendes <diegomendes@santos.sp.gov.br>
Date: Fri, 23 Jun 2017 10:49:53 -0300
Subject: Hint about the wiki page hook actions. Fixes #34242

---
 doc/user/project/integrations/webhooks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index 0517ed3ec18..023c6932e41 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -736,7 +736,7 @@ X-Gitlab-Event: Merge Request Hook
 
 ### Wiki Page events
 
-Triggered when a wiki page is created, edited or deleted.
+Triggered when a wiki page is created, updated or deleted.
 
 **Request Header**:
 
-- 
cgit v1.2.1


From e7afde0c9c63e657c71368cbed306f7fdb9826ac Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 22 Jun 2017 18:16:24 +0200
Subject: Use grpc 1.4.0

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4715363c5b8..7c9dd051211 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -352,7 +352,7 @@ GEM
     grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
-    grpc (1.2.5)
+    grpc (1.4.0)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     haml (4.0.7)
-- 
cgit v1.2.1


From 8f2adb8084c15026115aed39a06e9af04c5e7957 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 16:44:34 +0200
Subject: fix bug in emails destroy service

---
 app/services/emails/base_service.rb    | 3 +--
 app/services/emails/destroy_service.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index 8810f6d8803..ace49889097 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -1,7 +1,6 @@
 module Emails
   class BaseService
-    def initialize(current_user, user, opts)
-      @current_user = current_user
+    def initialize(user, opts)
       @user = user
       @email = opts[:email]
     end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 2032f0dc3a9..d586b9dfe0c 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -7,7 +7,7 @@ module Emails
     private
 
     def update_secondary_emails!
-      result = ::Users::UpdateService.new(@current_user).execute do |user|
+      result = ::Users::UpdateService.new(@user).execute do |user|
         user.update_secondary_emails!
       end
 
-- 
cgit v1.2.1


From b33c638483d6b87ba71a329275ff12e5eb865d72 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 17:11:31 +0200
Subject: update code based on feedback

---
 app/controllers/admin/users_controller.rb               | 6 ++----
 app/controllers/profiles/two_factor_auths_controller.rb | 4 +++-
 app/services/users/build_service.rb                     | 1 -
 app/services/users/create_service.rb                    | 1 -
 app/services/users/update_service.rb                    | 5 ++---
 lib/api/internal.rb                                     | 6 ++++--
 spec/services/users/update_service_spec.rb              | 6 +++---
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 3b90cd77be0..7b65836eef7 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -210,10 +210,8 @@ class Admin::UsersController < Admin::ApplicationController
     ]
   end
 
-  def update_user
-    result = Users::UpdateService.new(user).execute do |user|
-      yield(user)
-    end
+  def update_user(&block)
+    result = Users::UpdateService.new(user).execute(&block)
 
     result[:status] == :success
   end
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index 1a4f77639e7..a864f86f3dd 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -41,8 +41,10 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
+      codes = nil
+
       Users::UpdateService.new(current_user, otp_required_for_login: true).execute! do |user|
-        @codes = user.generate_otp_backup_codes!
+        codes = user.generate_otp_backup_codes!
       end
 
       render 'create'
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index 363135ef09b..ff234a3440f 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -1,5 +1,4 @@
 module Users
-  # Service for building a new user.
   class BuildService < BaseService
     def initialize(current_user, params = {})
       @current_user = current_user
diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb
index e22f7225ae2..74abc017cea 100644
--- a/app/services/users/create_service.rb
+++ b/app/services/users/create_service.rb
@@ -1,5 +1,4 @@
 module Users
-  # Service for creating a new user.
   class CreateService < BaseService
     def initialize(current_user, params = {})
       @current_user = current_user
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 2037664f56a..dfbd6016c3f 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -1,5 +1,4 @@
 module Users
-  # Service for updating a user.
   class UpdateService < BaseService
     def initialize(user, params = {})
       @user = user
@@ -7,6 +6,8 @@ module Users
     end
 
     def execute(validate: true, &block)
+      yield(@user) if block_given?
+
       assign_attributes(&block)
 
       if @user.save(validate: validate)
@@ -27,8 +28,6 @@ module Users
     private
 
     def assign_attributes(&block)
-      yield(@user) if block_given?
-
       @user.assign_attributes(params) if params.any?
     end
   end
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 9b035808693..f1c79970ba4 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -132,11 +132,13 @@ module API
           return { success: false, message: 'Two-factor authentication is not enabled for this user' }
         end
 
+        codes = nil
+
         ::Users::UpdateService.new(user).execute! do |user|
-          @codes = user.generate_otp_backup_codes!
+          codes = user.generate_otp_backup_codes!
         end
 
-        { success: true, recovery_codes: @codes }
+        { success: true, recovery_codes: codes }
       end
 
       post "/notify_post_receive" do
diff --git a/spec/services/users/update_service_spec.rb b/spec/services/users/update_service_spec.rb
index 6c33a232cb0..0b2f840c462 100644
--- a/spec/services/users/update_service_spec.rb
+++ b/spec/services/users/update_service_spec.rb
@@ -7,7 +7,7 @@ describe Users::UpdateService, services: true do
     it 'updates the name' do
       result = update_user(user, name: 'New Name')
 
-      expect(result).to eq({ status: :success })
+      expect(result).to eq(status: :success)
       expect(user.name).to eq('New Name')
     end
 
@@ -30,9 +30,9 @@ describe Users::UpdateService, services: true do
       expect(user.name).to eq('New Name')
     end
 
-    it 'returns an error result when record cannot be updated' do
+    it 'raises an error when record cannot be updated' do
       expect do
-        update_user(user, { email: 'invalid' })
+        update_user(user, email: 'invalid')
       end.to raise_error(ActiveRecord::RecordInvalid)
     end
 
-- 
cgit v1.2.1


From 158fc8150e16aa4417db494b0c6ea56ffad02078 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Fri, 23 Jun 2017 17:14:25 +0900
Subject: Remove bin/ci/upgrade.rb as not working all

---
 bin/ci/upgrade.rb                                        | 3 ---
 changelogs/unreleased/34207-remove-bin-ci-upgrade-rb.yml | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100755 bin/ci/upgrade.rb
 create mode 100644 changelogs/unreleased/34207-remove-bin-ci-upgrade-rb.yml

diff --git a/bin/ci/upgrade.rb b/bin/ci/upgrade.rb
deleted file mode 100755
index aab4f60ec60..00000000000
--- a/bin/ci/upgrade.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require_relative "../lib/ci/upgrader"
-
-Ci::Upgrader.new.execute
diff --git a/changelogs/unreleased/34207-remove-bin-ci-upgrade-rb.yml b/changelogs/unreleased/34207-remove-bin-ci-upgrade-rb.yml
new file mode 100644
index 00000000000..4fa385c3c27
--- /dev/null
+++ b/changelogs/unreleased/34207-remove-bin-ci-upgrade-rb.yml
@@ -0,0 +1,4 @@
+---
+title: Remove bin/ci/upgrade.rb as not working all
+merge_request: 12414
+author: Takuya Noguchi
-- 
cgit v1.2.1


From 32e22d138a87bb1c52df31d8455e9d324754cb67 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 17:41:38 +0100
Subject: mobile spacing improvements removed random colors left over from the
 original nav

---
 app/assets/javascripts/main.js      |  2 +-
 app/assets/stylesheets/new_nav.scss | 64 +++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index ee48fcc2139..d27b4ec78c6 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -302,7 +302,7 @@ $(function () {
     $('.header-content .title, .header-content .navbar-sub-nav').toggle();
     $('.header-content .header-logo').toggle();
     $('.header-content .navbar-collapse').toggle();
-    $('.js-navbar-toggle-left, .js-navbar-toggle-right').toggle();
+    $('.js-navbar-toggle-left, .js-navbar-toggle-right, .title-container').toggle();
     return $('.navbar-toggle').toggleClass('active');
   });
   // Show/hide comments on diff
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss
index 8f0e14538d5..441bfc479f6 100644
--- a/app/assets/stylesheets/new_nav.scss
+++ b/app/assets/stylesheets/new_nav.scss
@@ -3,7 +3,7 @@
 @import "bootstrap/variables";
 
 header.navbar-gitlab-new {
-  color: $gray-normal;
+  color: $white-light;
   background-color: $purple-900;
   border-bottom: 0;
 
@@ -26,20 +26,22 @@ header.navbar-gitlab-new {
         align-items: center;
         height: 100%;
         padding-top: 3px;
-        padding-left: 9px;
-        padding-right: 9px;
-        margin-left: -9px;
+        padding-right: $gl-padding;
+        padding-left: $gl-padding;
+        margin-left: -$gl-padding;
         border-bottom: 3px solid transparent;
 
         @media (min-width: $screen-sm-min) {
           padding-right: $gl-padding;
           padding-left: $gl-padding;
-          margin-left: -16px;
         }
 
         svg {
           margin-top: -3px;
-          margin-right: 10px;
+
+          @media (min-width: $screen-sm-min) {
+            margin-right: 10px;
+          }
         }
 
         &:hover,
@@ -71,12 +73,17 @@ header.navbar-gitlab-new {
   .navbar-collapse {
     padding-left: 0;
     color: $white-light;
+    box-shadow: 0;
 
     @media (max-width: $screen-xs-max) {
       margin-left: -$gl-padding;
       margin-right: -10px;
     }
 
+    .dropdown-bold-header {
+      color: initial;
+    }
+
     .nav {
       > li:not(.hidden-xs) a {
         @media (max-width: $screen-xs-max) {
@@ -91,7 +98,7 @@ header.navbar-gitlab-new {
     .navbar-toggle {
       min-width: 45px;
       padding: 6px $gl-padding;
-      margin-right: -5px;
+      margin-right: -7px;
       font-size: 14px;
       text-align: center;
       color: currentColor;
@@ -107,6 +114,7 @@ header.navbar-gitlab-new {
 
     .navbar-nav {
       @media (max-width: $screen-xs-max) {
+        display: flex;
         padding-right: 10px;
       }
 
@@ -117,22 +125,37 @@ header.navbar-gitlab-new {
       }
     }
 
-    .nav > li > a {
-      opacity: .9;
-      will-change: opacity;
-
-      &:hover,
-      &:focus {
-        color: $white-light;
-        opacity: 1;
-
-        > svg {
-          fill: $white-light;
+    .nav > li {
+      &.header-user {
+        @media (max-width: $screen-xs-max) {
+          padding-left: 10px;
         }
+      }
+
+      > a {
+        background: none;
+        opacity: .9;
+        will-change: opacity;
 
         &.header-user-dropdown-toggle {
           .header-user-avatar {
-            border: 0;
+            border-color: $white-light;
+          }
+        }
+
+        &:hover,
+        &:focus {
+          color: $white-light;
+          opacity: 1;
+
+          > svg {
+            fill: $white-light;
+          }
+
+          &.header-user-dropdown-toggle {
+            .header-user-avatar {
+              border-color: $white-light;
+            }
           }
         }
       }
@@ -219,7 +242,8 @@ header.navbar-gitlab-new {
   }
 
   .search-input-wrap {
-    .search-icon {
+    .search-icon,
+    .clear-icon {
       color: rgba($white-light, .6);
     }
   }
-- 
cgit v1.2.1


From 466adeeb56ccfa94877e8010ad127be2b244a0a6 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 20 Jun 2017 14:51:39 -0700
Subject: Add changelog entry

---
 changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml

diff --git a/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml b/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml
new file mode 100644
index 00000000000..790af692b92
--- /dev/null
+++ b/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml
@@ -0,0 +1,4 @@
+---
+title: Fix reversed breadcrumb order for nested groups
+merge_request: 12322
+author:
-- 
cgit v1.2.1


From efb3d5e70f163bfd186fa3a02c967154103d27f4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 19:00:22 +0200
Subject: fix spec failures

---
 app/controllers/admin/users_controller.rb               | 2 +-
 app/controllers/profiles/two_factor_auths_controller.rb | 4 +---
 spec/services/emails/create_service_spec.rb             | 2 +-
 spec/services/emails/destroy_service_spec.rb            | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 7b65836eef7..fa1bc72560e 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   def remove_email
     email = user.emails.find(params[:email_id])
-    success = Emails::DestroyService.new(current_user, user, email: email.email).execute
+    success = Emails::DestroyService.new(user, email: email.email).execute
 
     respond_to do |format|
       if success
diff --git a/app/controllers/profiles/two_factor_auths_controller.rb b/app/controllers/profiles/two_factor_auths_controller.rb
index a864f86f3dd..1a4f77639e7 100644
--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -41,10 +41,8 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
 
   def create
     if current_user.validate_and_consume_otp!(params[:pin_code])
-      codes = nil
-
       Users::UpdateService.new(current_user, otp_required_for_login: true).execute! do |user|
-        codes = user.generate_otp_backup_codes!
+        @codes = user.generate_otp_backup_codes!
       end
 
       render 'create'
diff --git a/spec/services/emails/create_service_spec.rb b/spec/services/emails/create_service_spec.rb
index 76bf35d34e8..c1f477f551e 100644
--- a/spec/services/emails/create_service_spec.rb
+++ b/spec/services/emails/create_service_spec.rb
@@ -4,7 +4,7 @@ describe Emails::CreateService, services: true do
   let(:user) { create(:user) }
   let(:opts) { { email: 'new@email.com' } }
 
-  subject(:service) { described_class.new(user, user, opts) }
+  subject(:service) { described_class.new(user, opts) }
 
   describe '#execute' do
     it 'creates an email with valid attributes' do
diff --git a/spec/services/emails/destroy_service_spec.rb b/spec/services/emails/destroy_service_spec.rb
index 3f5192b620e..5e7ab4a40af 100644
--- a/spec/services/emails/destroy_service_spec.rb
+++ b/spec/services/emails/destroy_service_spec.rb
@@ -4,7 +4,7 @@ describe Emails::DestroyService, services: true do
   let!(:user) { create(:user) }
   let!(:email) { create(:email, user: user) }
 
-  subject(:service) { described_class.new(user, user, email: email.email) }
+  subject(:service) { described_class.new(user, email: email.email) }
 
   describe '#execute' do
     it 'removes an email' do
-- 
cgit v1.2.1


From e3cb61985de0d6ec85bce06134ed59eee806d009 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Thu, 22 Jun 2017 13:05:25 -0700
Subject: Fix 500 on create group failures

Fixes #34068
---
 app/views/layouts/header/_new_dropdown.haml  | 4 ++--
 changelogs/unreleased/mk-fix-issue-34068.yml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/mk-fix-issue-34068.yml

diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index c7302414386..969c423b032 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -4,7 +4,7 @@
     = icon('caret-down')
   .dropdown-menu-nav.dropdown-menu-align-right
     %ul
-      - if @group
+      - if @group&.persisted?
         - create_group_project = can?(current_user, :create_projects, @group)
         - create_group_subgroup = can?(current_user, :create_subgroup, @group)
         - if create_group_project || create_group_subgroup
@@ -18,7 +18,7 @@
           %li.divider
           %li.dropdown-bold-header GitLab
 
-      - if @project && @project.persisted?
+      - if @project&.persisted?
         - create_project_issue = can?(current_user, :create_issue, @project)
         - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
         - create_project_snippet = can?(current_user, :create_project_snippet, @project)
diff --git a/changelogs/unreleased/mk-fix-issue-34068.yml b/changelogs/unreleased/mk-fix-issue-34068.yml
new file mode 100644
index 00000000000..af0a9139568
--- /dev/null
+++ b/changelogs/unreleased/mk-fix-issue-34068.yml
@@ -0,0 +1,4 @@
+---
+title: Fix 500 when failing to create private group
+merge_request: 12394
+author:
-- 
cgit v1.2.1


From 11e22835ed7a003c7b31856d1dbad9b8fa22d37f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 23 Jun 2017 13:07:29 -0500
Subject: Don't match tilde and exclamation mark as part of requirements.txt
 package name

---
 changelogs/unreleased/dm-requirements-txt-tilde.yml               | 5 +++++
 lib/gitlab/dependency_linker/requirements_txt_linker.rb           | 2 +-
 spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/dm-requirements-txt-tilde.yml

diff --git a/changelogs/unreleased/dm-requirements-txt-tilde.yml b/changelogs/unreleased/dm-requirements-txt-tilde.yml
new file mode 100644
index 00000000000..ddb5325ddd5
--- /dev/null
+++ b/changelogs/unreleased/dm-requirements-txt-tilde.yml
@@ -0,0 +1,5 @@
+---
+title: Don't match tilde and exclamation mark as part of requirements.txt package
+  name
+merge_request:
+author:
diff --git a/lib/gitlab/dependency_linker/requirements_txt_linker.rb b/lib/gitlab/dependency_linker/requirements_txt_linker.rb
index 2e197e5cd94..9c9620bc36a 100644
--- a/lib/gitlab/dependency_linker/requirements_txt_linker.rb
+++ b/lib/gitlab/dependency_linker/requirements_txt_linker.rb
@@ -6,7 +6,7 @@ module Gitlab
       private
 
       def link_dependencies
-        link_regex(/^(?<name>(?![a-z+]+:)[^#.-][^ ><=;\[]+)/) do |name|
+        link_regex(/^(?<name>(?![a-z+]+:)[^#.-][^ ><=~!;\[]+)/) do |name|
           "https://pypi.python.org/pypi/#{name}"
         end
 
diff --git a/spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb b/spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb
index 4da8821726c..7e32770f95d 100644
--- a/spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb
+++ b/spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb
@@ -54,6 +54,8 @@ describe Gitlab::DependencyLinker::RequirementsTxtLinker, lib: true do
         Sphinx>=1.3
         docutils>=0.7
         markupsafe
+        pytest~=3.0
+        foop!=3.0
       CONTENT
     end
 
@@ -78,6 +80,8 @@ describe Gitlab::DependencyLinker::RequirementsTxtLinker, lib: true do
       expect(subject).to include(link('Sphinx', 'https://pypi.python.org/pypi/Sphinx'))
       expect(subject).to include(link('docutils', 'https://pypi.python.org/pypi/docutils'))
       expect(subject).to include(link('markupsafe', 'https://pypi.python.org/pypi/markupsafe'))
+      expect(subject).to include(link('pytest', 'https://pypi.python.org/pypi/pytest'))
+      expect(subject).to include(link('foop', 'https://pypi.python.org/pypi/foop'))
     end
 
     it 'links URLs' do
-- 
cgit v1.2.1


From 3e7e08adfc101359c0d5628ed6584874f5b5a713 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Thu, 22 Jun 2017 13:07:41 -0500
Subject: Show group name instead of path on group page

---
 app/views/groups/_home_panel.html.haml       | 2 +-
 changelogs/unreleased/dm-group-page-name.yml | 4 ++++
 features/steps/groups.rb                     | 2 +-
 spec/features/groups/group_settings_spec.rb  | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/dm-group-page-name.yml

diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml
index 41f54f6bf42..181c7bee702 100644
--- a/app/views/groups/_home_panel.html.haml
+++ b/app/views/groups/_home_panel.html.haml
@@ -3,7 +3,7 @@
     .avatar-container.s70.group-avatar
       = image_tag group_icon(@group), class: "avatar s70 avatar-tile"
     %h1.group-title
-      @#{@group.path}
+      = @group.name
       %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
         = visibility_level_icon(@group.visibility_level, fw: false)
 
diff --git a/changelogs/unreleased/dm-group-page-name.yml b/changelogs/unreleased/dm-group-page-name.yml
new file mode 100644
index 00000000000..233879364e3
--- /dev/null
+++ b/changelogs/unreleased/dm-group-page-name.yml
@@ -0,0 +1,4 @@
+---
+title: Show group name instead of path on group page
+merge_request:
+author:
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 25bb374b868..0aedc422563 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -5,7 +5,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   include SharedUser
 
   step 'I should see group "Owned"' do
-    expect(page).to have_content '@owned'
+    expect(page).to have_content 'Owned'
   end
 
   step 'I am a signed out user' do
diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb
index 5ad777248ec..56e163ec4d0 100644
--- a/spec/features/groups/group_settings_spec.rb
+++ b/spec/features/groups/group_settings_spec.rb
@@ -18,14 +18,14 @@ feature 'Edit group settings', feature: true do
       update_path(new_group_path)
       visit new_group_full_path
       expect(current_path).to eq(new_group_full_path)
-      expect(find('h1.group-title')).to have_content(new_group_path)
+      expect(find('h1.group-title')).to have_content(group.name)
     end
 
     scenario 'the old group path redirects to the new path' do
       update_path(new_group_path)
       visit old_group_full_path
       expect(current_path).to eq(new_group_full_path)
-      expect(find('h1.group-title')).to have_content(new_group_path)
+      expect(find('h1.group-title')).to have_content(group.name)
     end
 
     context 'with a subgroup' do
@@ -37,14 +37,14 @@ feature 'Edit group settings', feature: true do
         update_path(new_group_path)
         visit new_subgroup_full_path
         expect(current_path).to eq(new_subgroup_full_path)
-        expect(find('h1.group-title')).to have_content(subgroup.path)
+        expect(find('h1.group-title')).to have_content(subgroup.name)
       end
 
       scenario 'the old subgroup path redirects to the new path' do
         update_path(new_group_path)
         visit old_subgroup_full_path
         expect(current_path).to eq(new_subgroup_full_path)
-        expect(find('h1.group-title')).to have_content(subgroup.path)
+        expect(find('h1.group-title')).to have_content(subgroup.name)
       end
     end
 
-- 
cgit v1.2.1


From 859858c7e69a2ac3536e4e417fa6fff81d4b84ea Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Jun 2017 21:13:46 +0200
Subject: fix spec failures

---
 lib/api/users.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 175db3a4a18..2eb776a539f 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -236,7 +236,7 @@ module API
         user = User.find_by(id: params.delete(:id))
         not_found!('User') unless user
 
-        email = Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute
+        email = Emails::CreateService.new(user,declared_params(include_missing: false)).execute
 
         if email.errors.blank?
           NotificationService.new.new_email(email)
@@ -276,7 +276,7 @@ module API
         email = user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, user, email: email.email).execute
+        Emails::DestroyService.new(user, email: email.email).execute
       end
 
       desc 'Delete a user. Available only for admins.' do
@@ -488,7 +488,7 @@ module API
         requires :email, type: String, desc: 'The new email'
       end
       post "emails" do
-        email = Emails::CreateService.new(current_user, current_user, declared_params).execute
+        email = Emails::CreateService.new(current_user, declared_params).execute
 
         if email.errors.blank?
           NotificationService.new.new_email(email)
@@ -506,7 +506,7 @@ module API
         email = current_user.emails.find_by(id: params[:email_id])
         not_found!('Email') unless email
 
-        Emails::DestroyService.new(current_user, current_user, email: email.email).execute
+        Emails::DestroyService.new(current_user, email: email.email).execute
       end
 
       desc 'Get a list of user activities'
-- 
cgit v1.2.1


From 6694e2cd0b732496d834e296b65aae5aa85a304f Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Jun 2017 20:09:15 -0300
Subject: Perform project housekeeping after importing projects

---
 app/models/project.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 2c2685875f8..3bc95b1afcb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,7 +350,7 @@ class Project < ActiveRecord::Base
       project.run_after_commit { add_import_job }
     end
 
-    after_transition started: :finished, do: :reset_cache_and_import_attrs
+    after_transition started: :finished, do: :perform_housekeeping
   end
 
   class << self
@@ -502,9 +502,14 @@ class Project < ActiveRecord::Base
     end
   end
 
-  def reset_cache_and_import_attrs
+  def perform_housekeeping
     run_after_commit do
-      ProjectCacheWorker.perform_async(self.id)
+      begin
+        ProjectCacheWorker.perform_async(self.id)
+        Projects::HousekeepingService.new(self).execute
+      rescue Projects::HousekeepingService::LeaseTaken => e
+        Rails.logger.info("Could not perform housekeeping for project #{self.path_with_namespace} (#{self.id}): #{e}")
+      end
     end
 
     remove_import_data
-- 
cgit v1.2.1


From 087c1056d438aaa9e471f5c4c233a0bfd4e6b541 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Jun 2017 20:09:48 -0300
Subject: Add CHANGELOG

---
 changelogs/unreleased/fix-34019.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/fix-34019.yml

diff --git a/changelogs/unreleased/fix-34019.yml b/changelogs/unreleased/fix-34019.yml
new file mode 100644
index 00000000000..77ebb18fda6
--- /dev/null
+++ b/changelogs/unreleased/fix-34019.yml
@@ -0,0 +1,4 @@
+---
+title: Perform project housekeeping after importing projects
+merge_request:
+author:
-- 
cgit v1.2.1


From e9732404f93558fb9cbfc4651b56ab3e7566a373 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 23 Jun 2017 16:28:53 -0300
Subject: Break Project#perform_housekeeping in two methods

---
 app/models/project.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 3bc95b1afcb..f7db8c2bede 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,7 +350,10 @@ class Project < ActiveRecord::Base
       project.run_after_commit { add_import_job }
     end
 
-    after_transition started: :finished, do: :perform_housekeeping
+    after_transition started: :finished do |project, _|
+      project.reset_cache_and_import_attrs
+      project.perform_housekeeping
+    end
   end
 
   class << self
@@ -502,17 +505,22 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def reset_cache_and_import_attrs
+    run_after_commit do
+      ProjectCacheWorker.perform_async(self.id)
+    end
+
+    remove_import_data
+  end
+
   def perform_housekeeping
     run_after_commit do
       begin
-        ProjectCacheWorker.perform_async(self.id)
         Projects::HousekeepingService.new(self).execute
       rescue Projects::HousekeepingService::LeaseTaken => e
         Rails.logger.info("Could not perform housekeeping for project #{self.path_with_namespace} (#{self.id}): #{e}")
       end
     end
-
-    remove_import_data
   end
 
   def remove_import_data
-- 
cgit v1.2.1


From 429c3ccc624d4c3ac06da45c95ce6d0e405dc240 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 23 Jun 2017 16:30:13 -0300
Subject: Check if repository exists before performing housekeeping

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

diff --git a/app/models/project.rb b/app/models/project.rb
index f7db8c2bede..6e593d3c86b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -514,6 +514,8 @@ class Project < ActiveRecord::Base
   end
 
   def perform_housekeeping
+    return unless repo_exists?
+
     run_after_commit do
       begin
         Projects::HousekeepingService.new(self).execute
-- 
cgit v1.2.1


From f9be772aa7299f2bf7d3a85393347700d847c16e Mon Sep 17 00:00:00 2001
From: bikebilly <fabio@gitlab.com>
Date: Fri, 23 Jun 2017 22:59:35 +0200
Subject: =?UTF-8?q?Replace=20'Settings=20=E2=9E=94=20CI/CD=20Pipelines'=20?=
 =?UTF-8?q?with=20'Settings=20=E2=9E=94=20Pipelines'=20in=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/ci/quick_start/README.md           | 6 +++---
 doc/user/project/pipelines/settings.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 41cae58782d..88e53ff40e8 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -155,7 +155,7 @@ Find more information about different Runners in the
 [Runners](../runners/README.md) documentation.
 
 You can find whether any Runners are assigned to your project by going to
-**Settings ➔ CI/CD Pipelines**. Setting up a Runner is easy and straightforward. The
+**Settings ➔ Pipelines**. Setting up a Runner is easy and straightforward. The
 official Runner supported by GitLab is written in Go and its documentation
 can be found at <https://docs.gitlab.com/runner/>.
 
@@ -168,7 +168,7 @@ Follow the links above to set up your own Runner or use a Shared Runner as
 described in the next section.
 
 Once the Runner has been set up, you should see it on the Runners page of your
-project, following **Settings ➔ CI/CD Pipelines**.
+project, following **Settings ➔ Pipelines**.
 
 ![Activated runners](img/runners_activated.png)
 
@@ -181,7 +181,7 @@ These are special virtual machines that run on GitLab's infrastructure and can
 build any project.
 
 To enable the **Shared Runners** you have to go to your project's
-**Settings ➔ CI/CD Pipelines** and click **Enable shared runners**.
+**Settings ➔ Pipelines** and click **Enable shared runners**.
 
 [Read more on Shared Runners](../runners/README.md).
 
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index 1d2eba4f74b..a992a348c0f 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -1,7 +1,7 @@
 # Pipelines settings
 
 To reach the pipelines settings navigate to your project's
-**Settings ➔ CI/CD Pipelines**.
+**Settings ➔ Pipelines**.
 
 The following settings can be configured per project.
 
-- 
cgit v1.2.1


From 67861a04b7cadd90458feb95923e62c6799ea014 Mon Sep 17 00:00:00 2001
From: sytses <sytse@gitlab.com>
Date: Fri, 23 Jun 2017 15:22:49 -0700
Subject: Word MySQL stronger.

---
 doc/install/requirements.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 643fe5b686b..b9eb3859321 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -95,15 +95,16 @@ installation (e.g. the number of users, projects, etc).
 We currently support the following databases:
 
 - PostgreSQL (highly recommended)
-- MySQL/MariaDB (doesn't support all features)
+- MySQL/MariaDB (strongly discouraged, not all GitLab features are supported, no support for [MySQL GTID](https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html))
 
-We **highly recommend** the use of PostgreSQL instead of MySQL/MariaDB as not all
+We highly recommend the use of PostgreSQL instead of MySQL/MariaDB as not all
 features of GitLab work with MySQL/MariaDB:
 
 1. MySQL support for subgroups was [dropped with GitLab 9.3][post].
    See [issue #30472][30472] for more information.
 1. GitLab Geo does [not support MySQL](https://docs.gitlab.com/ee/gitlab-geo/database.html#mysql-replication).
 1. [Zero downtime migrations][zero] do not work with MySQL
+1. We expect this list to grow over time.
 
 Existing users using GitLab with MySQL/MariaDB are advised to
 [migrate to PostgreSQL](../update/mysql_to_postgresql.md) instead.
-- 
cgit v1.2.1


From 6b86ce75cf5b716370611f2bccea2b4590d7ce34 Mon Sep 17 00:00:00 2001
From: sytses <sytse@gitlab.com>
Date: Fri, 23 Jun 2017 15:24:02 -0700
Subject: Monty's version is better.

---
 doc/install/requirements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index b9eb3859321..a3d676433e6 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -95,7 +95,7 @@ installation (e.g. the number of users, projects, etc).
 We currently support the following databases:
 
 - PostgreSQL (highly recommended)
-- MySQL/MariaDB (strongly discouraged, not all GitLab features are supported, no support for [MySQL GTID](https://dev.mysql.com/doc/refman/5.6/en/replication-gtids-concepts.html))
+- MySQL/MariaDB (strongly discouraged, not all GitLab features are supported, no support for [MySQL/MariaDB GTID](https://mariadb.com/kb/en/mariadb/gtid/))
 
 We highly recommend the use of PostgreSQL instead of MySQL/MariaDB as not all
 features of GitLab work with MySQL/MariaDB:
-- 
cgit v1.2.1


From 43c3fa4455c5a4d943b0ef9db68b111f52a1177a Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Fri, 23 Jun 2017 07:36:19 +0200
Subject: Introduce #renew for ExclusiveLease

---
 lib/gitlab/exclusive_lease.rb           | 19 ++++++++++++++++++-
 spec/lib/gitlab/exclusive_lease_spec.rb | 13 +++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/exclusive_lease.rb b/lib/gitlab/exclusive_lease.rb
index 62ddd45785d..a0f46594eb1 100644
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
@@ -10,13 +10,21 @@ module Gitlab
   # ExclusiveLease.
   #
   class ExclusiveLease
-    LUA_CANCEL_SCRIPT = <<-EOS.freeze
+    LUA_CANCEL_SCRIPT = <<~EOS.freeze
       local key, uuid = KEYS[1], ARGV[1]
       if redis.call("get", key) == uuid then
         redis.call("del", key)
       end
     EOS
 
+    LUA_RENEW_SCRIPT = <<~EOS.freeze
+      local key, uuid, ttl = KEYS[1], ARGV[1], ARGV[2]
+      if redis.call("get", key) == uuid then
+        redis.call("expire", key, ttl)
+        return uuid
+      end
+    EOS
+
     def self.cancel(key, uuid)
       Gitlab::Redis.with do |redis|
         redis.eval(LUA_CANCEL_SCRIPT, keys: [redis_key(key)], argv: [uuid])
@@ -42,6 +50,15 @@ module Gitlab
       end
     end
 
+    # Try to renew an existing lease. Return lease UUID on success,
+    # false if the lease is taken by a different UUID or inexistent.
+    def renew
+      Gitlab::Redis.with do |redis|
+        result = redis.eval(LUA_RENEW_SCRIPT, keys: [@redis_key], argv: [@uuid, @timeout])
+        result == @uuid
+      end
+    end
+
     # Returns true if the key for this lease is set.
     def exists?
       Gitlab::Redis.with do |redis|
diff --git a/spec/lib/gitlab/exclusive_lease_spec.rb b/spec/lib/gitlab/exclusive_lease_spec.rb
index a366d68a146..81bbd70ffb8 100644
--- a/spec/lib/gitlab/exclusive_lease_spec.rb
+++ b/spec/lib/gitlab/exclusive_lease_spec.rb
@@ -19,6 +19,19 @@ describe Gitlab::ExclusiveLease, type: :redis do
     end
   end
 
+  describe '#renew' do
+    it 'returns true when we have the existing lease' do
+      lease = described_class.new(unique_key, timeout: 3600)
+      expect(lease.try_obtain).to be_present
+      expect(lease.renew).to be_truthy
+    end
+
+    it 'returns false when we dont have a lease' do
+      lease = described_class.new(unique_key, timeout: 3600)
+      expect(lease.renew).to be_falsey
+    end
+  end
+
   describe '#exists?' do
     it 'returns true for an existing lease' do
       lease = described_class.new(unique_key, timeout: 3600)
-- 
cgit v1.2.1


From b6118afd889fd5f04f7cd16afa413d132236ca44 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Wed, 21 Jun 2017 23:21:34 +0200
Subject: Fixed DestroyService spec to actually test if removal was successful

---
 spec/services/projects/destroy_service_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index 0d6dd28e332..697dc18feb0 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -15,8 +15,9 @@ describe Projects::DestroyService, services: true do
   shared_examples 'deleting the project' do
     it 'deletes the project' do
       expect(Project.unscoped.all).not_to include(project)
-      expect(Dir.exist?(path)).to be_falsey
-      expect(Dir.exist?(remove_path)).to be_falsey
+
+      expect(project.gitlab_shell.exists?(project.repository_storage_path, path + '.git')).to be_falsey
+      expect(project.gitlab_shell.exists?(project.repository_storage_path, remove_path + '.git')).to be_falsey
     end
   end
 
-- 
cgit v1.2.1


From ae9531052392c3f66ddaf82094f88adc456af8e9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Sat, 24 Jun 2017 10:00:23 +0200
Subject: fix spec failures

---
 lib/api/users.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 2eb776a539f..f9555842daf 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -236,7 +236,7 @@ module API
         user = User.find_by(id: params.delete(:id))
         not_found!('User') unless user
 
-        email = Emails::CreateService.new(user,declared_params(include_missing: false)).execute
+        email = Emails::CreateService.new(user, declared_params(include_missing: false)).execute
 
         if email.errors.blank?
           NotificationService.new.new_email(email)
-- 
cgit v1.2.1


From b7e6fb9b41a56144b39a494c635e8bbc28c8e341 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Sat, 24 Jun 2017 11:45:42 +0100
Subject: Fix interpolation in app/views/profile/show.html/haml

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

diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 087ae778b0f..819c98946ab 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -48,7 +48,7 @@
         = f.text_field :id, readonly: true, label: 'User ID', wrapper: { class: 'col-md-3' }
 
       - if @user.external_email?
-        = f.text_field :email, required: true, readonly: true, help: 'Your email address was automatically set based on your #{email_provider_label} account.'
+        = f.text_field :email, required: true, readonly: true, help: "Your email address was automatically set based on your #{email_provider_label} account."
       - else
         = f.text_field :email, required: true, value: (@user.email unless @user.temp_oauth_email?),
           help: user_email_help_text(@user)
-- 
cgit v1.2.1


From 6d4e8154b0aee8424c6c4739822fb47e72881a8d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 23 Jun 2017 12:29:49 +0100
Subject: Fixes ctrl+enter not submit issue edit form

Closes #33758
---
 .../issue_show/components/fields/description.vue     |  3 ++-
 .../issue_show/components/fields/title.vue           |  3 ++-
 .../unreleased/issue-inline-edit-quick-submit.yml    |  4 ++++
 .../issue_show/components/fields/description_spec.js | 20 ++++++++++++++++++++
 .../issue_show/components/fields/title_spec.js       | 20 ++++++++++++++++++++
 spec/javascripts/issue_show/helpers.js               | 10 ++++++++++
 6 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/issue-inline-edit-quick-submit.yml
 create mode 100644 spec/javascripts/issue_show/helpers.js

diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue
index 54650d2f184..27b1b814f9a 100644
--- a/app/assets/javascripts/issue_show/components/fields/description.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description.vue
@@ -47,7 +47,8 @@
         ref="textarea"
         slot="textarea"
         placeholder="Write a comment or drag your files here..."
-        @keydown.meta.enter="updateIssuable">
+        @keydown.meta.enter="updateIssuable"
+        @keydown.ctrl.enter="updateIssuable">
       </textarea>
     </markdown-field>
   </div>
diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue
index 6556bf117e2..83af8e1e245 100644
--- a/app/assets/javascripts/issue_show/components/fields/title.vue
+++ b/app/assets/javascripts/issue_show/components/fields/title.vue
@@ -26,6 +26,7 @@
       placeholder="Issue title"
       aria-label="Issue title"
       v-model="formState.title"
-      @keydown.meta.enter="updateIssuable" />
+      @keydown.meta.enter="updateIssuable"
+      @keydown.ctrl.enter="updateIssuable" />
   </fieldset>
 </template>
diff --git a/changelogs/unreleased/issue-inline-edit-quick-submit.yml b/changelogs/unreleased/issue-inline-edit-quick-submit.yml
new file mode 100644
index 00000000000..4407bae3e6f
--- /dev/null
+++ b/changelogs/unreleased/issue-inline-edit-quick-submit.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed ctrl+enter not submit issue edit form
+merge_request:
+author:
diff --git a/spec/javascripts/issue_show/components/fields/description_spec.js b/spec/javascripts/issue_show/components/fields/description_spec.js
index f5b35b1e8b0..df8189d9290 100644
--- a/spec/javascripts/issue_show/components/fields/description_spec.js
+++ b/spec/javascripts/issue_show/components/fields/description_spec.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
+import eventHub from '~/issue_show/event_hub';
 import Store from '~/issue_show/stores';
 import descriptionField from '~/issue_show/components/fields/description.vue';
+import { keyboardDownEvent } from '../../helpers';
 
 describe('Description field component', () => {
   let vm;
@@ -18,6 +20,8 @@ describe('Description field component', () => {
 
     document.body.appendChild(el);
 
+    spyOn(eventHub, '$emit');
+
     vm = new Component({
       el,
       propsData: {
@@ -53,4 +57,20 @@ describe('Description field component', () => {
       document.activeElement,
     ).toBe(vm.$refs.textarea);
   });
+
+  it('triggers update with meta+enter', () => {
+    vm.$el.querySelector('.md-area textarea').dispatchEvent(keyboardDownEvent(13, true));
+
+    expect(
+      eventHub.$emit,
+    ).toHaveBeenCalled();
+  });
+
+  it('triggers update with ctrl+enter', () => {
+    vm.$el.querySelector('.md-area textarea').dispatchEvent(keyboardDownEvent(13, false, true));
+
+    expect(
+      eventHub.$emit,
+    ).toHaveBeenCalled();
+  });
 });
diff --git a/spec/javascripts/issue_show/components/fields/title_spec.js b/spec/javascripts/issue_show/components/fields/title_spec.js
index 53ae038a6a2..a03b462689f 100644
--- a/spec/javascripts/issue_show/components/fields/title_spec.js
+++ b/spec/javascripts/issue_show/components/fields/title_spec.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
+import eventHub from '~/issue_show/event_hub';
 import Store from '~/issue_show/stores';
 import titleField from '~/issue_show/components/fields/title.vue';
+import { keyboardDownEvent } from '../../helpers';
 
 describe('Title field component', () => {
   let vm;
@@ -15,6 +17,8 @@ describe('Title field component', () => {
     });
     store.formState.title = 'test';
 
+    spyOn(eventHub, '$emit');
+
     vm = new Component({
       propsData: {
         formState: store.formState,
@@ -27,4 +31,20 @@ describe('Title field component', () => {
       vm.$el.querySelector('.form-control').value,
     ).toBe('test');
   });
+
+  it('triggers update with meta+enter', () => {
+    vm.$el.querySelector('.form-control').dispatchEvent(keyboardDownEvent(13, true));
+
+    expect(
+      eventHub.$emit,
+    ).toHaveBeenCalled();
+  });
+
+  it('triggers update with ctrl+enter', () => {
+    vm.$el.querySelector('.form-control').dispatchEvent(keyboardDownEvent(13, false, true));
+
+    expect(
+      eventHub.$emit,
+    ).toHaveBeenCalled();
+  });
 });
diff --git a/spec/javascripts/issue_show/helpers.js b/spec/javascripts/issue_show/helpers.js
new file mode 100644
index 00000000000..5d2ced98ae4
--- /dev/null
+++ b/spec/javascripts/issue_show/helpers.js
@@ -0,0 +1,10 @@
+// eslint-disable-next-line import/prefer-default-export
+export const keyboardDownEvent = (code, metaKey = false, ctrlKey = false) => {
+  const e = new CustomEvent('keydown');
+
+  e.keyCode = code;
+  e.metaKey = metaKey;
+  e.ctrlKey = ctrlKey;
+
+  return e;
+};
-- 
cgit v1.2.1


From 4d70c479107fc502668a83fc369159062d8efbb8 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Sun, 25 Jun 2017 08:34:06 +0200
Subject: fix spec failures

---
 app/controllers/profiles/emails_controller.rb | 4 ++--
 app/models/user.rb                            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 7ea94c59aa7..17b66df43e7 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -5,7 +5,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
   end
 
   def create
-    @email = Emails::CreateService.new(current_user, current_user, email_params).execute
+    @email = Emails::CreateService.new(current_user, email_params).execute
 
     if @email.errors.blank?
       NotificationService.new.new_email(@email)
@@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
   def destroy
     @email = current_user.emails.find(params[:id])
 
-    Emails::DestroyService.new(current_user, current_user, email: @email.email).execute
+    Emails::DestroyService.new(current_user, email: @email.email).execute
 
     respond_to do |format|
       format.html { redirect_to profile_emails_url, status: 302 }
diff --git a/app/models/user.rb b/app/models/user.rb
index e95334e2542..7a1bce25599 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -494,8 +494,8 @@ class User < ActiveRecord::Base
   def update_emails_with_primary_email
     primary_email_record = emails.find_by(email: email)
     if primary_email_record
-      Emails::DestroyService.new(self, self, email: email).execute
-      Emails::CreateService.new(self, self, email: email_was).execute
+      Emails::DestroyService.new(self, email: email).execute
+      Emails::CreateService.new(self, email: email_was).execute
     end
   end
 
-- 
cgit v1.2.1


From 07d155aa152b1435d5ac7e1a0d33ff413c1c4ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B6=9B?= <htve@outlook.com>
Date: Mon, 26 Jun 2017 10:15:44 +0800
Subject: Add Esperanto translations for Cycle Analytics, Project, and
 Repository pages

Fix #34286
---
 app/assets/javascripts/locale/eo/app.js            |    1 +
 ...-analytics-and-project-and-repository-pages.yml |    4 +
 lib/gitlab/i18n.rb                                 |    3 +-
 locale/eo/gitlab.po                                | 1143 ++++++++++++++++++++
 locale/eo/gitlab.po.time_stamp                     |    0
 5 files changed, 1150 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/locale/eo/app.js
 create mode 100644 changelogs/unreleased/34286-add-esperanto-translations-for-cycle-analytics-and-project-and-repository-pages.yml
 create mode 100644 locale/eo/gitlab.po
 create mode 100644 locale/eo/gitlab.po.time_stamp

diff --git a/app/assets/javascripts/locale/eo/app.js b/app/assets/javascripts/locale/eo/app.js
new file mode 100644
index 00000000000..55f000e9b88
--- /dev/null
+++ b/app/assets/javascripts/locale/eo/app.js
@@ -0,0 +1 @@
+var locales = locales || {}; locales['eo'] = {"domain":"app","locale_data":{"app":{"":{"Project-Id-Version":"gitlab 1.0.0","Report-Msgid-Bugs-To":"","POT-Creation-Date":"2017-06-15 21:59-0500","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","PO-Revision-Date":"2017-06-20 06:24-0400","Last-Translator":"Lyubomir Vasilev <lyubomirv@abv.bg>","Language-Team":"Esperanto (https://translate.zanata.org/project/view/GitLab)","Language":"eo","X-Generator":"Zanata 3.9.6","Plural-Forms":"nplurals=2; plural=(n != 1)","lang":"eo","domain":"app","plural_forms":"nplurals=2; plural=(n != 1)"},"%{commit_author_link} committed %{commit_timeago}":["%{commit_author_link} enmetis %{commit_timeago}"],"About auto deploy":["Pri la aŭtomata disponigado"],"Active":["Aktiva"],"Activity":["Aktiveco"],"Add Changelog":["Aldoni liston de ŝanĝoj"],"Add Contribution guide":["Aldoni gvidliniojn por kontribuado"],"Add License":["Aldoni rajtigilon"],"Add an SSH key to your profile to pull or push via SSH.":["Aldonu SSH-ŝlosilon al via profilo por ebligi al vi eltiri kaj alpuŝi per SSH."],"Add new directory":["Aldoni novan dosierujon"],"Archived project! Repository is read-only":["Arkivita projekto! La deponejo permesas nur legadon"],"Are you sure you want to delete this pipeline schedule?":["Ĉu vi certe volas forigi ĉi tiun ĉenstablan planon?"],"Attach a file by drag &amp; drop or %{upload_link}":["Alkroĉu dosieron per ŝovmetado aŭ %{upload_link}"],"Branch":["Branĉo","Branĉoj"],"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}":["La branĉo <strong>%{branch_name}</strong> estis kreita. Por agordi aŭtomatan disponigadon, bonvolu elekti Yaml-ŝablonon por GitLab CI kaj enmeti viajn ŝanĝojn. %{link_to_autodeploy_doc}"],"Branches":["Branĉoj"],"Browse files":["Elekti dosierojn"],"ByAuthor|by":["de"],"CI configuration":["Agordoj de seninterrompa integrado"],"Cancel":["Nuligi"],"ChangeTypeActionLabel|Pick into branch":["Elekti en branĉon"],"ChangeTypeActionLabel|Revert in branch":["Malfari en branĉo"],"ChangeTypeAction|Cherry-pick":["Precize elekti"],"ChangeTypeAction|Revert":["Malfari"],"Changelog":["Listo de ŝanĝoj"],"Charts":["Diagramoj"],"Cherry-pick this commit":["Precize elekti ĉi tiun kunmetadon"],"Cherry-pick this merge request":["Precize elekti ĉi tiun peton pri kunfando"],"CiStatusLabel|canceled":["nuligita"],"CiStatusLabel|created":["kreita"],"CiStatusLabel|failed":["malsukcesa"],"CiStatusLabel|manual action":["mana ago"],"CiStatusLabel|passed":["sukcesa"],"CiStatusLabel|passed with warnings":["sukcesa, kun avertoj"],"CiStatusLabel|pending":["okazonta"],"CiStatusLabel|skipped":["transsaltita"],"CiStatusLabel|waiting for manual action":["atendanta manan agon"],"CiStatusText|blocked":["blokita"],"CiStatusText|canceled":["nuligita"],"CiStatusText|created":["kreita"],"CiStatusText|failed":["malsukcesa"],"CiStatusText|manual":["mana"],"CiStatusText|passed":["sukcesa"],"CiStatusText|pending":["okazonta"],"CiStatusText|skipped":["transsaltita"],"CiStatus|running":["plenumiĝanta"],"Commit":["Enmetado","Enmetadoj"],"Commit message":["Mesaĝo pri la enmetado"],"CommitBoxTitle|Commit":["Enmeti"],"CommitMessage|Add %{file_name}":["Aldoni „%{file_name}“"],"Commits":["Enmetadoj"],"Commits|History":["Historio"],"Committed by":["Enmetita de"],"Compare":["Kompari"],"Contribution guide":["Gvidlinioj por kontribuado"],"Contributors":["Kontribuantoj"],"Copy URL to clipboard":["Kopii la adreson en la kopibufron"],"Copy commit SHA to clipboard":["Kopii la identigilon de la enmetado"],"Create New Directory":["Krei novan dosierujon"],"Create directory":["Krei dosierujon"],"Create empty bare repository":["Krei malplenan deponejon"],"Create merge request":["Krei peton pri kunfando"],"Create new...":["Krei novan…"],"CreateNewFork|Fork":["Disbranĉigi"],"CreateTag|Tag":["Etikedo"],"Cron Timezone":["Horzono por Cron"],"Cron syntax":["La sintakso de Cron"],"Custom notification events":["Propraj sciigaj eventoj"],"Custom notification levels are the same as participating levels. With custom notification levels you will also receive notifications for select events. To find out more, check out %{notification_link}.":["La propraj sciigaj niveloj estas la samaj kiel la niveloj de partoprenado. Uzante la proprajn sciigajn nivelojn, vi ricevos ankaŭ sciigojn por elektitaj de vi eventoj. Por lerni pli, bonvolu vidi %{notification_link}."],"Cycle Analytics":["Cikla analizo"],"Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.":["La cikla analizo esploras kiom da tempo necesas por disvolvi ideon ĝis ĝi fariĝos realaĵo."],"CycleAnalyticsStage|Code":["Programado"],"CycleAnalyticsStage|Issue":["Problemo"],"CycleAnalyticsStage|Plan":["Plano"],"CycleAnalyticsStage|Production":["Eldonado"],"CycleAnalyticsStage|Review":["Kontrolo"],"CycleAnalyticsStage|Staging":["Preparo por eldono"],"CycleAnalyticsStage|Test":["Testado"],"Define a custom pattern with cron syntax":["Difini propran ŝablonon, uzante la sintakson de Cron"],"Delete":["Forigi"],"Deploy":["Disponigado","Disponigadoj"],"Description":["Priskribo"],"Directory name":["Nomo de dosierujo"],"Don't show again":["Ne montru denove"],"Download":["Elŝuti"],"Download tar":["Elŝuti en formato „tar“"],"Download tar.bz2":["Elŝuti en formato „tar.bz2“"],"Download tar.gz":["Elŝuti en formato „tar.gz“"],"Download zip":["Elŝuti en formato „zip“"],"DownloadArtifacts|Download":["Elŝuti"],"DownloadCommit|Email Patches":["Sendi flikaĵojn per retpoŝto"],"DownloadCommit|Plain Diff":["Normala dosiero kun diferencoj"],"DownloadSource|Download":["Elŝuti"],"Edit":["Redakti"],"Edit Pipeline Schedule %{id}":["Redakti ĉenstablan planon %{id}"],"Every day (at 4:00am)":["Ĉiutage (je 4:00)"],"Every month (on the 1st at 4:00am)":["Ĉiumonate (en la 1a de la monato, je 4:00)"],"Every week (Sundays at 4:00am)":["Ĉiusemajne (en dimanĉo, je 4:00)"],"Failed to change the owner":["Ne eblas ŝanĝi la posedanton"],"Failed to remove the pipeline schedule":["Ne eblas forigi la ĉenstablan planon"],"Files":["Dosieroj"],"Find by path":["Trovi per dosierindiko"],"Find file":["Trovi dosieron"],"FirstPushedBy|First":["Unue"],"FirstPushedBy|pushed by":["alpuŝita de"],"Fork":["Disbranĉigo","Disbranĉigoj"],"ForkedFromProjectPath|Forked from":["Disbranĉigita el"],"From issue creation until deploy to production":["De la kreado de la problemo ĝis la disponigado en la publika versio"],"From merge request merge until deploy to production":["De la kunfandado de la peto pri kunfando ĝis la disponigado en la publika versio"],"Go to your fork":["Al via disbranĉigo"],"GoToYourFork|Fork":["Disbranĉigo"],"Home":["Hejmo"],"Housekeeping successfully started":["La refreŝigo komenciĝis sukcese"],"Import repository":["Enporti deponejon"],"Interval Pattern":["Intervala ŝablono"],"Introducing Cycle Analytics":["Ni prezentas al vi la ciklan analizon"],"LFSStatus|Disabled":["Malŝaltita"],"LFSStatus|Enabled":["Ŝaltita"],"Last %d day":["La lasta %d tago","La lastaj %d tagoj"],"Last Pipeline":["Lasta ĉenstablo"],"Last Update":["Lasta ĝisdatigo"],"Last commit":["Lasta enmetado"],"Learn more in the":["Lernu pli en la"],"Learn more in the|pipeline schedules documentation":["dokumentado pri ĉenstablaj planoj"],"Leave group":["Forlasi la grupon"],"Leave project":["Forlasi la projekton"],"Limited to showing %d event at most":["Limigita al montrado de ne pli ol %d evento","Limigita al montrado de ne pli ol %d eventoj"],"Median":["Mediano"],"MissingSSHKeyWarningLink|add an SSH key":["aldonos SSH-ŝlosilon"],"New Issue":["Nova problemo","Novaj problemoj"],"New Pipeline Schedule":["Nova ĉenstabla plano"],"New branch":["Nova branĉo"],"New directory":["Nova dosierujo"],"New file":["Nova dosiero"],"New issue":["Nova problemo"],"New merge request":["Nova peto pri kunfando"],"New schedule":["Nova plano"],"New snippet":["Nova kodaĵo"],"New tag":["Nova etikedo"],"No repository":["Ne estas deponejo"],"No schedules":["Ne estas planoj"],"Not available":["Ne disponebla"],"Not enough data":["Ne estas sufiĉe da datenoj"],"Notification events":["Sciigaj eventoj"],"NotificationEvent|Close issue":["Fermi problemon"],"NotificationEvent|Close merge request":["Fermi peton pri kunfando"],"NotificationEvent|Failed pipeline":["Malsukcesa ĉenstablo"],"NotificationEvent|Merge merge request":["Apliki peton pri kunfando"],"NotificationEvent|New issue":["Nova problemo"],"NotificationEvent|New merge request":["Nova peto pri kunfando"],"NotificationEvent|New note":["Nova noto"],"NotificationEvent|Reassign issue":["Reatribui problemon"],"NotificationEvent|Reassign merge request":["Reatribui peton pri kunfando"],"NotificationEvent|Reopen issue":["Remalfermi problemon"],"NotificationEvent|Successful pipeline":["Sukcesa ĉenstablo"],"NotificationLevel|Custom":["Propraj"],"NotificationLevel|Disabled":["Malŝaltitaj"],"NotificationLevel|Global":["Ĝeneralaj"],"NotificationLevel|On mention":["Ĉe mencio"],"NotificationLevel|Participate":["Partoprenado"],"NotificationLevel|Watch":["Rigardado"],"OfSearchInADropdown|Filter":["Filtrilo"],"OpenedNDaysAgo|Opened":["Malfermita"],"Options":["Opcioj"],"Owner":["Posedanto"],"Pipeline":["Ĉenstablo"],"Pipeline Health":["Stato"],"Pipeline Schedule":["Ĉenstabla plano"],"Pipeline Schedules":["Ĉenstablaj planoj"],"PipelineSchedules|Activated":["Ŝaltita"],"PipelineSchedules|Active":["Ŝaltitaj"],"PipelineSchedules|All":["Ĉiuj"],"PipelineSchedules|Inactive":["Malŝaltitaj"],"PipelineSchedules|Next Run":["Sekvanta plenumo"],"PipelineSchedules|None":["Nenio"],"PipelineSchedules|Provide a short description for this pipeline":["Entajpu mallongan priskribon pri ĉi tiu ĉenstablo"],"PipelineSchedules|Take ownership":["Akiri posedon"],"PipelineSchedules|Target":["Celo"],"PipelineSheduleIntervalPattern|Custom":["Propra"],"Pipeline|with stage":["kun etapo"],"Pipeline|with stages":["kun etapoj"],"Project '%{project_name}' queued for deletion.":["La projekto „%{project_name}“ estis alvicigita por forigado."],"Project '%{project_name}' was successfully created.":["La projekto „%{project_name}“ estis sukcese kreita."],"Project '%{project_name}' was successfully updated.":["La projekto „%{project_name}“ estis sukcese ĝisdatigita."],"Project '%{project_name}' will be deleted.":["La projekto „%{project_name}“ estos forigita."],"Project access must be granted explicitly to each user.":["Ĉiu uzanto devas akiri propran atingon al la projekto."],"Project export could not be deleted.":["Ne eblas forigi la projektan elporton."],"Project export has been deleted.":["La projekta elporto estis forigita."],"Project export link has expired. Please generate a new export from your project settings.":["La ligilo por la projekta elporto eksvalidiĝis. Bonvolu krei novan elporton en la agordoj de la projekto."],"Project export started. A download link will be sent by email.":["La elporto de la projekto komenciĝis. Vi ricevos ligilon per retpoŝto por elŝuti la datenoj."],"Project home":["Hejmo de la projekto"],"ProjectFeature|Disabled":["Malŝaltita"],"ProjectFeature|Everyone with access":["Ĉiu, kiu havas atingon"],"ProjectFeature|Only team members":["Nur skipanoj"],"ProjectFileTree|Name":["Nomo"],"ProjectLastActivity|Never":["Neniam"],"ProjectLifecycle|Stage":["Etapo"],"ProjectNetworkGraph|Graph":["Grafeo"],"Read more":["Legu pli"],"Readme":["LeguMin"],"RefSwitcher|Branches":["Branĉoj"],"RefSwitcher|Tags":["Etikedoj"],"Related Commits":["Rilataj enmetadoj"],"Related Deployed Jobs":["Rilataj disponigitaj taskoj"],"Related Issues":["Rilataj problemoj"],"Related Jobs":["Rilataj taskoj"],"Related Merge Requests":["Rilataj petoj pri kunfando"],"Related Merged Requests":["Rilataj aplikitaj petoj pri kunfando"],"Remind later":["Rememorigu denove"],"Remove project":["Forigi la projekton"],"Request Access":["Peti atingeblon"],"Revert this commit":["Malfari ĉi tiun enmetadon"],"Revert this merge request":["Malfari ĉi tiun peton pri kunfando"],"Save pipeline schedule":["Konservi ĉenstablan planon"],"Schedule a new pipeline":["Plani novan ĉenstablon"],"Scheduling Pipelines":["Planado de la ĉenstabloj"],"Search branches and tags":["Serĉu branĉon aŭ etikedon"],"Select Archive Format":["Elektu formaton de arkivo"],"Select a timezone":["Elektu horzonon"],"Select target branch":["Elektu celan branĉon"],"Set a password on your account to pull or push via %{protocol}":["Kreu pasvorton por via konto por ebligi al vi eltiri kaj alpuŝi per %{protocol}"],"Set up CI":["Agordi SI"],"Set up Koding":["Agordi „Koding“"],"Set up auto deploy":["Agordi aŭtomatan disponigadon"],"SetPasswordToCloneLink|set a password":["kreos pasvorton"],"Showing %d event":["Estas montrata %d evento","Estas montrataj %d eventoj"],"Source code":["Kodo"],"StarProject|Star":["Steligi"],"Start a %{new_merge_request} with these changes":["Kreu %{new_merge_request} kun ĉi tiuj ŝanĝoj"],"Switch branch/tag":["Iri al branĉo/etikedo"],"Tag":["Etikedo","Etikedoj"],"Tags":["Etikedoj"],"Target Branch":["Cela branĉo"],"The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.":["La etapo de programado montras la tempon de la unua enmetado ĝis la kreado de la peto pri kunfando. La datenoj aldoniĝos aŭtomate ĉi tie post kiam vi kreas la unuan peton pri kunfando."],"The collection of events added to the data gathered for that stage.":["La aro da eventoj, kiuj estas aldonitaj al la datenoj kolektitaj por la etapo."],"The fork relationship has been removed.":["La rilato de disbranĉigo estis forigita."],"The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.":["La etapo de la problemo montras kiom la tempo pasas de la kreado de problemo ĝis la atribuado de la problemo al cela etapo de la projekto, aŭ al listo sur la problemtabulo. Komencu krei problemojn por vidi la datenojn por ĉi tiu etapo."],"The phase of the development lifecycle.":["La etapo de la disvolva ciklo."],"The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user.":["La ĉenstabla plano plenumas ĉenstablojn en la estonteco, ripete, por difinitaj branĉoj aŭ etikedoj. Tiuj planitaj ĉenstabloj heredos la limigitan atingon al la projekto de la rilata uzanto."],"The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.":["La etapo de la plano montras la tempon de la antaŭa ŝtupo ĝis la alpuŝado de via unua enmetado. Ĉi tiu tempo aldoniĝos aŭtomate post kiam vi alpuŝas la unuan enmetadon."],"The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.":["La etapo de eldonado montras la tutan tempon de la kreado de problemo ĝis la disponigado en la publika versio. La datenoj aldoniĝos aŭtomate post kiam vi kompletigos plenan ciklon de ideo ĝis realaĵo."],"The project can be accessed by any logged in user.":["Ĉiu ensalutita uzanto havas atingon al la projekto"],"The project can be accessed without any authentication.":["Ĉiu povas havi atingon al la projekto, sen ensaluti"],"The repository for this project does not exist.":["La deponejo por ĉi tiu projekto ne ekzistas."],"The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.":["La etapo de la kontrolo montras la tempon de la kreado de la peto pri kunfando ĝis ĝia aplikado. La datenoj aldoniĝos aŭtomate post kiam vi aplikos la unuan peton pri kunfando."],"The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.":["La etapo de preparo por eldono montras la tempon inter la aplikado de la peto pri kunfando kaj la disponigado de la kodo en la publika versio. La datenoj aldoniĝos aŭtomate post kiam vi faros la unuan disponigadon en la publika versio."],"The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.":["La etapo de testado montras kiom da tempo necesas al „GitLab CI“ por plenumi ĉiujn ĉenstablojn por la rilata peto pri kunfando. La datenoj aldoniĝos aŭtomate post kiam via unua ĉenstablo finiĝos."],"The time taken by each data entry gathered by that stage.":["La tempo, kiu estas necesa por ĉiu dateno kolektita de la etapo."],"The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6.":["La valoro, kiu troviĝas en la mezo de aro da rigardataj valoroj. Ekzemple: inter 3, 5 kaj 9, la mediano estas 5. Inter 3, 5, 7 kaj 8, la mediano estas (5+7)/2 = 6."],"This means you can not push code until you create an empty repository or import existing one.":["Ĉi tiu signifas, ke vi ne povos alpuŝi kodon, antaŭ ol vi kreos malplenan deponejon aŭ enportos jam ekzistantan."],"Time before an issue gets scheduled":["Tempo antaŭ problemo estas planita por ellabori"],"Time before an issue starts implementation":["Tempo antaŭ la komenco de laboro super problemo"],"Time between merge request creation and merge/close":["Tempo inter la kreado de poeto pri kunfando kaj ĝia aplikado/fermado"],"Time until first merge request":["Tempo ĝis la unua peto pri kunfando"],"Timeago|%s days ago":["antaŭ %s tagoj"],"Timeago|%s days remaining":["restas %s tagoj"],"Timeago|%s hours remaining":["restas %s horoj"],"Timeago|%s minutes ago":["antaŭ %s minutoj"],"Timeago|%s minutes remaining":["restas %s minutoj"],"Timeago|%s months ago":["antaŭ %s monatoj"],"Timeago|%s months remaining":["restas %s monatoj"],"Timeago|%s seconds remaining":["restas %s sekundoj"],"Timeago|%s weeks ago":["antaŭ %s semajnoj"],"Timeago|%s weeks remaining":["restas %s semajnoj"],"Timeago|%s years ago":["antaŭ %s jaroj"],"Timeago|%s years remaining":["restas %s jaroj"],"Timeago|1 day remaining":["restas 1 tago"],"Timeago|1 hour remaining":["restas 1 horo"],"Timeago|1 minute remaining":["restas 1 minuto"],"Timeago|1 month remaining":["restas 1 monato"],"Timeago|1 week remaining":["restas 1 semajno"],"Timeago|1 year remaining":["restas 1 jaro"],"Timeago|Past due":["Malfruiĝis"],"Timeago|a day ago":["antaŭ unu tago"],"Timeago|a month ago":["antaŭ unu monato"],"Timeago|a week ago":["antaŭ unu semajno"],"Timeago|a while":["antaŭ iom da tempo"],"Timeago|a year ago":["antaŭ unu jaro"],"Timeago|about %s hours ago":["antaŭ ĉirkaŭ %s horoj"],"Timeago|about a minute ago":["antaŭ ĉirkaŭ unu minuto"],"Timeago|about an hour ago":["antaŭ ĉirkaŭ unu horo"],"Timeago|in %s days":["post %s tagoj"],"Timeago|in %s hours":["post %s horoj"],"Timeago|in %s minutes":["post %s minutoj"],"Timeago|in %s months":["post %s monatoj"],"Timeago|in %s seconds":["post %s sekundoj"],"Timeago|in %s weeks":["post %s semajnoj"],"Timeago|in %s years":["post %s jaroj"],"Timeago|in 1 day":["post 1 tago"],"Timeago|in 1 hour":["post 1 horo"],"Timeago|in 1 minute":["post 1 minuto"],"Timeago|in 1 month":["post 1 monato"],"Timeago|in 1 week":["post 1 semajno"],"Timeago|in 1 year":["post 1 jaro"],"Timeago|less than a minute ago":["antaŭ malpli ol minuto"],"Time|hr":["h","h"],"Time|min":["min","min"],"Time|s":["s"],"Total Time":["Totala tempo"],"Total test time for all commits/merges":["Totala tempo por la testado de ĉiuj enmetadoj/kunfandoj"],"Unstar":["Malsteligi"],"Upload New File":["Alŝuti novan dosieron"],"Upload file":["Alŝuti dosieron"],"Use your global notification setting":["Uzi vian ĝeneralan agordon pri la sciigoj"],"VisibilityLevel|Internal":["Interna"],"VisibilityLevel|Private":["Privata"],"VisibilityLevel|Public":["Publika"],"Want to see the data? Please ask an administrator for access.":["Ĉu vi volas vidi la datenojn? Bonvolu peti atingeblon de administranto."],"We don't have enough data to show this stage.":["Ne estas sufiĉe da datenoj por montri ĉi tiun etapon."],"Withdraw Access Request":["Nuligi la peton pri atingeblo"],"You are going to remove %{project_name_with_namespace}.\\nRemoved project CANNOT be restored!\\nAre you ABSOLUTELY sure?":["Vi forigos „%{project_name_with_namespace}“.\\nOni NE POVAS malfari la forigon de projekto!\\nĈu vi estas ABSOLUTE certa?"],"You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?":["Vi forigos la rilaton de la disbranĉigo al la originala projekto, „%{forked_from_project}“. Ĉu vi estas ABSOLUTE certa?"],"You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?":["Vi transigos „%{project_name_with_namespace}“ al alia posedanto. Ĉu vi estas ABSOLUTE certa?"],"You can only add files when you are on a branch":["Oni povas aldoni dosierojn nur kiam oni estas en branĉo"],"You have reached your project limit":["Vi ne povas krei pliajn projektojn"],"You must sign in to star a project":["Oni devas ensaluti por steligi projekton"],"You need permission.":["VI bezonas permeson."],"You will not get any notifications via email":["VI ne ricevos sciigojn per retpoŝto"],"You will only receive notifications for the events you choose":["Vi ricevos sciigojn nur por la eventoj elektitaj de vi"],"You will only receive notifications for threads you have participated in":["Vi ricevos sciigojn nur por la fadenoj, en kiuj vi partoprenis"],"You will receive notifications for any activity":["Vi ricevos sciigojn por ĉiu ago"],"You will receive notifications only for comments in which you were @mentioned":["Vi ricevos sciigojn nur por komentoj, en kiuj vi estas @menciita"],"You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account":["Vi ne povos eltiri aŭ alpuŝi kodon per %{protocol} antaŭ ol vi %{set_password_link} por via konto"],"You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile":["Vi ne povos eltiri aŭ alpuŝi kodon per SSH antaŭ ol vi %{add_ssh_key_link} al via profilo"],"Your name":["Via nomo"],"day":["tago","tagoj"],"new merge request":["novan peton pri kunfando"],"notification emails":["sciigoj per retpoŝto"],"parent":["patro","patroj"]}}};
\ No newline at end of file
diff --git a/changelogs/unreleased/34286-add-esperanto-translations-for-cycle-analytics-and-project-and-repository-pages.yml b/changelogs/unreleased/34286-add-esperanto-translations-for-cycle-analytics-and-project-and-repository-pages.yml
new file mode 100644
index 00000000000..af743f3e506
--- /dev/null
+++ b/changelogs/unreleased/34286-add-esperanto-translations-for-cycle-analytics-and-project-and-repository-pages.yml
@@ -0,0 +1,4 @@
+---
+title: Add Esperanto translations for Cycle Analytics, Project, and Repository pages
+merge_request: 12442
+author: Huang Tao
diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb
index a5ad2f952d3..db7cdf4b5c7 100644
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
@@ -11,7 +11,8 @@ module Gitlab
       'zh_CN' => '简体中文',
       'zh_HK' => '繁體中文(香港)',
       'zh_TW' => '繁體中文(臺灣)',
-      'bg' => 'български'
+      'bg' => 'български',
+      'eo' => 'Esperanto'
     }.freeze
 
     def available_locales
diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po
new file mode 100644
index 00000000000..3ef9e19067d
--- /dev/null
+++ b/locale/eo/gitlab.po
@@ -0,0 +1,1143 @@
+# Huang Tao <htve@outlook.com>, 2017. #zanata
+# Lyubomir Vasilev <lyubomirv@abv.bg>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: gitlab 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-15 21:59-0500\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2017-06-20 06:24-0400\n"
+"Last-Translator: Lyubomir Vasilev <lyubomirv@abv.bg>\n"
+"Language-Team: Esperanto (https://translate.zanata.org/project/view/GitLab)\n"
+"Language: eo\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+msgid "%{commit_author_link} committed %{commit_timeago}"
+msgstr "%{commit_author_link} enmetis %{commit_timeago}"
+
+msgid "About auto deploy"
+msgstr "Pri la aŭtomata disponigado"
+
+msgid "Active"
+msgstr "Aktiva"
+
+msgid "Activity"
+msgstr "Aktiveco"
+
+msgid "Add Changelog"
+msgstr "Aldoni liston de ŝanĝoj"
+
+msgid "Add Contribution guide"
+msgstr "Aldoni gvidliniojn por kontribuado"
+
+msgid "Add License"
+msgstr "Aldoni rajtigilon"
+
+msgid "Add an SSH key to your profile to pull or push via SSH."
+msgstr ""
+"Aldonu SSH-ŝlosilon al via profilo por ebligi al vi eltiri kaj alpuŝi per "
+"SSH."
+
+msgid "Add new directory"
+msgstr "Aldoni novan dosierujon"
+
+msgid "Archived project! Repository is read-only"
+msgstr "Arkivita projekto! La deponejo permesas nur legadon"
+
+msgid "Are you sure you want to delete this pipeline schedule?"
+msgstr "Ĉu vi certe volas forigi ĉi tiun ĉenstablan planon?"
+
+msgid "Attach a file by drag &amp; drop or %{upload_link}"
+msgstr "Alkroĉu dosieron per ŝovmetado aŭ %{upload_link}"
+
+msgid "Branch"
+msgid_plural "Branches"
+msgstr[0] "Branĉo"
+msgstr[1] "Branĉoj"
+
+msgid ""
+"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, "
+"choose a GitLab CI Yaml template and commit your changes. "
+"%{link_to_autodeploy_doc}"
+msgstr ""
+"La branĉo <strong>%{branch_name}</strong> estis kreita. Por agordi aŭtomatan "
+"disponigadon, bonvolu elekti Yaml-ŝablonon por GitLab CI kaj enmeti viajn "
+"ŝanĝojn. %{link_to_autodeploy_doc}"
+
+msgid "Branches"
+msgstr "Branĉoj"
+
+msgid "Browse files"
+msgstr "Elekti dosierojn"
+
+msgid "ByAuthor|by"
+msgstr "de"
+
+msgid "CI configuration"
+msgstr "Agordoj de seninterrompa integrado"
+
+msgid "Cancel"
+msgstr "Nuligi"
+
+msgid "ChangeTypeActionLabel|Pick into branch"
+msgstr "Elekti en branĉon"
+
+msgid "ChangeTypeActionLabel|Revert in branch"
+msgstr "Malfari en branĉo"
+
+msgid "ChangeTypeAction|Cherry-pick"
+msgstr "Precize elekti"
+
+msgid "ChangeTypeAction|Revert"
+msgstr "Malfari"
+
+msgid "Changelog"
+msgstr "Listo de ŝanĝoj"
+
+msgid "Charts"
+msgstr "Diagramoj"
+
+msgid "Cherry-pick this commit"
+msgstr "Precize elekti ĉi tiun kunmetadon"
+
+msgid "Cherry-pick this merge request"
+msgstr "Precize elekti ĉi tiun peton pri kunfando"
+
+msgid "CiStatusLabel|canceled"
+msgstr "nuligita"
+
+msgid "CiStatusLabel|created"
+msgstr "kreita"
+
+msgid "CiStatusLabel|failed"
+msgstr "malsukcesa"
+
+msgid "CiStatusLabel|manual action"
+msgstr "mana ago"
+
+msgid "CiStatusLabel|passed"
+msgstr "sukcesa"
+
+msgid "CiStatusLabel|passed with warnings"
+msgstr "sukcesa, kun avertoj"
+
+msgid "CiStatusLabel|pending"
+msgstr "okazonta"
+
+msgid "CiStatusLabel|skipped"
+msgstr "transsaltita"
+
+msgid "CiStatusLabel|waiting for manual action"
+msgstr "atendanta manan agon"
+
+msgid "CiStatusText|blocked"
+msgstr "blokita"
+
+msgid "CiStatusText|canceled"
+msgstr "nuligita"
+
+msgid "CiStatusText|created"
+msgstr "kreita"
+
+msgid "CiStatusText|failed"
+msgstr "malsukcesa"
+
+msgid "CiStatusText|manual"
+msgstr "mana"
+
+msgid "CiStatusText|passed"
+msgstr "sukcesa"
+
+msgid "CiStatusText|pending"
+msgstr "okazonta"
+
+msgid "CiStatusText|skipped"
+msgstr "transsaltita"
+
+msgid "CiStatus|running"
+msgstr "plenumiĝanta"
+
+msgid "Commit"
+msgid_plural "Commits"
+msgstr[0] "Enmetado"
+msgstr[1] "Enmetadoj"
+
+msgid "Commit message"
+msgstr "Mesaĝo pri la enmetado"
+
+msgid "CommitBoxTitle|Commit"
+msgstr "Enmeti"
+
+msgid "CommitMessage|Add %{file_name}"
+msgstr "Aldoni „%{file_name}“"
+
+msgid "Commits"
+msgstr "Enmetadoj"
+
+msgid "Commits|History"
+msgstr "Historio"
+
+msgid "Committed by"
+msgstr "Enmetita de"
+
+msgid "Compare"
+msgstr "Kompari"
+
+msgid "Contribution guide"
+msgstr "Gvidlinioj por kontribuado"
+
+msgid "Contributors"
+msgstr "Kontribuantoj"
+
+msgid "Copy URL to clipboard"
+msgstr "Kopii la adreson en la kopibufron"
+
+msgid "Copy commit SHA to clipboard"
+msgstr "Kopii la identigilon de la enmetado"
+
+msgid "Create New Directory"
+msgstr "Krei novan dosierujon"
+
+msgid "Create directory"
+msgstr "Krei dosierujon"
+
+msgid "Create empty bare repository"
+msgstr "Krei malplenan deponejon"
+
+msgid "Create merge request"
+msgstr "Krei peton pri kunfando"
+
+msgid "Create new..."
+msgstr "Krei novan…"
+
+msgid "CreateNewFork|Fork"
+msgstr "Disbranĉigi"
+
+msgid "CreateTag|Tag"
+msgstr "Etikedo"
+
+msgid "Cron Timezone"
+msgstr "Horzono por Cron"
+
+msgid "Cron syntax"
+msgstr "La sintakso de Cron"
+
+msgid "Custom notification events"
+msgstr "Propraj sciigaj eventoj"
+
+msgid ""
+"Custom notification levels are the same as participating levels. With custom "
+"notification levels you will also receive notifications for select events. "
+"To find out more, check out %{notification_link}."
+msgstr ""
+"La propraj sciigaj niveloj estas la samaj kiel la niveloj de partoprenado. "
+"Uzante la proprajn sciigajn nivelojn, vi ricevos ankaŭ sciigojn por "
+"elektitaj de vi eventoj. Por lerni pli, bonvolu vidi %{notification_link}."
+
+msgid "Cycle Analytics"
+msgstr "Cikla analizo"
+
+msgid ""
+"Cycle Analytics gives an overview of how much time it takes to go from idea "
+"to production in your project."
+msgstr ""
+"La cikla analizo esploras kiom da tempo necesas por disvolvi ideon ĝis ĝi "
+"fariĝos realaĵo."
+
+msgid "CycleAnalyticsStage|Code"
+msgstr "Programado"
+
+msgid "CycleAnalyticsStage|Issue"
+msgstr "Problemo"
+
+msgid "CycleAnalyticsStage|Plan"
+msgstr "Plano"
+
+msgid "CycleAnalyticsStage|Production"
+msgstr "Eldonado"
+
+msgid "CycleAnalyticsStage|Review"
+msgstr "Kontrolo"
+
+msgid "CycleAnalyticsStage|Staging"
+msgstr "Preparo por eldono"
+
+msgid "CycleAnalyticsStage|Test"
+msgstr "Testado"
+
+msgid "Define a custom pattern with cron syntax"
+msgstr "Difini propran ŝablonon, uzante la sintakson de Cron"
+
+msgid "Delete"
+msgstr "Forigi"
+
+msgid "Deploy"
+msgid_plural "Deploys"
+msgstr[0] "Disponigado"
+msgstr[1] "Disponigadoj"
+
+msgid "Description"
+msgstr "Priskribo"
+
+msgid "Directory name"
+msgstr "Nomo de dosierujo"
+
+msgid "Don't show again"
+msgstr "Ne montru denove"
+
+msgid "Download"
+msgstr "Elŝuti"
+
+msgid "Download tar"
+msgstr "Elŝuti en formato „tar“"
+
+msgid "Download tar.bz2"
+msgstr "Elŝuti en formato „tar.bz2“"
+
+msgid "Download tar.gz"
+msgstr "Elŝuti en formato „tar.gz“"
+
+msgid "Download zip"
+msgstr "Elŝuti en formato „zip“"
+
+msgid "DownloadArtifacts|Download"
+msgstr "Elŝuti"
+
+msgid "DownloadCommit|Email Patches"
+msgstr "Sendi flikaĵojn per retpoŝto"
+
+msgid "DownloadCommit|Plain Diff"
+msgstr "Normala dosiero kun diferencoj"
+
+msgid "DownloadSource|Download"
+msgstr "Elŝuti"
+
+msgid "Edit"
+msgstr "Redakti"
+
+msgid "Edit Pipeline Schedule %{id}"
+msgstr "Redakti ĉenstablan planon %{id}"
+
+msgid "Every day (at 4:00am)"
+msgstr "Ĉiutage (je 4:00)"
+
+msgid "Every month (on the 1st at 4:00am)"
+msgstr "Ĉiumonate (en la 1a de la monato, je 4:00)"
+
+msgid "Every week (Sundays at 4:00am)"
+msgstr "Ĉiusemajne (en dimanĉo, je 4:00)"
+
+msgid "Failed to change the owner"
+msgstr "Ne eblas ŝanĝi la posedanton"
+
+msgid "Failed to remove the pipeline schedule"
+msgstr "Ne eblas forigi la ĉenstablan planon"
+
+msgid "Files"
+msgstr "Dosieroj"
+
+msgid "Find by path"
+msgstr "Trovi per dosierindiko"
+
+msgid "Find file"
+msgstr "Trovi dosieron"
+
+msgid "FirstPushedBy|First"
+msgstr "Unue"
+
+msgid "FirstPushedBy|pushed by"
+msgstr "alpuŝita de"
+
+msgid "Fork"
+msgid_plural "Forks"
+msgstr[0] "Disbranĉigo"
+msgstr[1] "Disbranĉigoj"
+
+msgid "ForkedFromProjectPath|Forked from"
+msgstr "Disbranĉigita el"
+
+msgid "From issue creation until deploy to production"
+msgstr "De la kreado de la problemo ĝis la disponigado en la publika versio"
+
+msgid "From merge request merge until deploy to production"
+msgstr ""
+"De la kunfandado de la peto pri kunfando ĝis la disponigado en la publika "
+"versio"
+
+msgid "Go to your fork"
+msgstr "Al via disbranĉigo"
+
+msgid "GoToYourFork|Fork"
+msgstr "Disbranĉigo"
+
+msgid "Home"
+msgstr "Hejmo"
+
+msgid "Housekeeping successfully started"
+msgstr "La refreŝigo komenciĝis sukcese"
+
+msgid "Import repository"
+msgstr "Enporti deponejon"
+
+msgid "Interval Pattern"
+msgstr "Intervala ŝablono"
+
+msgid "Introducing Cycle Analytics"
+msgstr "Ni prezentas al vi la ciklan analizon"
+
+msgid "LFSStatus|Disabled"
+msgstr "Malŝaltita"
+
+msgid "LFSStatus|Enabled"
+msgstr "Ŝaltita"
+
+msgid "Last %d day"
+msgid_plural "Last %d days"
+msgstr[0] "La lasta %d tago"
+msgstr[1] "La lastaj %d tagoj"
+
+msgid "Last Pipeline"
+msgstr "Lasta ĉenstablo"
+
+msgid "Last Update"
+msgstr "Lasta ĝisdatigo"
+
+msgid "Last commit"
+msgstr "Lasta enmetado"
+
+msgid "Learn more in the"
+msgstr "Lernu pli en la"
+
+msgid "Learn more in the|pipeline schedules documentation"
+msgstr "dokumentado pri ĉenstablaj planoj"
+
+msgid "Leave group"
+msgstr "Forlasi la grupon"
+
+msgid "Leave project"
+msgstr "Forlasi la projekton"
+
+msgid "Limited to showing %d event at most"
+msgid_plural "Limited to showing %d events at most"
+msgstr[0] "Limigita al montrado de ne pli ol %d evento"
+msgstr[1] "Limigita al montrado de ne pli ol %d eventoj"
+
+msgid "Median"
+msgstr "Mediano"
+
+msgid "MissingSSHKeyWarningLink|add an SSH key"
+msgstr "aldonos SSH-ŝlosilon"
+
+msgid "New Issue"
+msgid_plural "New Issues"
+msgstr[0] "Nova problemo"
+msgstr[1] "Novaj problemoj"
+
+msgid "New Pipeline Schedule"
+msgstr "Nova ĉenstabla plano"
+
+msgid "New branch"
+msgstr "Nova branĉo"
+
+msgid "New directory"
+msgstr "Nova dosierujo"
+
+msgid "New file"
+msgstr "Nova dosiero"
+
+msgid "New issue"
+msgstr "Nova problemo"
+
+msgid "New merge request"
+msgstr "Nova peto pri kunfando"
+
+msgid "New schedule"
+msgstr "Nova plano"
+
+msgid "New snippet"
+msgstr "Nova kodaĵo"
+
+msgid "New tag"
+msgstr "Nova etikedo"
+
+msgid "No repository"
+msgstr "Ne estas deponejo"
+
+msgid "No schedules"
+msgstr "Ne estas planoj"
+
+msgid "Not available"
+msgstr "Ne disponebla"
+
+msgid "Not enough data"
+msgstr "Ne estas sufiĉe da datenoj"
+
+msgid "Notification events"
+msgstr "Sciigaj eventoj"
+
+msgid "NotificationEvent|Close issue"
+msgstr "Fermi problemon"
+
+msgid "NotificationEvent|Close merge request"
+msgstr "Fermi peton pri kunfando"
+
+msgid "NotificationEvent|Failed pipeline"
+msgstr "Malsukcesa ĉenstablo"
+
+msgid "NotificationEvent|Merge merge request"
+msgstr "Apliki peton pri kunfando"
+
+msgid "NotificationEvent|New issue"
+msgstr "Nova problemo"
+
+msgid "NotificationEvent|New merge request"
+msgstr "Nova peto pri kunfando"
+
+msgid "NotificationEvent|New note"
+msgstr "Nova noto"
+
+msgid "NotificationEvent|Reassign issue"
+msgstr "Reatribui problemon"
+
+msgid "NotificationEvent|Reassign merge request"
+msgstr "Reatribui peton pri kunfando"
+
+msgid "NotificationEvent|Reopen issue"
+msgstr "Remalfermi problemon"
+
+msgid "NotificationEvent|Successful pipeline"
+msgstr "Sukcesa ĉenstablo"
+
+msgid "NotificationLevel|Custom"
+msgstr "Propraj"
+
+msgid "NotificationLevel|Disabled"
+msgstr "Malŝaltitaj"
+
+msgid "NotificationLevel|Global"
+msgstr "Ĝeneralaj"
+
+msgid "NotificationLevel|On mention"
+msgstr "Ĉe mencio"
+
+msgid "NotificationLevel|Participate"
+msgstr "Partoprenado"
+
+msgid "NotificationLevel|Watch"
+msgstr "Rigardado"
+
+msgid "OfSearchInADropdown|Filter"
+msgstr "Filtrilo"
+
+msgid "OpenedNDaysAgo|Opened"
+msgstr "Malfermita"
+
+msgid "Options"
+msgstr "Opcioj"
+
+msgid "Owner"
+msgstr "Posedanto"
+
+msgid "Pipeline"
+msgstr "Ĉenstablo"
+
+msgid "Pipeline Health"
+msgstr "Stato"
+
+msgid "Pipeline Schedule"
+msgstr "Ĉenstabla plano"
+
+msgid "Pipeline Schedules"
+msgstr "Ĉenstablaj planoj"
+
+msgid "PipelineSchedules|Activated"
+msgstr "Ŝaltita"
+
+msgid "PipelineSchedules|Active"
+msgstr "Ŝaltitaj"
+
+msgid "PipelineSchedules|All"
+msgstr "Ĉiuj"
+
+msgid "PipelineSchedules|Inactive"
+msgstr "Malŝaltitaj"
+
+msgid "PipelineSchedules|Next Run"
+msgstr "Sekvanta plenumo"
+
+msgid "PipelineSchedules|None"
+msgstr "Nenio"
+
+msgid "PipelineSchedules|Provide a short description for this pipeline"
+msgstr "Entajpu mallongan priskribon pri ĉi tiu ĉenstablo"
+
+msgid "PipelineSchedules|Take ownership"
+msgstr "Akiri posedon"
+
+msgid "PipelineSchedules|Target"
+msgstr "Celo"
+
+msgid "PipelineSheduleIntervalPattern|Custom"
+msgstr "Propra"
+
+msgid "Pipeline|with stage"
+msgstr "kun etapo"
+
+msgid "Pipeline|with stages"
+msgstr "kun etapoj"
+
+msgid "Project '%{project_name}' queued for deletion."
+msgstr "La projekto „%{project_name}“ estis alvicigita por forigado."
+
+msgid "Project '%{project_name}' was successfully created."
+msgstr "La projekto „%{project_name}“ estis sukcese kreita."
+
+msgid "Project '%{project_name}' was successfully updated."
+msgstr "La projekto „%{project_name}“ estis sukcese ĝisdatigita."
+
+msgid "Project '%{project_name}' will be deleted."
+msgstr "La projekto „%{project_name}“ estos forigita."
+
+msgid "Project access must be granted explicitly to each user."
+msgstr "Ĉiu uzanto devas akiri propran atingon al la projekto."
+
+msgid "Project export could not be deleted."
+msgstr "Ne eblas forigi la projektan elporton."
+
+msgid "Project export has been deleted."
+msgstr "La projekta elporto estis forigita."
+
+msgid ""
+"Project export link has expired. Please generate a new export from your "
+"project settings."
+msgstr ""
+"La ligilo por la projekta elporto eksvalidiĝis. Bonvolu krei novan elporton "
+"en la agordoj de la projekto."
+
+msgid "Project export started. A download link will be sent by email."
+msgstr ""
+"La elporto de la projekto komenciĝis. Vi ricevos ligilon per retpoŝto por "
+"elŝuti la datenoj."
+
+msgid "Project home"
+msgstr "Hejmo de la projekto"
+
+msgid "ProjectFeature|Disabled"
+msgstr "Malŝaltita"
+
+msgid "ProjectFeature|Everyone with access"
+msgstr "Ĉiu, kiu havas atingon"
+
+msgid "ProjectFeature|Only team members"
+msgstr "Nur skipanoj"
+
+msgid "ProjectFileTree|Name"
+msgstr "Nomo"
+
+msgid "ProjectLastActivity|Never"
+msgstr "Neniam"
+
+msgid "ProjectLifecycle|Stage"
+msgstr "Etapo"
+
+msgid "ProjectNetworkGraph|Graph"
+msgstr "Grafeo"
+
+msgid "Read more"
+msgstr "Legu pli"
+
+msgid "Readme"
+msgstr "LeguMin"
+
+msgid "RefSwitcher|Branches"
+msgstr "Branĉoj"
+
+msgid "RefSwitcher|Tags"
+msgstr "Etikedoj"
+
+msgid "Related Commits"
+msgstr "Rilataj enmetadoj"
+
+msgid "Related Deployed Jobs"
+msgstr "Rilataj disponigitaj taskoj"
+
+msgid "Related Issues"
+msgstr "Rilataj problemoj"
+
+msgid "Related Jobs"
+msgstr "Rilataj taskoj"
+
+msgid "Related Merge Requests"
+msgstr "Rilataj petoj pri kunfando"
+
+msgid "Related Merged Requests"
+msgstr "Rilataj aplikitaj petoj pri kunfando"
+
+msgid "Remind later"
+msgstr "Rememorigu denove"
+
+msgid "Remove project"
+msgstr "Forigi la projekton"
+
+msgid "Request Access"
+msgstr "Peti atingeblon"
+
+msgid "Revert this commit"
+msgstr "Malfari ĉi tiun enmetadon"
+
+msgid "Revert this merge request"
+msgstr "Malfari ĉi tiun peton pri kunfando"
+
+msgid "Save pipeline schedule"
+msgstr "Konservi ĉenstablan planon"
+
+msgid "Schedule a new pipeline"
+msgstr "Plani novan ĉenstablon"
+
+msgid "Scheduling Pipelines"
+msgstr "Planado de la ĉenstabloj"
+
+msgid "Search branches and tags"
+msgstr "Serĉu branĉon aŭ etikedon"
+
+msgid "Select Archive Format"
+msgstr "Elektu formaton de arkivo"
+
+msgid "Select a timezone"
+msgstr "Elektu horzonon"
+
+msgid "Select target branch"
+msgstr "Elektu celan branĉon"
+
+msgid "Set a password on your account to pull or push via %{protocol}"
+msgstr ""
+"Kreu pasvorton por via konto por ebligi al vi eltiri kaj alpuŝi per "
+"%{protocol}"
+
+msgid "Set up CI"
+msgstr "Agordi SI"
+
+msgid "Set up Koding"
+msgstr "Agordi „Koding“"
+
+msgid "Set up auto deploy"
+msgstr "Agordi aŭtomatan disponigadon"
+
+msgid "SetPasswordToCloneLink|set a password"
+msgstr "kreos pasvorton"
+
+msgid "Showing %d event"
+msgid_plural "Showing %d events"
+msgstr[0] "Estas montrata %d evento"
+msgstr[1] "Estas montrataj %d eventoj"
+
+msgid "Source code"
+msgstr "Kodo"
+
+msgid "StarProject|Star"
+msgstr "Steligi"
+
+msgid "Start a %{new_merge_request} with these changes"
+msgstr "Kreu %{new_merge_request} kun ĉi tiuj ŝanĝoj"
+
+msgid "Switch branch/tag"
+msgstr "Iri al branĉo/etikedo"
+
+msgid "Tag"
+msgid_plural "Tags"
+msgstr[0] "Etikedo"
+msgstr[1] "Etikedoj"
+
+msgid "Tags"
+msgstr "Etikedoj"
+
+msgid "Target Branch"
+msgstr "Cela branĉo"
+
+msgid ""
+"The coding stage shows the time from the first commit to creating the merge "
+"request. The data will automatically be added here once you create your "
+"first merge request."
+msgstr ""
+"La etapo de programado montras la tempon de la unua enmetado ĝis la kreado "
+"de la peto pri kunfando. La datenoj aldoniĝos aŭtomate ĉi tie post kiam vi "
+"kreas la unuan peton pri kunfando."
+
+msgid "The collection of events added to the data gathered for that stage."
+msgstr ""
+"La aro da eventoj, kiuj estas aldonitaj al la datenoj kolektitaj por la "
+"etapo."
+
+msgid "The fork relationship has been removed."
+msgstr "La rilato de disbranĉigo estis forigita."
+
+msgid ""
+"The issue stage shows the time it takes from creating an issue to assigning "
+"the issue to a milestone, or add the issue to a list on your Issue Board. "
+"Begin creating issues to see data for this stage."
+msgstr ""
+"La etapo de la problemo montras kiom la tempo pasas de la kreado de problemo "
+"ĝis la atribuado de la problemo al cela etapo de la projekto, aŭ al listo "
+"sur la problemtabulo. Komencu krei problemojn por vidi la datenojn por ĉi "
+"tiu etapo."
+
+msgid "The phase of the development lifecycle."
+msgstr "La etapo de la disvolva ciklo."
+
+msgid ""
+"The pipelines schedule runs pipelines in the future, repeatedly, for "
+"specific branches or tags. Those scheduled pipelines will inherit limited "
+"project access based on their associated user."
+msgstr ""
+"La ĉenstabla plano plenumas ĉenstablojn en la estonteco, ripete, por "
+"difinitaj branĉoj aŭ etikedoj. Tiuj planitaj ĉenstabloj heredos la limigitan "
+"atingon al la projekto de la rilata uzanto."
+
+msgid ""
+"The planning stage shows the time from the previous step to pushing your "
+"first commit. This time will be added automatically once you push your first "
+"commit."
+msgstr ""
+"La etapo de la plano montras la tempon de la antaŭa ŝtupo ĝis la alpuŝado de "
+"via unua enmetado. Ĉi tiu tempo aldoniĝos aŭtomate post kiam vi alpuŝas la "
+"unuan enmetadon."
+
+msgid ""
+"The production stage shows the total time it takes between creating an issue "
+"and deploying the code to production. The data will be automatically added "
+"once you have completed the full idea to production cycle."
+msgstr ""
+"La etapo de eldonado montras la tutan tempon de la kreado de problemo ĝis la "
+"disponigado en la publika versio. La datenoj aldoniĝos aŭtomate post kiam vi "
+"kompletigos plenan ciklon de ideo ĝis realaĵo."
+
+msgid "The project can be accessed by any logged in user."
+msgstr "Ĉiu ensalutita uzanto havas atingon al la projekto"
+
+msgid "The project can be accessed without any authentication."
+msgstr "Ĉiu povas havi atingon al la projekto, sen ensaluti"
+
+msgid "The repository for this project does not exist."
+msgstr "La deponejo por ĉi tiu projekto ne ekzistas."
+
+msgid ""
+"The review stage shows the time from creating the merge request to merging "
+"it. The data will automatically be added after you merge your first merge "
+"request."
+msgstr ""
+"La etapo de la kontrolo montras la tempon de la kreado de la peto pri "
+"kunfando ĝis ĝia aplikado. La datenoj aldoniĝos aŭtomate post kiam vi "
+"aplikos la unuan peton pri kunfando."
+
+msgid ""
+"The staging stage shows the time between merging the MR and deploying code "
+"to the production environment. The data will be automatically added once you "
+"deploy to production for the first time."
+msgstr ""
+"La etapo de preparo por eldono montras la tempon inter la aplikado de la "
+"peto pri kunfando kaj la disponigado de la kodo en la publika versio. La "
+"datenoj aldoniĝos aŭtomate post kiam vi faros la unuan disponigadon en la "
+"publika versio."
+
+msgid ""
+"The testing stage shows the time GitLab CI takes to run every pipeline for "
+"the related merge request. The data will automatically be added after your "
+"first pipeline finishes running."
+msgstr ""
+"La etapo de testado montras kiom da tempo necesas al „GitLab CI“ por plenumi "
+"ĉiujn ĉenstablojn por la rilata peto pri kunfando. La datenoj aldoniĝos "
+"aŭtomate post kiam via unua ĉenstablo finiĝos."
+
+msgid "The time taken by each data entry gathered by that stage."
+msgstr "La tempo, kiu estas necesa por ĉiu dateno kolektita de la etapo."
+
+msgid ""
+"The value lying at the midpoint of a series of observed values. E.g., "
+"between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 ="
+" 6."
+msgstr ""
+"La valoro, kiu troviĝas en la mezo de aro da rigardataj valoroj. Ekzemple: "
+"inter 3, 5 kaj 9, la mediano estas 5. Inter 3, 5, 7 kaj 8, la mediano estas "
+"(5+7)/2 = 6."
+
+msgid ""
+"This means you can not push code until you create an empty repository or "
+"import existing one."
+msgstr ""
+"Ĉi tiu signifas, ke vi ne povos alpuŝi kodon, antaŭ ol vi kreos malplenan "
+"deponejon aŭ enportos jam ekzistantan."
+
+msgid "Time before an issue gets scheduled"
+msgstr "Tempo antaŭ problemo estas planita por ellabori"
+
+msgid "Time before an issue starts implementation"
+msgstr "Tempo antaŭ la komenco de laboro super problemo"
+
+msgid "Time between merge request creation and merge/close"
+msgstr "Tempo inter la kreado de poeto pri kunfando kaj ĝia aplikado/fermado"
+
+msgid "Time until first merge request"
+msgstr "Tempo ĝis la unua peto pri kunfando"
+
+msgid "Timeago|%s days ago"
+msgstr "antaŭ %s tagoj"
+
+msgid "Timeago|%s days remaining"
+msgstr "restas %s tagoj"
+
+msgid "Timeago|%s hours remaining"
+msgstr "restas %s horoj"
+
+msgid "Timeago|%s minutes ago"
+msgstr "antaŭ %s minutoj"
+
+msgid "Timeago|%s minutes remaining"
+msgstr "restas %s minutoj"
+
+msgid "Timeago|%s months ago"
+msgstr "antaŭ %s monatoj"
+
+msgid "Timeago|%s months remaining"
+msgstr "restas %s monatoj"
+
+msgid "Timeago|%s seconds remaining"
+msgstr "restas %s sekundoj"
+
+msgid "Timeago|%s weeks ago"
+msgstr "antaŭ %s semajnoj"
+
+msgid "Timeago|%s weeks remaining"
+msgstr "restas %s semajnoj"
+
+msgid "Timeago|%s years ago"
+msgstr "antaŭ %s jaroj"
+
+msgid "Timeago|%s years remaining"
+msgstr "restas %s jaroj"
+
+msgid "Timeago|1 day remaining"
+msgstr "restas 1 tago"
+
+msgid "Timeago|1 hour remaining"
+msgstr "restas 1 horo"
+
+msgid "Timeago|1 minute remaining"
+msgstr "restas 1 minuto"
+
+msgid "Timeago|1 month remaining"
+msgstr "restas 1 monato"
+
+msgid "Timeago|1 week remaining"
+msgstr "restas 1 semajno"
+
+msgid "Timeago|1 year remaining"
+msgstr "restas 1 jaro"
+
+msgid "Timeago|Past due"
+msgstr "Malfruiĝis"
+
+msgid "Timeago|a day ago"
+msgstr "antaŭ unu tago"
+
+msgid "Timeago|a month ago"
+msgstr "antaŭ unu monato"
+
+msgid "Timeago|a week ago"
+msgstr "antaŭ unu semajno"
+
+msgid "Timeago|a while"
+msgstr "antaŭ iom da tempo"
+
+msgid "Timeago|a year ago"
+msgstr "antaŭ unu jaro"
+
+msgid "Timeago|about %s hours ago"
+msgstr "antaŭ ĉirkaŭ %s horoj"
+
+msgid "Timeago|about a minute ago"
+msgstr "antaŭ ĉirkaŭ unu minuto"
+
+msgid "Timeago|about an hour ago"
+msgstr "antaŭ ĉirkaŭ unu horo"
+
+msgid "Timeago|in %s days"
+msgstr "post %s tagoj"
+
+msgid "Timeago|in %s hours"
+msgstr "post %s horoj"
+
+msgid "Timeago|in %s minutes"
+msgstr "post %s minutoj"
+
+msgid "Timeago|in %s months"
+msgstr "post %s monatoj"
+
+msgid "Timeago|in %s seconds"
+msgstr "post %s sekundoj"
+
+msgid "Timeago|in %s weeks"
+msgstr "post %s semajnoj"
+
+msgid "Timeago|in %s years"
+msgstr "post %s jaroj"
+
+msgid "Timeago|in 1 day"
+msgstr "post 1 tago"
+
+msgid "Timeago|in 1 hour"
+msgstr "post 1 horo"
+
+msgid "Timeago|in 1 minute"
+msgstr "post 1 minuto"
+
+msgid "Timeago|in 1 month"
+msgstr "post 1 monato"
+
+msgid "Timeago|in 1 week"
+msgstr "post 1 semajno"
+
+msgid "Timeago|in 1 year"
+msgstr "post 1 jaro"
+
+msgid "Timeago|less than a minute ago"
+msgstr "antaŭ malpli ol minuto"
+
+msgid "Time|hr"
+msgid_plural "Time|hrs"
+msgstr[0] "h"
+msgstr[1] "h"
+
+msgid "Time|min"
+msgid_plural "Time|mins"
+msgstr[0] "min"
+msgstr[1] "min"
+
+msgid "Time|s"
+msgstr "s"
+
+msgid "Total Time"
+msgstr "Totala tempo"
+
+msgid "Total test time for all commits/merges"
+msgstr "Totala tempo por la testado de ĉiuj enmetadoj/kunfandoj"
+
+msgid "Unstar"
+msgstr "Malsteligi"
+
+msgid "Upload New File"
+msgstr "Alŝuti novan dosieron"
+
+msgid "Upload file"
+msgstr "Alŝuti dosieron"
+
+msgid "Use your global notification setting"
+msgstr "Uzi vian ĝeneralan agordon pri la sciigoj"
+
+msgid "VisibilityLevel|Internal"
+msgstr "Interna"
+
+msgid "VisibilityLevel|Private"
+msgstr "Privata"
+
+msgid "VisibilityLevel|Public"
+msgstr "Publika"
+
+msgid "Want to see the data? Please ask an administrator for access."
+msgstr ""
+"Ĉu vi volas vidi la datenojn? Bonvolu peti atingeblon de administranto."
+
+msgid "We don't have enough data to show this stage."
+msgstr "Ne estas sufiĉe da datenoj por montri ĉi tiun etapon."
+
+msgid "Withdraw Access Request"
+msgstr "Nuligi la peton pri atingeblo"
+
+msgid ""
+"You are going to remove %{project_name_with_namespace}.\n"
+"Removed project CANNOT be restored!\n"
+"Are you ABSOLUTELY sure?"
+msgstr ""
+"Vi forigos „%{project_name_with_namespace}“.\n"
+"Oni NE POVAS malfari la forigon de projekto!\n"
+"Ĉu vi estas ABSOLUTE certa?"
+
+msgid ""
+"You are going to remove the fork relationship to source project "
+"%{forked_from_project}. Are you ABSOLUTELY sure?"
+msgstr ""
+"Vi forigos la rilaton de la disbranĉigo al la originala projekto, "
+"„%{forked_from_project}“. Ĉu vi estas ABSOLUTE certa?"
+
+msgid ""
+"You are going to transfer %{project_name_with_namespace} to another owner. "
+"Are you ABSOLUTELY sure?"
+msgstr ""
+"Vi transigos „%{project_name_with_namespace}“ al alia posedanto. Ĉu vi estas "
+"ABSOLUTE certa?"
+
+msgid "You can only add files when you are on a branch"
+msgstr "Oni povas aldoni dosierojn nur kiam oni estas en branĉo"
+
+msgid "You have reached your project limit"
+msgstr "Vi ne povas krei pliajn projektojn"
+
+msgid "You must sign in to star a project"
+msgstr "Oni devas ensaluti por steligi projekton"
+
+msgid "You need permission."
+msgstr "VI bezonas permeson."
+
+msgid "You will not get any notifications via email"
+msgstr "VI ne ricevos sciigojn per retpoŝto"
+
+msgid "You will only receive notifications for the events you choose"
+msgstr "Vi ricevos sciigojn nur por la eventoj elektitaj de vi"
+
+msgid ""
+"You will only receive notifications for threads you have participated in"
+msgstr "Vi ricevos sciigojn nur por la fadenoj, en kiuj vi partoprenis"
+
+msgid "You will receive notifications for any activity"
+msgstr "Vi ricevos sciigojn por ĉiu ago"
+
+msgid ""
+"You will receive notifications only for comments in which you were "
+"@mentioned"
+msgstr "Vi ricevos sciigojn nur por komentoj, en kiuj vi estas @menciita"
+
+msgid ""
+"You won't be able to pull or push project code via %{protocol} until you "
+"%{set_password_link} on your account"
+msgstr ""
+"Vi ne povos eltiri aŭ alpuŝi kodon per %{protocol} antaŭ ol vi "
+"%{set_password_link} por via konto"
+
+msgid ""
+"You won't be able to pull or push project code via SSH until you "
+"%{add_ssh_key_link} to your profile"
+msgstr ""
+"Vi ne povos eltiri aŭ alpuŝi kodon per SSH antaŭ ol vi %{add_ssh_key_link} "
+"al via profilo"
+
+msgid "Your name"
+msgstr "Via nomo"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "tago"
+msgstr[1] "tagoj"
+
+msgid "new merge request"
+msgstr "novan peton pri kunfando"
+
+msgid "notification emails"
+msgstr "sciigoj per retpoŝto"
+
+msgid "parent"
+msgid_plural "parents"
+msgstr[0] "patro"
+msgstr[1] "patroj"
+
diff --git a/locale/eo/gitlab.po.time_stamp b/locale/eo/gitlab.po.time_stamp
new file mode 100644
index 00000000000..e69de29bb2d
-- 
cgit v1.2.1


From 660477f2a1a828fe7ecae8793443cfd86e443f4f Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Mon, 26 Jun 2017 14:57:32 +0900
Subject: Drop GFM support for issuable title on milestone for consistency and
 performance

---
 app/views/shared/milestones/_issuable.html.haml                      | 2 +-
 changelogs/unreleased/34289-drop-gfm-on-milestone-issuable-title.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/34289-drop-gfm-on-milestone-issuable-title.yml

diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml
index 22547a30cdf..a7c67ac9980 100644
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@@ -16,7 +16,7 @@
       %strong #{project.name_with_namespace} &middot;
     - if issuable.is_a?(Issue)
       = confidential_icon(issuable)
-    = link_to_gfm issuable.title, issuable_url_args, title: issuable.title
+    = link_to issuable.title, issuable_url_args, title: issuable.title
   .issuable-detail
     = link_to [project.namespace.becomes(Namespace), project, issuable] do
       %span.issuable-number= issuable.to_reference
diff --git a/changelogs/unreleased/34289-drop-gfm-on-milestone-issuable-title.yml b/changelogs/unreleased/34289-drop-gfm-on-milestone-issuable-title.yml
new file mode 100644
index 00000000000..42e906d24c6
--- /dev/null
+++ b/changelogs/unreleased/34289-drop-gfm-on-milestone-issuable-title.yml
@@ -0,0 +1,4 @@
+---
+title: Drop GFM support for issuable title on milestone for consistency and performance
+merge_request:
+author: Takuya Noguchi
-- 
cgit v1.2.1


From 7ccc6322e31de2fde15ffbbf8d74f19c414f224c Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Mon, 26 Jun 2017 09:31:10 +0200
Subject: Remove last references to job for pipeline charts

This is not ammended to another commit as it will probably have failing
tests which I'll fix and amend to this commit.
---
 app/views/projects/pipelines/charts/_overall.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/pipelines/charts/_overall.haml b/app/views/projects/pipelines/charts/_overall.haml
index 6ce26424050..93083397d5b 100644
--- a/app/views/projects/pipelines/charts/_overall.haml
+++ b/app/views/projects/pipelines/charts/_overall.haml
@@ -2,13 +2,13 @@
 %ul
   %li
     Total:
-    %strong= pluralize @counts[:total], 'job'
+    %strong= pluralize @counts[:total], 'pipeline'
   %li
     Successful:
-    %strong= pluralize @counts[:success], 'job'
+    %strong= pluralize @counts[:success], 'pipeline'
   %li
     Failed:
-    %strong= pluralize @counts[:failed], 'job'
+    %strong= pluralize @counts[:failed], 'pipeline'
   %li
     Success ratio:
     %strong
-- 
cgit v1.2.1


From 0c174a6aff1623a46f6060f749271cd2c49bec60 Mon Sep 17 00:00:00 2001
From: Job van der Voort <jobvandervoort@gmail.com>
Date: Mon, 26 Jun 2017 10:41:44 +0100
Subject: make accepting mrs more prominent

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b6c87ae518..89e505709a3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,6 +49,8 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
 Thank you for your interest in contributing to GitLab. This guide details how
 to contribute to GitLab in a way that is efficient for everyone.
 
+Looking for something to work on? Look for the label [Accepting Merge Requests](#i-want-to-contribute).
+
 GitLab comes into two flavors, GitLab Community Edition (CE) our free and open
 source edition, and GitLab Enterprise Edition (EE) which is our commercial
 edition. Throughout this guide you will see references to CE and EE for
-- 
cgit v1.2.1


From 2fb004ea861394550566afef06072d8c62813670 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 26 Jun 2017 10:23:03 +0100
Subject: Fix click not being able to find the current element to use
 trigger('click') instead

---
 spec/features/projects/environments/environments_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 83883dba0ba..cf4d996a32d 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -151,7 +151,7 @@ feature 'Environments page', :feature, :js do
           find('.js-dropdown-play-icon-container').click
           expect(page).to have_content(action.name.humanize)
 
-          expect { find('.js-manual-action-link').click }
+          expect { find('.js-manual-action-link').trigger('click') }
             .not_to change { Ci::Pipeline.count }
         end
 
-- 
cgit v1.2.1


From c9625bdc1747fa494c583095d7d44f813d90989a Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Mon, 26 Jun 2017 13:30:08 +0000
Subject: Update GITLAB_SHELL_VERSION to 5.0.6

---
 GITLAB_SHELL_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index ab0fa336dd0..c20c645d7e4 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-5.0.5
+5.0.6
-- 
cgit v1.2.1


From a7ccf27d28e84ebe889b7d8f6bdd5f04a751fd3c Mon Sep 17 00:00:00 2001
From: Alexander Randa <randa.alex@gmail.com>
Date: Sun, 25 Jun 2017 11:14:07 +0300
Subject: Replaces 'dashboard/merge_requests' spinach with rspec

---
 .../23036-replace-dashboard-mr-spinach.yml         |   4 +
 features/dashboard/merge_requests.feature          |  21 ----
 features/steps/dashboard/merge_requests.rb         | 121 ---------------------
 spec/features/dashboard/merge_requests_spec.rb     |  97 ++++++++++++++---
 spec/features/dashboard/milestone_filter_spec.rb   |  22 ++--
 spec/support/filter_item_select_helper.rb          |  19 ++++
 6 files changed, 114 insertions(+), 170 deletions(-)
 create mode 100644 changelogs/unreleased/23036-replace-dashboard-mr-spinach.yml
 delete mode 100644 features/dashboard/merge_requests.feature
 delete mode 100644 features/steps/dashboard/merge_requests.rb
 create mode 100644 spec/support/filter_item_select_helper.rb

diff --git a/changelogs/unreleased/23036-replace-dashboard-mr-spinach.yml b/changelogs/unreleased/23036-replace-dashboard-mr-spinach.yml
new file mode 100644
index 00000000000..07c201de96e
--- /dev/null
+++ b/changelogs/unreleased/23036-replace-dashboard-mr-spinach.yml
@@ -0,0 +1,4 @@
+---
+title: Replace 'dashboard/merge_requests' spinach with rspec
+merge_request: 12440
+author: Alexander Randa (@randaalex)
diff --git a/features/dashboard/merge_requests.feature b/features/dashboard/merge_requests.feature
deleted file mode 100644
index 4a2c997d707..00000000000
--- a/features/dashboard/merge_requests.feature
+++ /dev/null
@@ -1,21 +0,0 @@
-@dashboard
-Feature: Dashboard Merge Requests
-  Background:
-    Given I sign in as a user
-    And I have authored merge requests
-    And I have assigned merge requests
-    And I have other merge requests
-    And I visit dashboard merge requests page
-
-  Scenario: I should see assigned merge_requests
-    Then I should see merge requests assigned to me
-
-  @javascript
-  Scenario: I should see authored merge_requests
-    When I click "Authored by me" link
-    Then I should see merge requests authored by me
-
-  @javascript
-  Scenario: I should see all merge_requests
-    When I click "All" link
-    Then I should see all merge requests
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
deleted file mode 100644
index 909ffec3646..00000000000
--- a/features/steps/dashboard/merge_requests.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include Select2Helper
-
-  step 'I should see merge requests assigned to me' do
-    should_see(assigned_merge_request)
-    should_see(assigned_merge_request_from_fork)
-    should_not_see(authored_merge_request)
-    should_not_see(authored_merge_request_from_fork)
-    should_not_see(other_merge_request)
-  end
-
-  step 'I should see merge requests authored by me' do
-    should_see(authored_merge_request)
-    should_see(authored_merge_request_from_fork)
-    should_not_see(assigned_merge_request)
-    should_not_see(assigned_merge_request_from_fork)
-    should_not_see(other_merge_request)
-  end
-
-  step 'I should see all merge requests' do
-    should_see(authored_merge_request)
-    should_see(assigned_merge_request)
-    should_see(other_merge_request)
-  end
-
-  step 'I have authored merge requests' do
-    authored_merge_request
-    authored_merge_request_from_fork
-  end
-
-  step 'I have assigned merge requests' do
-    assigned_merge_request
-    assigned_merge_request_from_fork
-  end
-
-  step 'I have other merge requests' do
-    other_merge_request
-  end
-
-  step 'I click "Authored by me" link' do
-    find("#assignee_id").set("")
-    find(".js-author-search", match: :first).click
-    find(".dropdown-menu-author li a", match: :first, text: current_user.to_reference).click
-  end
-
-  step 'I click "All" link' do
-    find(".js-author-search").click
-    expect(page).to have_selector(".dropdown-menu-author li a")
-    find(".dropdown-menu-author li a", match: :first).click
-    expect(page).not_to have_selector(".dropdown-menu-author li a")
-
-    find(".js-assignee-search").click
-    expect(page).to have_selector(".dropdown-menu-assignee li a")
-    find(".dropdown-menu-assignee li a", match: :first).click
-    expect(page).not_to have_selector(".dropdown-menu-assignee li a")
-  end
-
-  def should_see(merge_request)
-    expect(page).to have_content(merge_request.title[0..10])
-  end
-
-  def should_not_see(merge_request)
-    expect(page).not_to have_content(merge_request.title[0..10])
-  end
-
-  def assigned_merge_request
-    @assigned_merge_request ||= create :merge_request,
-                                  assignee: current_user,
-                                  target_project: project,
-                                  source_project: project
-  end
-
-  def authored_merge_request
-    @authored_merge_request ||= create :merge_request,
-                                  source_branch: 'markdown',
-                                  author: current_user,
-                                  target_project: project,
-                                  source_project: project
-  end
-
-  def other_merge_request
-    @other_merge_request ||= create :merge_request,
-                              source_branch: 'fix',
-                              target_project: project,
-                              source_project: project
-  end
-
-  def authored_merge_request_from_fork
-    @authored_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'feature_conflict',
-                                            author: current_user,
-                                            target_project: public_project,
-                                            source_project: forked_project
-  end
-
-  def assigned_merge_request_from_fork
-    @assigned_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'markdown',
-                                            assignee: current_user,
-                                            target_project: public_project,
-                                            source_project: forked_project
-  end
-
-  def project
-    @project ||= begin
-                   project = create(:project, :repository)
-                   project.team << [current_user, :master]
-                   project
-                 end
-  end
-
-  def public_project
-    @public_project ||= create(:project, :public, :repository)
-  end
-
-  def forked_project
-    @forked_project ||= Projects::ForkService.new(public_project, current_user).execute
-  end
-end
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index 69d5500848e..bb1fb5b3feb 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -1,18 +1,24 @@
 require 'spec_helper'
 
-describe 'Dashboard Merge Requests' do
+feature 'Dashboard Merge Requests' do
+  include FilterItemSelectHelper
+
   let(:current_user) { create :user }
   let(:project) { create(:empty_project) }
-  let(:project_with_merge_requests_disabled) { create(:empty_project, :merge_requests_disabled) }
 
-  before do
-    [project, project_with_merge_requests_disabled].each { |project| project.team << [current_user, :master] }
+  let(:public_project) { create(:empty_project, :public, :repository) }
+  let(:forked_project) { Projects::ForkService.new(public_project, current_user).execute }
 
-    gitlab_sign_in(current_user)
+  before do
+    project.add_master(current_user)
+    sign_in(current_user)
   end
 
-  describe 'new merge request dropdown' do
+  context 'new merge request dropdown' do
+    let(:project_with_disabled_merge_requests) { create(:empty_project, :merge_requests_disabled) }
+
     before do
+      project_with_disabled_merge_requests.add_master(current_user)
       visit merge_requests_dashboard_path
     end
 
@@ -21,26 +27,87 @@ describe 'Dashboard Merge Requests' do
 
       page.within('.select2-results') do
         expect(page).to have_content(project.name_with_namespace)
-        expect(page).not_to have_content(project_with_merge_requests_disabled.name_with_namespace)
+        expect(page).not_to have_content(project_with_disabled_merge_requests.name_with_namespace)
       end
     end
   end
 
-  it 'should show an empty state' do
-    visit merge_requests_dashboard_path(assignee_id: current_user.id)
+  context 'no merge requests exist' do
+    it 'shows an empty state' do
+      visit merge_requests_dashboard_path(assignee_id: current_user.id)
 
-    expect(page).to have_selector('.empty-state')
+      expect(page).to have_selector('.empty-state')
+    end
   end
 
-  context 'if there are merge requests' do
-    before do
-      create(:merge_request, assignee: current_user, source_project: project)
+  context 'merge requests exist' do
+    let!(:assigned_merge_request) do
+      create(:merge_request, assignee: current_user, target_project: project, source_project: project)
+    end
+
+    let!(:assigned_merge_request_from_fork) do
+      create(:merge_request,
+              source_branch: 'markdown', assignee: current_user,
+              target_project: public_project, source_project: forked_project
+            )
+    end
 
+    let!(:authored_merge_request) do
+      create(:merge_request,
+              source_branch: 'markdown', author: current_user,
+              target_project: project, source_project: project
+            )
+    end
+
+    let!(:authored_merge_request_from_fork) do
+      create(:merge_request,
+              source_branch: 'feature_conflict',
+              author: current_user,
+              target_project: public_project, source_project: forked_project
+            )
+    end
+
+    let!(:other_merge_request) do
+      create(:merge_request,
+              source_branch: 'fix',
+              target_project: project, source_project: project
+            )
+    end
+
+    before do
       visit merge_requests_dashboard_path(assignee_id: current_user.id)
     end
 
-    it 'should not show an empty state' do
-      expect(page).not_to have_selector('.empty-state')
+    it 'shows assigned merge requests' do
+      expect(page).to have_content(assigned_merge_request.title)
+      expect(page).to have_content(assigned_merge_request_from_fork.title)
+
+      expect(page).not_to have_content(authored_merge_request.title)
+      expect(page).not_to have_content(authored_merge_request_from_fork.title)
+      expect(page).not_to have_content(other_merge_request.title)
+    end
+
+    it 'shows authored merge requests', js: true do
+      filter_item_select('Any Assignee', '.js-assignee-search')
+      filter_item_select(current_user.to_reference, '.js-author-search')
+
+      expect(page).to have_content(authored_merge_request.title)
+      expect(page).to have_content(authored_merge_request_from_fork.title)
+
+      expect(page).not_to have_content(assigned_merge_request.title)
+      expect(page).not_to have_content(assigned_merge_request_from_fork.title)
+      expect(page).not_to have_content(other_merge_request.title)
+    end
+
+    it 'shows all merge requests', js: true do
+      filter_item_select('Any Assignee', '.js-assignee-search')
+      filter_item_select('Any Author', '.js-author-search')
+
+      expect(page).to have_content(authored_merge_request.title)
+      expect(page).to have_content(authored_merge_request_from_fork.title)
+      expect(page).to have_content(assigned_merge_request.title)
+      expect(page).to have_content(assigned_merge_request_from_fork.title)
+      expect(page).to have_content(other_merge_request.title)
     end
   end
 end
diff --git a/spec/features/dashboard/milestone_filter_spec.rb b/spec/features/dashboard/milestone_filter_spec.rb
index 295262980a6..b0e4036f27c 100644
--- a/spec/features/dashboard/milestone_filter_spec.rb
+++ b/spec/features/dashboard/milestone_filter_spec.rb
@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-describe 'Dashboard > milestone filter', :feature, :js do
+feature 'Dashboard > milestone filter', :feature, :js do
+  include FilterItemSelectHelper
+
   let(:user) { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
-  let(:milestone) { create(:milestone, title: "v1.0", project: project) }
-  let(:milestone2) { create(:milestone, title: "v2.0", project: project) }
+  let(:milestone) { create(:milestone, title: 'v1.0', project: project) }
+  let(:milestone2) { create(:milestone, title: 'v2.0', project: project) }
   let!(:issue) { create :issue, author: user, project: project, milestone: milestone }
   let!(:issue2) { create :issue, author: user, project: project, milestone: milestone2 }
 
@@ -22,17 +24,11 @@ describe 'Dashboard > milestone filter', :feature, :js do
   end
 
   context 'filtering by milestone' do
-    milestone_select = '.js-milestone-select'
+    milestone_select_selector = '.js-milestone-select'
 
     before do
-      find(milestone_select).click
-      wait_for_requests
-
-      page.within('.dropdown-content') do
-        click_link 'v1.0'
-      end
-
-      find(milestone_select).click
+      filter_item_select('v1.0', milestone_select_selector)
+      find(milestone_select_selector).click
       wait_for_requests
     end
 
@@ -49,7 +45,7 @@ describe 'Dashboard > milestone filter', :feature, :js do
 
       expect(find('.milestone-filter')).not_to have_selector('.dropdown.open')
 
-      find(milestone_select).click
+      find(milestone_select_selector).click
 
       expect(find('.dropdown-content')).to have_selector('a.is-active', count: 1)
       expect(find('.dropdown-content a.is-active')).to have_content('v1.0')
diff --git a/spec/support/filter_item_select_helper.rb b/spec/support/filter_item_select_helper.rb
new file mode 100644
index 00000000000..519e84d359e
--- /dev/null
+++ b/spec/support/filter_item_select_helper.rb
@@ -0,0 +1,19 @@
+# Helper allows you to select value from filter-items
+#
+# Params
+#   value - value for select
+#   selector - css selector of item
+#
+# Usage:
+#
+#   filter_item_select('Any Author', '.js-author-search')
+#
+module FilterItemSelectHelper
+  def filter_item_select(value, selector)
+    find(selector).click
+    wait_for_requests
+    page.within('.dropdown-content') do
+      click_link value
+    end
+  end
+end
-- 
cgit v1.2.1


From 0c10b2c9b3ea4fb58e890066d1336da58353a8b7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Mon, 26 Jun 2017 09:52:31 -0500
Subject: Truncate long job names in environment view; wrap author to next line

---
 app/views/projects/deployments/_deployment.html.haml | 11 +++++++----
 app/views/projects/environments/show.html.haml       |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index 26f3c297260..520696b01c6 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -11,11 +11,14 @@
     .table-mobile-header{ role: 'rowheader' } Job
     - if deployment.deployable
       .table-mobile-content
-        = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
-          #{deployment.deployable.name} (##{deployment.deployable.id})
+        .flex-truncate-parent
+          .flex-truncate-child
+            = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do
+              #{deployment.deployable.name} (##{deployment.deployable.id})
         - if deployment.user
-          by
-          = user_avatar(user: deployment.user, size: 20)
+          %div
+            by
+            = user_avatar(user: deployment.user, size: 20)
 
   .table-section.section-15{ role: 'gridcell' }
     .table-mobile-header{ role: 'rowheader' } Created
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index 23aa4c29e69..31e2bb11ce8 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -31,8 +31,8 @@
         .ci-table.environments{ role: 'grid' }
           .gl-responsive-table-row.table-row-header{ role: 'row' }
             .table-section.section-10{ role: 'columnheader' } ID
-            .table-section.section-40{ role: 'columnheader' } Commit
-            .table-section.section-15{ role: 'columnheader' } Job
+            .table-section.section-30{ role: 'columnheader' } Commit
+            .table-section.section-25{ role: 'columnheader' } Job
             .table-section.section-15{ role: 'columnheader' } Created
 
           = render @deployments
-- 
cgit v1.2.1


From e935d2ec9347b6ec65989ae78e3ffad7c26db453 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 26 Jun 2017 07:52:43 -0700
Subject: Bump premailer-rails gem to 1.9.7 and its dependencies to prevent
 network retrieval of assets

Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem
would fall back to fetching assets via HTTP(s) since the Sidekiq working
directory was not the Rails root. In some instances, SSL verification would
fail, preventing e-mails from being sent.

premailer-rails 1.9.7 has a fix
(https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute
directory to load assets from the filesystem so that the assets can be fetched
locally instead of over the network.

Closes #34231
---
 Gemfile                                                       |  2 +-
 Gemfile.lock                                                  | 11 ++++++-----
 changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml |  5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml

diff --git a/Gemfile b/Gemfile
index 6c53bfe6efe..3cc40eb26a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -256,7 +256,7 @@ gem 'base32', '~> 0.3.0'
 # Sentry integration
 gem 'sentry-raven', '~> 2.4.0'
 
-gem 'premailer-rails', '~> 1.9.0'
+gem 'premailer-rails', '~> 1.9.7'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7c9dd051211..817a1fd6aa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,7 +137,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     creole (0.5.0)
-    css_parser (1.4.1)
+    css_parser (1.5.0)
       addressable
     d3_rails (3.5.11)
       railties (>= 3.1.0)
@@ -589,10 +589,11 @@ GEM
       websocket-driver (>= 0.2.0)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
-    premailer (1.8.6)
-      css_parser (>= 1.3.6)
+    premailer (1.10.4)
+      addressable
+      css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.2)
+    premailer-rails (1.9.7)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     prometheus-client-mmap (0.7.0.beta5)
@@ -1045,7 +1046,7 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   poltergeist (~> 1.9.0)
-  premailer-rails (~> 1.9.0)
+  premailer-rails (~> 1.9.7)
   prometheus-client-mmap (~> 0.7.0.beta5)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
diff --git a/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml
new file mode 100644
index 00000000000..9e3c3e19bea
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml
@@ -0,0 +1,5 @@
+---
+title: Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval
+  of assets
+merge_request:
+author:
-- 
cgit v1.2.1


From ce25b15c2d7a16cbacb3bfd772af99114d1c291e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 26 Jun 2017 17:32:22 +0200
Subject: Tag a spec as :nested_groups since it fails on MySQL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was broken by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/helpers/groups_helper_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb
index 84a60ce13fc..8da22dc78fa 100644
--- a/spec/helpers/groups_helper_spec.rb
+++ b/spec/helpers/groups_helper_spec.rb
@@ -84,7 +84,7 @@ describe GroupsHelper do
     end
   end
 
-  describe 'group_title' do
+  describe 'group_title', :nested_groups do
     let(:group) { create(:group) }
     let(:nested_group) { create(:group, parent: group) }
     let(:deep_nested_group) { create(:group, parent: nested_group) }
-- 
cgit v1.2.1


From 0eb3d18c569cbae0f4b58284857c7a21972c4153 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Mon, 26 Jun 2017 17:36:09 +0200
Subject: Store merge request ref_fetched status in the database

Closes #34052
---
 app/models/merge_request.rb                        |  9 +++++-
 .../34052-store-mr-ref-fetched-in-database.yml     |  4 +++
 ...70622162730_add_ref_fetched_to_merge_request.rb |  9 ++++++
 db/schema.rb                                       |  3 +-
 lib/gitlab/import_export/import_export.yml         |  1 +
 spec/lib/gitlab/import_export/fork_spec.rb         |  4 ++-
 spec/models/merge_request_spec.rb                  | 36 ++++++++++++++++++++++
 7 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/34052-store-mr-ref-fetched-in-database.yml
 create mode 100644 db/migrate/20170622162730_add_ref_fetched_to_merge_request.rb

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index f581a25f093..c099d731082 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -771,6 +771,7 @@ class MergeRequest < ActiveRecord::Base
       "refs/heads/#{source_branch}",
       ref_path
     )
+    update_column(:ref_fetched, true)
   end
 
   def ref_path
@@ -778,7 +779,13 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def ref_fetched?
-    project.repository.ref_exists?(ref_path)
+    super ||
+      begin
+        computed_value = project.repository.ref_exists?(ref_path)
+        update_column(:ref_fetched, true) if computed_value
+
+        computed_value
+      end
   end
 
   def ensure_ref_fetched
diff --git a/changelogs/unreleased/34052-store-mr-ref-fetched-in-database.yml b/changelogs/unreleased/34052-store-mr-ref-fetched-in-database.yml
new file mode 100644
index 00000000000..4bacfca7551
--- /dev/null
+++ b/changelogs/unreleased/34052-store-mr-ref-fetched-in-database.yml
@@ -0,0 +1,4 @@
+---
+title: Store merge request ref_fetched status in the database
+merge_request: 12424
+author:
diff --git a/db/migrate/20170622162730_add_ref_fetched_to_merge_request.rb b/db/migrate/20170622162730_add_ref_fetched_to_merge_request.rb
new file mode 100644
index 00000000000..62aa1a4b4f0
--- /dev/null
+++ b/db/migrate/20170622162730_add_ref_fetched_to_merge_request.rb
@@ -0,0 +1,9 @@
+class AddRefFetchedToMergeRequest < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :merge_requests, :ref_fetched, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 028556bdccf..8c7440ee610 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170621102400) do
+ActiveRecord::Schema.define(version: 20170622162730) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -770,6 +770,7 @@ ActiveRecord::Schema.define(version: 20170621102400) do
     t.datetime "last_edited_at"
     t.integer "last_edited_by_id"
     t.integer "head_pipeline_id"
+    t.boolean "ref_fetched"
   end
 
   add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 72183e8aad4..1860352c96d 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -99,6 +99,7 @@ excluded_attributes:
     - :milestone_id
   merge_requests:
     - :milestone_id
+    - :ref_fetched
   award_emoji:
     - :awardable_id
   statuses:
diff --git a/spec/lib/gitlab/import_export/fork_spec.rb b/spec/lib/gitlab/import_export/fork_spec.rb
index 42f3fc59f04..70796781532 100644
--- a/spec/lib/gitlab/import_export/fork_spec.rb
+++ b/spec/lib/gitlab/import_export/fork_spec.rb
@@ -44,6 +44,8 @@ describe 'forked project import', services: true do
   end
 
   it 'can access the MR' do
-    expect(project.merge_requests.first.ensure_ref_fetched.first).to include('refs/merge-requests/1/head')
+    project.merge_requests.first.ensure_ref_fetched
+
+    expect(project.repository.ref_exists?('refs/merge-requests/1/head')).to be_truthy
   end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 1240c9745e2..bb5273074a2 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1574,4 +1574,40 @@ describe MergeRequest, models: true do
       end
     end
   end
+
+  describe '#fetch_ref' do
+    it 'sets "ref_fetched" flag to true' do
+      subject.update!(ref_fetched: nil)
+
+      subject.fetch_ref
+
+      expect(subject.reload.ref_fetched).to be_truthy
+    end
+  end
+
+  describe '#ref_fetched?' do
+    it 'does not perform git operation when value is cached' do
+      subject.ref_fetched = true
+
+      expect_any_instance_of(Repository).not_to receive(:ref_exists?)
+      expect(subject.ref_fetched?).to be_truthy
+    end
+
+    it 'caches the value when ref exists but value is not cached' do
+      subject.update!(ref_fetched: nil)
+      allow_any_instance_of(Repository).to receive(:ref_exists?)
+        .and_return(true)
+
+      expect(subject.ref_fetched?).to be_truthy
+      expect(subject.reload.ref_fetched).to be_truthy
+    end
+
+    it 'returns false when ref does not exist' do
+      subject.update!(ref_fetched: nil)
+      allow_any_instance_of(Repository).to receive(:ref_exists?)
+        .and_return(false)
+
+      expect(subject.ref_fetched?).to be_falsey
+    end
+  end
 end
-- 
cgit v1.2.1


From 50fffb5ff6838f723df43884eeb5ead798e97453 Mon Sep 17 00:00:00 2001
From: winh <winnie@gitlab.com>
Date: Tue, 13 Jun 2017 14:03:04 +0200
Subject: Handle missing pipeline in merge request widget

---
 .../vue_merge_request_widget/components/mr_widget_pipeline.js    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
index c02e10128e2..e8b3cf2f729 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
@@ -17,6 +17,9 @@ export default {
 
       return hasCI && !ciStatus;
     },
+    hasPipeline() {
+      return Object.keys(this.mr.pipeline || {}).length > 0;
+    },
     svg() {
       return statusIconEntityMap.icon_status_failed;
     },
@@ -30,7 +33,11 @@ export default {
   template: `
     <div class="mr-widget-heading">
       <div class="ci-widget">
-        <template v-if="hasCIError">
+        <template v-if="!hasPipeline">
+          <i class="fa fa-spinner fa-spin append-right-10" aria-hidden="true"></i>
+          Waiting for pipeline...
+        </template>
+        <template v-else-if="hasCIError">
           <div class="ci-status-icon ci-status-icon-failed ci-error js-ci-error">
             <span class="js-icon-link icon-link">
               <span
-- 
cgit v1.2.1


From 1fc9262e3dc1cd56ab7867aa9ce1f296e1d4aed4 Mon Sep 17 00:00:00 2001
From: winh <winnie@gitlab.com>
Date: Fri, 23 Jun 2017 09:29:17 +0200
Subject: Handle Promise rejections in mr_widget_pipeline_spec.js

---
 .../components/mr_widget_pipeline_spec.js          | 59 +++++++++++++---------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
index 0ffa4ac46e3..4b6f171c8d6 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
@@ -86,12 +86,15 @@ describe('MRWidgetPipeline', () => {
       });
 
       it('should render message with spinner', (done) => {
-        Vue.nextTick(() => {
-          expect(el.querySelector('.pipeline-id')).toBe(null);
-          expect(el.innerText.trim()).toBe('Waiting for pipeline...');
-          expect(el.querySelectorAll('i.fa.fa-spinner.fa-spin').length).toBe(1);
-          done();
-        });
+        Vue.nextTick()
+          .then(() => {
+            expect(el.querySelector('.pipeline-id')).toBe(null);
+            expect(el.innerText.trim()).toBe('Waiting for pipeline...');
+            expect(el.querySelectorAll('i.fa.fa-spinner.fa-spin').length).toBe(1);
+            done();
+          })
+          .then(done)
+          .catch(done.fail);
       });
     });
 
@@ -112,39 +115,47 @@ describe('MRWidgetPipeline', () => {
     it('should list single stage', (done) => {
       pipeline.details.stages.splice(0, 1);
 
-      Vue.nextTick(() => {
-        expect(el.querySelectorAll('.stage-container button').length).toEqual(1);
-        expect(el.innerText).toContain('with stage');
-        done();
-      });
+      Vue.nextTick()
+        .then(() => {
+          expect(el.querySelectorAll('.stage-container button').length).toEqual(1);
+          expect(el.innerText).toContain('with stage');
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should not have stages when there is no stage', (done) => {
       vm.mr.pipeline.details.stages = [];
 
-      Vue.nextTick(() => {
-        expect(el.querySelectorAll('.stage-container button').length).toEqual(0);
-        done();
-      });
+      Vue.nextTick()
+        .then(() => {
+          expect(el.querySelectorAll('.stage-container button').length).toEqual(0);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should not have coverage text when pipeline has no coverage info', (done) => {
       vm.mr.pipeline.coverage = null;
 
-      Vue.nextTick(() => {
-        expect(el.querySelector('.js-mr-coverage')).toEqual(null);
-        done();
-      });
+      Vue.nextTick()
+        .then(() => {
+          expect(el.querySelector('.js-mr-coverage')).toEqual(null);
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should show CI error when there is a CI error', (done) => {
       vm.mr.ciStatus = null;
 
-      Vue.nextTick(() => {
-        expect(el.querySelectorAll('.js-ci-error').length).toEqual(1);
-        expect(el.innerText).toContain('Could not connect to the CI server');
-        done();
-      });
+      Vue.nextTick()
+        .then(() => {
+          expect(el.querySelectorAll('.js-ci-error').length).toEqual(1);
+          expect(el.innerText).toContain('Could not connect to the CI server');
+        })
+        .then(done)
+        .catch(done.fail);
     });
   });
 });
-- 
cgit v1.2.1


From c40dc54f26c3b959ce505e4b239baf0dd17ec06c Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Mon, 26 Jun 2017 20:15:19 +0900
Subject: Drop GFM support for the title of Milestone/MergeRequest in template

---
 app/views/projects/issues/_merge_requests.html.haml | 2 +-
 app/views/shared/milestones/_milestone.html.haml    | 2 +-
 changelogs/unreleased/34309-drop-gfm-mr-ms.yml      | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/34309-drop-gfm-mr-ms.yml

diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index d48923b422a..bda52fe461c 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -14,7 +14,7 @@
           = merge_request.to_reference
         %span.merge-request-info
           %strong
-            = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
+            = link_to merge_request.title, merge_request_path(merge_request), class: "row_title"
           - unless @issue.project.id == merge_request.target_project.id
             in
             - project = merge_request.target_project
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 9e6a76e1ddb..680e1f3a4ea 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -4,7 +4,7 @@
 %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id }
   .row
     .col-sm-6
-      %strong= link_to_gfm truncate(milestone.title, length: 100), milestone_path
+      %strong= link_to truncate(milestone.title, length: 100), milestone_path
     .col-sm-6
       .pull-right.light #{milestone.percent_complete(current_user)}% complete
   .row
diff --git a/changelogs/unreleased/34309-drop-gfm-mr-ms.yml b/changelogs/unreleased/34309-drop-gfm-mr-ms.yml
new file mode 100644
index 00000000000..07fe79e90ee
--- /dev/null
+++ b/changelogs/unreleased/34309-drop-gfm-mr-ms.yml
@@ -0,0 +1,4 @@
+---
+title: Drop GFM support for the title of Milestone/MergeRequest in template
+merge_request: 12451
+author: Takuya Noguchi
-- 
cgit v1.2.1


From 2bad43f5eefa1b452183538cdf88970a413024b3 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 26 Jun 2017 18:50:26 +0200
Subject: Remove unused Gitlab::Git::Commit#to_diff argument

---
 lib/gitlab/git/commit.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index d5d149f1423..b68378f5c0b 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -175,8 +175,8 @@ module Gitlab
       # Shows the diff between the commit's parent and the commit.
       #
       # Cuts out the header and stats from #to_patch and returns only the diff.
-      def to_diff(options = {})
-        diff_from_parent(options).patch
+      def to_diff
+        diff_from_parent.patch
       end
 
       # Returns a diff object for the changes from this commit's first parent.
-- 
cgit v1.2.1


From 9cc3500e25b60c9323bef58aadc905eb336bf1a9 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 26 Jun 2017 16:50:58 +0000
Subject: Fix endpoint not being update correctly

---
 .../javascripts/pipelines/components/stage.vue     |  3 +-
 spec/javascripts/pipelines/stage_spec.js           | 43 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue
index e98f35bb58c..87b2725a045 100644
--- a/app/assets/javascripts/pipelines/components/stage.vue
+++ b/app/assets/javascripts/pipelines/components/stage.vue
@@ -40,7 +40,6 @@ export default {
     return {
       isLoading: false,
       dropdownContent: '',
-      endpoint: this.stage.dropdown_path,
     };
   },
 
@@ -73,7 +72,7 @@ export default {
     },
 
     fetchJobs() {
-      this.$http.get(this.endpoint)
+      this.$http.get(this.stage.dropdown_path)
         .then((response) => {
           this.dropdownContent = response.json().html;
           this.isLoading = false;
diff --git a/spec/javascripts/pipelines/stage_spec.js b/spec/javascripts/pipelines/stage_spec.js
index a4f32a1faed..1b96b2e3d51 100644
--- a/spec/javascripts/pipelines/stage_spec.js
+++ b/spec/javascripts/pipelines/stage_spec.js
@@ -83,4 +83,47 @@ describe('Pipelines stage component', () => {
       }, 0);
     });
   });
+
+  describe('update endpoint correctly', () => {
+    const updatedInterceptor = (request, next) => {
+      if (request.url === 'bar') {
+        next(request.respondWith(JSON.stringify({ html: 'this is the updated content' }), {
+          status: 200,
+        }));
+      }
+      next();
+    };
+
+    beforeEach(() => {
+      Vue.http.interceptors.push(updatedInterceptor);
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(
+        Vue.http.interceptors, updatedInterceptor,
+      );
+    });
+
+    it('should update the stage to request the new endpoint provided', (done) => {
+      component.stage = {
+        status: {
+          group: 'running',
+          icon: 'running',
+          title: 'running',
+        },
+        dropdown_path: 'bar',
+      };
+
+      Vue.nextTick(() => {
+        component.$el.querySelector('button').click();
+
+        setTimeout(() => {
+          expect(
+            component.$el.querySelector('.js-builds-dropdown-container ul').textContent.trim(),
+            ).toEqual('this is the updated content');
+          done();
+        });
+      });
+    });
+  });
 });
-- 
cgit v1.2.1


From 102a17743ee6efd38f3afacf98a6a53599c93044 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Mon, 26 Jun 2017 17:29:17 +0000
Subject: Add explicit message when no runners on admin

---
 app/views/admin/runners/index.html.haml            | 35 +++++++------
 .../unreleased/33846-no-runner-for-admin.yml       |  4 ++
 spec/features/admin/admin_runners_spec.rb          | 61 +++++++++++++++-------
 3 files changed, 65 insertions(+), 35 deletions(-)
 create mode 100644 changelogs/unreleased/33846-no-runner-for-admin.yml

diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index e242e851b4d..2da8f615470 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -58,20 +58,23 @@
 
   %br
 
-  .table-holder
-    %table.table
-      %thead
-        %tr
-          %th Type
-          %th Runner token
-          %th Description
-          %th Version
-          %th Projects
-          %th Jobs
-          %th Tags
-          %th Last contact
-          %th
+  - if @runners.any?
+    .table-holder
+      %table.table
+        %thead
+          %tr
+            %th Type
+            %th Runner token
+            %th Description
+            %th Version
+            %th Projects
+            %th Jobs
+            %th Tags
+            %th Last contact
+            %th
 
-      - @runners.each do |runner|
-        = render "admin/runners/runner", runner: runner
-  = paginate @runners, theme: "gitlab"
+        - @runners.each do |runner|
+          = render "admin/runners/runner", runner: runner
+    = paginate @runners, theme: "gitlab"
+  - else
+    .nothing-here-block No runners found
diff --git a/changelogs/unreleased/33846-no-runner-for-admin.yml b/changelogs/unreleased/33846-no-runner-for-admin.yml
new file mode 100644
index 00000000000..a2d46802c61
--- /dev/null
+++ b/changelogs/unreleased/33846-no-runner-for-admin.yml
@@ -0,0 +1,4 @@
+---
+title: Add explicit message when no runners on admin
+merge_request: 12266
+author: Takuya Noguchi
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 5b3323fed13..6ad2d456b93 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -9,31 +9,54 @@ describe "Admin Runners" do
   end
 
   describe "Runners page" do
-    before do
-      runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
-      pipeline = FactoryGirl.create(:ci_pipeline)
-      FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
-      visit admin_runners_path
-    end
+    let(:pipeline) { create(:ci_pipeline) }
+
+    context "when there are runners" do
+      before do
+        runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
+        FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
+        visit admin_runners_path
+      end
+
+      it 'has all necessary texts' do
+        expect(page).to have_text "To register a new Runner"
+        expect(page).to have_text "Runners with last contact more than a minute ago: 1"
+      end
+
+      describe 'search' do
+        before do
+          FactoryGirl.create :ci_runner, description: 'runner-foo'
+          FactoryGirl.create :ci_runner, description: 'runner-bar'
+        end
+
+        it 'shows correct runner when description matches' do
+          search_form = find('#runners-search')
+          search_form.fill_in 'search', with: 'runner-foo'
+          search_form.click_button 'Search'
+
+          expect(page).to have_content("runner-foo")
+          expect(page).not_to have_content("runner-bar")
+        end
+
+        it 'shows no runner when description does not match' do
+          search_form = find('#runners-search')
+          search_form.fill_in 'search', with: 'runner-baz'
+          search_form.click_button 'Search'
 
-    it 'has all necessary texts' do
-      expect(page).to have_text "To register a new Runner"
-      expect(page).to have_text "Runners with last contact more than a minute ago: 1"
+          expect(page).to have_text 'No runners found'
+        end
+      end
     end
 
-    describe 'search' do
+    context "when there are no runners" do
       before do
-        FactoryGirl.create :ci_runner, description: 'runner-foo'
-        FactoryGirl.create :ci_runner, description: 'runner-bar'
-
-        search_form = find('#runners-search')
-        search_form.fill_in 'search', with: 'runner-foo'
-        search_form.click_button 'Search'
+        visit admin_runners_path
       end
 
-      it 'shows correct runner' do
-        expect(page).to have_content("runner-foo")
-        expect(page).not_to have_content("runner-bar")
+      it 'has all necessary texts including no runner message' do
+        expect(page).to have_text "To register a new Runner"
+        expect(page).to have_text "Runners with last contact more than a minute ago: 0"
+        expect(page).to have_text 'No runners found'
       end
     end
   end
-- 
cgit v1.2.1


From b56db3338168a4fd48de9e87e6014260477368cd Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Tue, 27 Jun 2017 10:11:29 +1100
Subject: Bump bootsnap to 1.1.1

---
 Gemfile                                         | 1 +
 Gemfile.lock                                    | 4 ++++
 changelogs/unreleased/update_bootsnap_1-1-1.yml | 4 ++++
 config/boot.rb                                  | 6 ++++++
 4 files changed, 15 insertions(+)
 create mode 100644 changelogs/unreleased/update_bootsnap_1-1-1.yml

diff --git a/Gemfile b/Gemfile
index 84722026e2e..092e7735bc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '4.2.8'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'bootsnap', '~> 1.1'
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6226c6bebdf..e1a691afe4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,6 +83,8 @@ GEM
     bindata (2.3.5)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootsnap (1.1.1)
+      msgpack (~> 1.0)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -462,6 +464,7 @@ GEM
     minitest (5.7.0)
     mmap2 (2.2.6)
     mousetrap-rails (1.4.6)
+    msgpack (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -925,6 +928,7 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
   binding_of_caller (~> 0.7.2)
+  bootsnap (~> 1.1)
   bootstrap-sass (~> 3.3.0)
   brakeman (~> 3.6.0)
   browser (~> 2.2)
diff --git a/changelogs/unreleased/update_bootsnap_1-1-1.yml b/changelogs/unreleased/update_bootsnap_1-1-1.yml
new file mode 100644
index 00000000000..9ecfe4b60c8
--- /dev/null
+++ b/changelogs/unreleased/update_bootsnap_1-1-1.yml
@@ -0,0 +1,4 @@
+---
+title: Bump bootsnap to 1.1.1
+merge_request: 12425
+author: @blackst0ne
diff --git a/config/boot.rb b/config/boot.rb
index 2d01092acd5..02baeab29ab 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -5,6 +5,12 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
+begin
+  require 'bootsnap/setup'
+rescue SystemCallError => exception
+  $stderr.puts "WARNING: Bootsnap failed to setup: #{exception.message}"
+end
+
 # set default directory for multiproces metrics gathering
 if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
   ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir'
-- 
cgit v1.2.1


From 57f0677ad854b7b17bd57e1e3b0ef542ce322b56 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Mon, 26 Jun 2017 18:26:27 -0500
Subject: Update CHANGELOG.md for 9.3.1

[ci skip]
---
 CHANGELOG.md                                                     | 9 +++++++++
 ...ix-linking-to-parallel-diff-line-number-creating-gray-box.yml | 4 ----
 changelogs/unreleased/dm-requirements-txt-tilde.yml              | 5 -----
 changelogs/unreleased/fix-34019.yml                              | 4 ----
 changelogs/unreleased/issue-inline-edit-quick-submit.yml         | 4 ----
 changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml          | 4 ----
 changelogs/unreleased/mk-fix-issue-34068.yml                     | 4 ----
 7 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml
 delete mode 100644 changelogs/unreleased/dm-requirements-txt-tilde.yml
 delete mode 100644 changelogs/unreleased/fix-34019.yml
 delete mode 100644 changelogs/unreleased/issue-inline-edit-quick-submit.yml
 delete mode 100644 changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml
 delete mode 100644 changelogs/unreleased/mk-fix-issue-34068.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 905c588d338..0fe49ad4579 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 9.3.1 (2017-06-26)
+
+- Fix reversed breadcrumb order for nested groups. !12322
+- Fix 500 when failing to create private group. !12394
+- Fix linking to line number on side-by-side diff creating empty discussion box.
+- Don't match tilde and exclamation mark as part of requirements.txt package name.
+- Perform project housekeeping after importing projects.
+- Fixed ctrl+enter not submit issue edit form.
+
 ## 9.3.0 (2017-06-22)
 
 - Refactored gitlab:app:check into SystemCheck liberary and improve some checks. !9173
diff --git a/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml b/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml
deleted file mode 100644
index 705d44f8b10..00000000000
--- a/changelogs/unreleased/34010-fix-linking-to-parallel-diff-line-number-creating-gray-box.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix linking to line number on side-by-side diff creating empty discussion box
-merge_request:
-author:
diff --git a/changelogs/unreleased/dm-requirements-txt-tilde.yml b/changelogs/unreleased/dm-requirements-txt-tilde.yml
deleted file mode 100644
index ddb5325ddd5..00000000000
--- a/changelogs/unreleased/dm-requirements-txt-tilde.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't match tilde and exclamation mark as part of requirements.txt package
-  name
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-34019.yml b/changelogs/unreleased/fix-34019.yml
deleted file mode 100644
index 77ebb18fda6..00000000000
--- a/changelogs/unreleased/fix-34019.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Perform project housekeeping after importing projects
-merge_request:
-author:
diff --git a/changelogs/unreleased/issue-inline-edit-quick-submit.yml b/changelogs/unreleased/issue-inline-edit-quick-submit.yml
deleted file mode 100644
index 4407bae3e6f..00000000000
--- a/changelogs/unreleased/issue-inline-edit-quick-submit.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fixed ctrl+enter not submit issue edit form
-merge_request:
-author:
diff --git a/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml b/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml
deleted file mode 100644
index 790af692b92..00000000000
--- a/changelogs/unreleased/mk-fix-breadcrumb-order-33938.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix reversed breadcrumb order for nested groups
-merge_request: 12322
-author:
diff --git a/changelogs/unreleased/mk-fix-issue-34068.yml b/changelogs/unreleased/mk-fix-issue-34068.yml
deleted file mode 100644
index af0a9139568..00000000000
--- a/changelogs/unreleased/mk-fix-issue-34068.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix 500 when failing to create private group
-merge_request: 12394
-author:
-- 
cgit v1.2.1


From 01960fce252433986d1bcd19c4fee0380921dfdb Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 27 Jun 2017 15:20:11 +0800
Subject: Fix optional args for POST :id/variables

Always use declared_params(include_missing: false)
so that we don't give nils for optional arguments
---
 lib/api/variables.rb                |  2 +-
 spec/requests/api/variables_spec.rb | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 381c4ef50b0..10374995497 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -45,7 +45,7 @@ module API
         optional :protected, type: String, desc: 'Whether the variable is protected'
       end
       post ':id/variables' do
-        variable = user_project.variables.create(declared(params, include_parent_namespaces: false).to_h)
+        variable = user_project.variables.create(declared_params(include_missing: false))
 
         if variable.valid?
           present variable, with: Entities::Variable
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 83673864fe7..e0975024b80 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -82,6 +82,17 @@ describe API::Variables do
         expect(json_response['protected']).to be_truthy
       end
 
+      it 'creates variable with optional attributes' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2'
+        end.to change{project.variables.count}.by(1)
+
+        expect(response).to have_http_status(201)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('VALUE_2')
+        expect(json_response['protected']).to be_falsey
+      end
+
       it 'does not allow to duplicate variable key' do
         expect do
           post api("/projects/#{project.id}/variables", user), key: variable.key, value: 'VALUE_2'
-- 
cgit v1.2.1


From f8de6d65f85a086f903a2389347ebde47d1a5494 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 27 Jun 2017 15:26:19 +0800
Subject: Add changelog entry

---
 changelogs/unreleased/34282-fix-api-using-include_missing-false.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/34282-fix-api-using-include_missing-false.yml

diff --git a/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml b/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml
new file mode 100644
index 00000000000..e7fff2c1a9f
--- /dev/null
+++ b/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml
@@ -0,0 +1,4 @@
+---
+title: 'API: Fix optional arugments for POST :id/variables'
+merge_request: 12474
+author:
-- 
cgit v1.2.1


From 28c45b047d0b967690428639e4383f2682c195da Mon Sep 17 00:00:00 2001
From: Clement Ho <clemmakesapps@gmail.com>
Date: Tue, 27 Jun 2017 08:06:35 +0000
Subject: Polish sidebar toggle

---
 .../sidebar/components/assignees/assignee_title.js | 18 ++++++++++++++++
 .../components/assignees/sidebar_assignees.js      |  2 ++
 app/assets/stylesheets/pages/issuable.scss         | 10 +++++++++
 app/views/shared/issuable/_sidebar.html.haml       |  4 ++--
 .../shared/issuable/_sidebar_assignees.html.haml   |  5 ++++-
 changelogs/unreleased/polish-sidebar-toggle.yml    |  4 ++++
 spec/javascripts/sidebar/assignee_title_spec.js    | 25 ++++++++++++++++++++++
 7 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/polish-sidebar-toggle.yml

diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_title.js b/app/assets/javascripts/sidebar/components/assignees/assignee_title.js
index a9ad3708514..5a6e47e566e 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignee_title.js
+++ b/app/assets/javascripts/sidebar/components/assignees/assignee_title.js
@@ -14,6 +14,11 @@ export default {
       type: Boolean,
       required: true,
     },
+    showToggle: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     assigneeTitle() {
@@ -36,6 +41,19 @@ export default {
       >
         Edit
       </a>
+      <a
+        v-if="showToggle"
+        aria-label="Toggle sidebar"
+        class="gutter-toggle pull-right js-sidebar-toggle"
+        href="#"
+        role="button"
+      >
+        <i
+          aria-hidden="true"
+          data-hidden="true"
+          class="fa fa-angle-double-right"
+        />
+      </a>
     </div>
   `,
 };
diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js
index da4abf0b68f..f83c3b037ed 100644
--- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js
+++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js
@@ -64,6 +64,7 @@ export default {
   },
   beforeMount() {
     this.field = this.$el.dataset.field;
+    this.signedIn = typeof this.$el.dataset.signedIn !== 'undefined';
   },
   template: `
     <div>
@@ -71,6 +72,7 @@ export default {
         :number-of-assignees="store.assignees.length"
         :loading="loading || store.isFetching.assignees"
         :editable="store.editable"
+        :show-toggle="!signedIn"
       />
       <assignees
         v-if="!store.isFetching.assignees"
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 0d1a360d12c..e3ebcc8af6c 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -228,6 +228,12 @@
       padding-top: 10px;
     }
 
+    &:not(.issue-boards-sidebar):not([data-signed-in]) {
+      .issuable-sidebar-header {
+        display: none;
+      }
+    }
+
     .assign-yourself .btn-link {
       padding-left: 0;
     }
@@ -249,6 +255,10 @@
       border-left: 1px solid $border-gray-normal;
     }
 
+    .title .gutter-toggle {
+      margin-top: 0;
+    }
+
     .assignee .avatar {
       float: left;
       margin-right: 10px;
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index e49bd5ebb13..745f1ee62da 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -3,7 +3,7 @@
   = page_specific_javascript_bundle_tag('common_vue')
   = page_specific_javascript_bundle_tag('sidebar')
 
-%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
+%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix", signed: { in: current_user.present? } }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' }
   .issuable-sidebar{ data: { endpoint: "#{issuable_json_path(issuable)}" } }
     - can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
     .block.issuable-sidebar-header
@@ -20,7 +20,7 @@
         .block.todo.hide-expanded
           = render "shared/issuable/sidebar_todo", todo: todo, issuable: issuable, is_collapsed: true
       .block.assignee
-        = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable
+        = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable, signed_in: current_user.present?
       .block.milestone
         .sidebar-collapsed-icon
           = icon('clock-o', 'aria-hidden': 'true')
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index bcfa1dc826e..2ea5eb960c0 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -1,5 +1,5 @@
 - if issuable.is_a?(Issue)
-  #js-vue-sidebar-assignees{ data: { field: "#{issuable.to_ability_name}[assignee_ids]" } }
+  #js-vue-sidebar-assignees{ data: { field: "#{issuable.to_ability_name}[assignee_ids]", signed_in: signed_in } }
     .title.hide-collapsed
       Assignee
       = icon('spinner spin')
@@ -14,6 +14,9 @@
     = icon('spinner spin', class: 'hidden block-loading', 'aria-hidden': 'true')
     - if can_edit_issuable
       = link_to 'Edit', '#', class: 'edit-link pull-right'
+    - if !signed_in
+      %a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", "aria-label" => "Toggle sidebar" }
+        = sidebar_gutter_toggle_icon
   .value.hide-collapsed
     - if issuable.assignee
       = link_to_member(@project, issuable.assignee, size: 32, extra_class: 'bold') do
diff --git a/changelogs/unreleased/polish-sidebar-toggle.yml b/changelogs/unreleased/polish-sidebar-toggle.yml
new file mode 100644
index 00000000000..41ec567fc52
--- /dev/null
+++ b/changelogs/unreleased/polish-sidebar-toggle.yml
@@ -0,0 +1,4 @@
+---
+title: Remove unused space in sidebar todo toggle when not signed in
+merge_request:
+author:
diff --git a/spec/javascripts/sidebar/assignee_title_spec.js b/spec/javascripts/sidebar/assignee_title_spec.js
index 5b5b1bf4140..ac93f918ce4 100644
--- a/spec/javascripts/sidebar/assignee_title_spec.js
+++ b/spec/javascripts/sidebar/assignee_title_spec.js
@@ -33,6 +33,31 @@ describe('AssigneeTitle component', () => {
     });
   });
 
+  describe('gutter toggle', () => {
+    it('does not show toggle by default', () => {
+      component = new AssigneeTitleComponent({
+        propsData: {
+          numberOfAssignees: 2,
+          editable: false,
+        },
+      }).$mount();
+
+      expect(component.$el.querySelector('.gutter-toggle')).toBeNull();
+    });
+
+    it('shows toggle when showToggle is true', () => {
+      component = new AssigneeTitleComponent({
+        propsData: {
+          numberOfAssignees: 2,
+          editable: false,
+          showToggle: true,
+        },
+      }).$mount();
+
+      expect(component.$el.querySelector('.gutter-toggle')).toEqual(jasmine.any(Object));
+    });
+  });
+
   it('does not render spinner by default', () => {
     component = new AssigneeTitleComponent({
       propsData: {
-- 
cgit v1.2.1