19 files changed, 136 insertions, 61 deletions

diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb
index c83cec9dc4a..45af30f46dc 100644
--- a/lib/expand_variables.rb
+++ b/lib/expand_variables.rb
@@ -3,6 +3,20 @@
 module ExpandVariables
   class << self
     def expand(value, variables)
+      variables_hash = nil
+
+      value.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
+        variables_hash ||= transform_variables(variables)
+        variables_hash[$1 || $2]
+      end
+    end
+
+    private
+
+    def transform_variables(variables)
+      # Lazily initialise variables
+      variables = variables.call if variables.is_a?(Proc)
+
       # Convert hash array to variables
       if variables.is_a?(Array)
         variables = variables.reduce({}) do |hash, variable|
@@ -11,9 +25,7 @@ module ExpandVariables
         end
       end
 
-      value.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
-        variables[$1 || $2]
-      end
+      variables
     end
   end
 end
diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb
index edfd2fb17f3..9ded1aed4e3 100644
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -7,7 +7,7 @@ class Feature
     # Server feature flags should use '_' to separate words.
     SERVER_FEATURE_FLAGS =
       [
-        'get_commit_signatures'.freeze
+        # 'get_commit_signatures'.freeze
       ].freeze
 
     DEFAULT_ON_FLAGS = Set.new([]).freeze
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index 382b8896dbd..b7886114e9c 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -218,7 +218,7 @@ module Gitlab
           return if @sections.include?(section)
 
           @sections << section
-          write_raw %{<div class="js-section-start fa fa-caret-down pr-2 cursor-pointer" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
+          write_raw %{<div class="js-section-start section-start fa fa-caret-down pr-2 cursor-pointer" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
           @lineno_in_section = 0
         end
 
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 2fd76bc3690..29a52b9da17 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -16,8 +16,11 @@ module Gitlab
                             dependencies needs before_script after_script variables
                             environment coverage retry parallel extends].freeze
 
+          REQUIRED_BY_NEEDS = %i[stage].freeze
+
           validations do
             validates :config, allowed_keys: ALLOWED_KEYS
+            validates :config, required_keys: REQUIRED_BY_NEEDS, if: :has_needs?
             validates :config, presence: true
             validates :script, presence: true
             validates :name, presence: true
diff --git a/lib/gitlab/cluster/puma_worker_killer_observer.rb b/lib/gitlab/cluster/puma_worker_killer_observer.rb
index 3b4ebc3fbae..f53051c32ff 100644
--- a/lib/gitlab/cluster/puma_worker_killer_observer.rb
+++ b/lib/gitlab/cluster/puma_worker_killer_observer.rb
@@ -15,9 +15,7 @@ module Gitlab
       private
 
       def log_termination(worker)
-        labels = { worker: "worker_#{worker.index}" }
-
-        @counter.increment(labels)
+        @counter.increment
       end
     end
   end
diff --git a/lib/gitlab/config/entry/attributable.rb b/lib/gitlab/config/entry/attributable.rb
index 560fe63df0e..87bd257f69a 100644
--- a/lib/gitlab/config/entry/attributable.rb
+++ b/lib/gitlab/config/entry/attributable.rb
@@ -18,6 +18,10 @@ module Gitlab
 
                 config[attribute]
               end
+
+              define_method("has_#{attribute}?") do
+                config.is_a?(Hash) && config.key?(attribute)
+              end
             end
           end
         end
diff --git a/lib/gitlab/config/entry/validators.rb b/lib/gitlab/config/entry/validators.rb
index 6796fcce75f..0289e675c6b 100644
--- a/lib/gitlab/config/entry/validators.rb
+++ b/lib/gitlab/config/entry/validators.rb
@@ -26,6 +26,17 @@ module Gitlab
           end
         end
 
+        class RequiredKeysValidator < ActiveModel::EachValidator
+          def validate_each(record, attribute, value)
+            present_keys = options[:in] - value.try(:keys).to_a
+
+            if present_keys.any?
+              record.errors.add(attribute, "missing required keys: " +
+                present_keys.join(', '))
+            end
+          end
+        end
+
         class AllowedValuesValidator < ActiveModel::EachValidator
           def validate_each(record, attribute, value)
             unless options[:in].include?(value.to_s)
diff --git a/lib/gitlab/git_post_receive.rb b/lib/gitlab/git_post_receive.rb
index d98b85fecc4..24d752b8a4b 100644
--- a/lib/gitlab/git_post_receive.rb
+++ b/lib/gitlab/git_post_receive.rb
@@ -27,6 +27,18 @@ module Gitlab
       end
     end
 
+    def includes_branches?
+      enum_for(:changes_refs).any? do |_oldrev, _newrev, ref|
+        Gitlab::Git.branch_ref?(ref)
+      end
+    end
+
+    def includes_tags?
+      enum_for(:changes_refs).any? do |_oldrev, _newrev, ref|
+        Gitlab::Git.tag_ref?(ref)
+      end
+    end
+
     private
 
     def deserialize_changes(changes)
diff --git a/lib/gitlab/gitaly_client/notification_service.rb b/lib/gitlab/gitaly_client/notification_service.rb
deleted file mode 100644
index 873c3e4086d..00000000000
--- a/lib/gitlab/gitaly_client/notification_service.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module GitalyClient
-    class NotificationService
-      # 'repository' is a Gitlab::Git::Repository
-      def initialize(repository)
-        @gitaly_repo = repository.gitaly_repository
-        @storage = repository.storage
-      end
-
-      def post_receive
-        GitalyClient.call(
-          @storage,
-          :notification_service,
-          :post_receive,
-          Gitaly::PostReceiveRequest.new(repository: @gitaly_repo)
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index f3888857bb6..1b7fc5fa10f 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -37,11 +37,11 @@ project_tree:
     - :user
   - merge_requests:
     - :metrics
-    - :suggestions
     - notes:
       - :author
       - events:
         - :push_event_payload
+      - :suggestions
     - merge_request_diff:
       - :merge_request_diff_commits
       - :merge_request_diff_files
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 42c4745ff98..6e4286589c1 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -3,8 +3,8 @@
 module Gitlab
   module Kubernetes
     module Helm
-      HELM_VERSION = '2.12.3'.freeze
-      KUBECTL_VERSION = '1.11.7'.freeze
+      HELM_VERSION = '2.14.3'.freeze
+      KUBECTL_VERSION = '1.11.10'.freeze
       NAMESPACE = 'gitlab-managed-apps'.freeze
       SERVICE_ACCOUNT = 'tiller'.freeze
       CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 5e77d31760d..2669adb8455 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -29,6 +29,21 @@ module Gitlab
       end
     end
 
+    def formatted_count(scope)
+      case scope
+      when 'blobs'
+        blobs_count.to_s
+      when 'notes'
+        formatted_limited_count(limited_notes_count)
+      when 'wiki_blobs'
+        wiki_blobs_count.to_s
+      when 'commits'
+        commits_count.to_s
+      else
+        super
+      end
+    end
+
     def users
       super.where(id: @project.team.members) # rubocop:disable CodeReuse/ActiveRecord
     end
diff --git a/lib/gitlab/quick_actions/issuable_actions.rb b/lib/gitlab/quick_actions/issuable_actions.rb
index b975a967d03..e5d99ebee35 100644
--- a/lib/gitlab/quick_actions/issuable_actions.rb
+++ b/lib/gitlab/quick_actions/issuable_actions.rb
@@ -145,9 +145,9 @@ module Gitlab
           run_label_command(labels: find_labels(labels_param), command: :relabel, updates_key: :label_ids)
         end
 
-        desc _('Add a todo')
-        explanation _('Adds a todo.')
-        execution_message _('Added a todo.')
+        desc _('Add a To Do')
+        explanation _('Adds a To Do.')
+        execution_message _('Added a To Do.')
         types Issuable
         condition do
           quick_action_target.persisted? &&
@@ -157,9 +157,9 @@ module Gitlab
           @updates[:todo_event] = 'add'
         end
 
-        desc _('Mark to do as done')
-        explanation _('Marks to do as done.')
-        execution_message _('Marked to do as done.')
+        desc _('Mark To Do as done')
+        explanation _('Marks To Do as done.')
+        execution_message _('Marked To Do as done.')
         types Issuable
         condition do
           quick_action_target.persisted? &&
diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb
index 0868bd85600..da28fbf5be0 100644
--- a/lib/gitlab/quick_actions/issue_actions.rb
+++ b/lib/gitlab/quick_actions/issue_actions.rb
@@ -57,19 +57,18 @@ module Gitlab
           labels = find_labels(target_list_name)
           label_ids = labels.map(&:id)
 
-          if label_ids.size == 1
+          if label_ids.size > 1
+            message = _('Failed to move this issue because only a single label can be provided.')
+          elsif !Label.on_project_board?(quick_action_target.project_id, label_ids.first)
+            message = _('Failed to move this issue because label was not found.')
+          else
             label_id = label_ids.first
 
-            # Ensure this label corresponds to a list on the board
-            next unless Label.on_project_board?(quick_action_target.project_id, label_id)
-
             @updates[:remove_label_ids] =
               quick_action_target.labels.on_project_boards(quick_action_target.project_id).where.not(id: label_id).pluck(:id) # rubocop: disable CodeReuse/ActiveRecord
             @updates[:add_label_ids] = [label_id]
 
             message = _("Moved issue to %{label} column in the board.") % { label: labels_to_reference(labels).first }
-          else
-            message = _('Move this issue failed because you need to specify only one label.')
           end
 
           @execution_message[:board_move] = message
@@ -93,7 +92,7 @@ module Gitlab
 
             message = _("Marked this issue as a duplicate of %{duplicate_param}.") % { duplicate_param: duplicate_param }
           else
-            message = _('Mark as duplicate failed because referenced issue was not found')
+            message = _('Failed to mark this issue as a duplicate because referenced issue was not found.')
           end
 
           @execution_message[:duplicate] = message
@@ -117,18 +116,18 @@ module Gitlab
 
             message = _("Moved this issue to %{path_to_project}.") % { path_to_project: target_project_path }
           else
-            message = _("Move this issue failed because target project doesn't exists")
+            message = _("Failed to move this issue because target project doesn't exist.")
           end
 
           @execution_message[:move] = message
         end
 
-        desc _('Make issue confidential.')
+        desc _('Make issue confidential')
         explanation do
-          _('Makes this issue confidential')
+          _('Makes this issue confidential.')
         end
         execution_message do
-          _('Made this issue confidential')
+          _('Made this issue confidential.')
         end
         types Issue
         condition do
@@ -138,19 +137,19 @@ module Gitlab
           @updates[:confidential] = true
         end
 
-        desc _('Create a merge request.')
+        desc _('Create a merge request')
         explanation do |branch_name = nil|
           if branch_name
-            _("Creates branch '%{branch_name}' and a merge request to resolve this issue") % { branch_name: branch_name }
+            _("Creates branch '%{branch_name}' and a merge request to resolve this issue.") % { branch_name: branch_name }
           else
-            _('Creates a branch and a merge request to resolve this issue')
+            _('Creates a branch and a merge request to resolve this issue.')
           end
         end
         execution_message do |branch_name = nil|
           if branch_name
-            _("Created branch '%{branch_name}' and a merge request to resolve this issue") % { branch_name: branch_name }
+            _("Created branch '%{branch_name}' and a merge request to resolve this issue.") % { branch_name: branch_name }
           else
-            _('Created a branch and a merge request to resolve this issue')
+            _('Created a branch and a merge request to resolve this issue.')
           end
         end
         params "<branch name>"
diff --git a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
index 41ffd51cde8..533c74ba9b4 100644
--- a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
+++ b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb
@@ -24,7 +24,7 @@ module Gitlab
         end
         command :assign do |users|
           if users.empty?
-            @execution_message[:assign] = _("Assign command failed because no user was found")
+            @execution_message[:assign] = _("Failed to assign a user because no user was found.")
             next
           end
 
@@ -211,8 +211,8 @@ module Gitlab
         end
 
         desc _("Lock the discussion")
-        explanation _("Locks the discussion")
-        execution_message _("Locked the discussion")
+        explanation _("Locks the discussion.")
+        execution_message _("Locked the discussion.")
         types Issue, MergeRequest
         condition do
           quick_action_target.persisted? &&
@@ -224,8 +224,8 @@ module Gitlab
         end
 
         desc _("Unlock the discussion")
-        explanation _("Unlocks the discussion")
-        execution_message _("Unlocked the discussion")
+        explanation _("Unlocks the discussion.")
+        execution_message _("Unlocked the discussion.")
         types Issue, MergeRequest
         condition do
           quick_action_target.persisted? &&
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 7c1e6b1baff..ce4c1611687 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -43,6 +43,29 @@ module Gitlab
       without_count ? collection.without_count : collection
     end
 
+    def formatted_count(scope)
+      case scope
+      when 'projects'
+        formatted_limited_count(limited_projects_count)
+      when 'issues'
+        formatted_limited_count(limited_issues_count)
+      when 'merge_requests'
+        formatted_limited_count(limited_merge_requests_count)
+      when 'milestones'
+        formatted_limited_count(limited_milestones_count)
+      when 'users'
+        formatted_limited_count(limited_users_count)
+      end
+    end
+
+    def formatted_limited_count(count)
+      if count >= COUNT_LIMIT
+        "#{COUNT_LIMIT - 1}+"
+      else
+        count.to_s
+      end
+    end
+
     def limited_projects_count
       @limited_projects_count ||= limited_count(projects)
     end
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index e360b552f89..ac3b219e0c7 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -22,6 +22,17 @@ module Gitlab
       end
     end
 
+    def formatted_count(scope)
+      case scope
+      when 'snippet_titles'
+        snippet_titles_count.to_s
+      when 'snippet_blobs'
+        snippet_blobs_count.to_s
+      else
+        super
+      end
+    end
+
     def snippet_titles_count
       @snippet_titles_count ||= snippet_titles.count
     end
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 7e3a695e52a..16a076a8811 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -142,7 +142,8 @@ module Gitlab
          Gitlab::UsageDataCounters::WebIdeCounter,
          Gitlab::UsageDataCounters::NoteCounter,
          Gitlab::UsageDataCounters::SnippetCounter,
-         Gitlab::UsageDataCounters::SearchCounter
+         Gitlab::UsageDataCounters::SearchCounter,
+         Gitlab::UsageDataCounters::SourceCodeCounter
         ]
       end
 
diff --git a/lib/gitlab/usage_data_counters/source_code_counter.rb b/lib/gitlab/usage_data_counters/source_code_counter.rb
new file mode 100644
index 00000000000..8a1771a7bd1
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/source_code_counter.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Gitlab::UsageDataCounters
+  class SourceCodeCounter < BaseCounter
+    KNOWN_EVENTS = %w[pushes].freeze
+    PREFIX = 'source_code'
+  end
+end