Merge branch 'id-etag-caching-for-mr-widget' into 'master'

Remove mergeTrain from FE since it's used only in EE

See merge request gitlab-org/gitlab-ce!32068

3 files changed, 3 insertions, 46 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 0f55bebd3fc..7843409f4a7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -87,9 +87,6 @@ export default class MergeRequestStore {
     this.allowCollaboration = data.allow_collaboration;
     this.sourceProjectId = data.source_project_id;
     this.targetProjectId = data.target_project_id;
-    this.mergePipelinesEnabled = Boolean(data.merge_pipelines_enabled);
-    this.mergeTrainsCount = data.merge_trains_count || 0;
-    this.mergeTrainIndex = data.merge_train_index;
 
     // CI related
     this.hasCI = data.has_ci;
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb
index 554b307d4f8..c8088608cb0 100644
--- a/app/serializers/merge_request_widget_entity.rb
+++ b/app/serializers/merge_request_widget_entity.rb
@@ -84,8 +84,10 @@ class MergeRequestWidgetEntity < Grape::Entity
 
   private
 
+  delegate :current_user, to: :request
+
   def presenter(merge_request)
     @presenters ||= {}
-    @presenters[merge_request] ||= MergeRequestPresenter.new(merge_request, current_user: request.current_user) # rubocop: disable CodeReuse/Presenter
+    @presenters[merge_request] ||= MergeRequestPresenter.new(merge_request, current_user: current_user) # rubocop: disable CodeReuse/Presenter
   end
 end
diff --git a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
index e27a506f426..e2cd0f084fd 100644
--- a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
+++ b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
@@ -82,47 +82,5 @@ describe('MergeRequestStore', () => {
         expect(store.isNothingToMergeState).toEqual(false);
       });
     });
-
-    describe('mergePipelinesEnabled', () => {
-      it('should set mergePipelinesEnabled = true when merge_pipelines_enabled is true', () => {
-        store.setData({ ...mockData, merge_pipelines_enabled: true });
-
-        expect(store.mergePipelinesEnabled).toBe(true);
-      });
-
-      it('should set mergePipelinesEnabled = false when merge_pipelines_enabled is not provided', () => {
-        store.setData({ ...mockData, merge_pipelines_enabled: undefined });
-
-        expect(store.mergePipelinesEnabled).toBe(false);
-      });
-    });
-
-    describe('mergeTrainsCount', () => {
-      it('should set mergeTrainsCount when merge_trains_count is provided', () => {
-        store.setData({ ...mockData, merge_trains_count: 3 });
-
-        expect(store.mergeTrainsCount).toBe(3);
-      });
-
-      it('should set mergeTrainsCount = 0 when merge_trains_count is not provided', () => {
-        store.setData({ ...mockData, merge_trains_count: undefined });
-
-        expect(store.mergeTrainsCount).toBe(0);
-      });
-    });
-
-    describe('mergeTrainIndex', () => {
-      it('should set mergeTrainIndex when merge_train_index is provided', () => {
-        store.setData({ ...mockData, merge_train_index: 3 });
-
-        expect(store.mergeTrainIndex).toBe(3);
-      });
-
-      it('should not set mergeTrainIndex when merge_train_index is not provided', () => {
-        store.setData({ ...mockData, merge_train_index: undefined });
-
-        expect(store.mergeTrainIndex).toBeUndefined();
-      });
-    });
   });
 });