Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 2 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 21648b0f59a..6ca1d8bd483 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -660,6 +660,8 @@ module API
       expose :subscribed, if: -> (_, options) { options.fetch(:include_subscribed, true) } do |issue, options|
         issue.subscribed?(options[:current_user], options[:project] || issue.project)
       end
+
+      expose :moved_to_id
     end
 
     class IssuableTimeStats < Grape::Entity
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index 0e7e0c40a8a..cd7d617509b 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -153,7 +153,10 @@ module Gitlab
 
         # Fallbacks in case the above patterns miss anything
         %r{\.rb\z} => :backend,
-        %r{\.(md|txt)\z} => :none, # To reinstate roulette for documentation, set to `:docs`.
+        %r{(
+          \.(md|txt)\z |
+          \.markdownlint\.json
+        )}x => :none, # To reinstate roulette for documentation, set to `:docs`.
         %r{\.js\z} => :frontend
       }.freeze
 
diff --git a/lib/gitlab/metrics/dashboard/service_selector.rb b/lib/gitlab/metrics/dashboard/service_selector.rb
index aee7f6685ad..22314c2a0ee 100644
--- a/lib/gitlab/metrics/dashboard/service_selector.rb
+++ b/lib/gitlab/metrics/dashboard/service_selector.rb
@@ -34,7 +34,7 @@ module Gitlab
           end
 
           def system_dashboard?(filepath)
-            SERVICES::SystemDashboardService.system_dashboard?(filepath)
+            SERVICES::SystemDashboardService.matching_dashboard?(filepath)
           end
 
           def custom_metric_embed?(params)