Add latest changes from gitlab-org/gitlab@master

4 files changed, 66 insertions, 16 deletions

diff --git a/app/controllers/concerns/render_service_results.rb b/app/controllers/concerns/render_service_results.rb
new file mode 100644
index 00000000000..0149a71d9f5
--- /dev/null
+++ b/app/controllers/concerns/render_service_results.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RenderServiceResults
+  extend ActiveSupport::Concern
+
+  def success_response(result)
+    render({
+      status: result[:http_status],
+      json: result[:body]
+    })
+  end
+
+  def continue_polling_response
+    render({
+      status: :no_content,
+      json: {
+        status: _('processing'),
+        message: _('Not ready yet. Try again later.')
+      }
+    })
+  end
+
+  def error_response(result)
+    render({
+      status: result[:http_status] || :bad_request,
+      json: { status: result[:status], message: result[:message] }
+    })
+  end
+end
diff --git a/app/controllers/projects/environments/prometheus_api_controller.rb b/app/controllers/projects/environments/prometheus_api_controller.rb
index 9c6c6513a78..e902d218c75 100644
--- a/app/controllers/projects/environments/prometheus_api_controller.rb
+++ b/app/controllers/projects/environments/prometheus_api_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Projects::Environments::PrometheusApiController < Projects::ApplicationController
+  include RenderServiceResults
+
   before_action :authorize_read_prometheus!
   before_action :environment
 
@@ -12,21 +14,10 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon
       proxy_params
     ).execute
 
-    if result.nil?
-      return render status: :no_content, json: {
-        status: _('processing'),
-        message: _('Not ready yet. Try again later.')
-      }
-    end
-
-    if result[:status] == :success
-      render status: result[:http_status], json: result[:body]
-    else
-      render(
-        status: result[:http_status] || :bad_request,
-        json: { status: result[:status], message: result[:message] }
-      )
-    end
+    return continue_polling_response if result.nil?
+    return error_response(result) if result[:status] == :error
+
+    success_response(result)
   end
 
   private
diff --git a/app/controllers/projects/grafana_api_controller.rb b/app/controllers/projects/grafana_api_controller.rb
new file mode 100644
index 00000000000..4bdf4c12cac
--- /dev/null
+++ b/app/controllers/projects/grafana_api_controller.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Projects::GrafanaApiController < Projects::ApplicationController
+  include RenderServiceResults
+
+  def proxy
+    result = ::Grafana::ProxyService.new(
+      project,
+      params[:datasource_id],
+      params[:proxy_path],
+      query_params.to_h
+    ).execute
+
+    return continue_polling_response if result.nil?
+    return error_response(result) if result[:status] == :error
+
+    success_response(result)
+  end
+
+  private
+
+  def query_params
+    params.permit(:query, :start, :end, :step)
+  end
+end
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 7b694dcdd77..1913d7cd580 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -7,7 +7,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
   before_action :apply_diff_view_cookie!
   before_action :commit, except: :diffs_batch
   before_action :define_diff_vars, except: :diffs_batch
-  before_action :define_diff_comment_vars, except: :diffs_batch
+  before_action :define_diff_comment_vars, except: [:diffs_batch, :diffs_metadata]
 
   def show
     render_diffs
@@ -37,6 +37,11 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
     render json: PaginatedDiffSerializer.new(current_user: current_user).represent(diffs, options)
   end
 
+  def diffs_metadata
+    render json: DiffsMetadataSerializer.new(project: @merge_request.project)
+                   .represent(@diffs, additional_attributes)
+  end
+
   private
 
   def preloadable_mr_relations