Change paramter name to 'view_type'issue_48886

3 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 6d0c00146d9..800addb8a7f 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -69,7 +69,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
 
   def additional_attributes
     {
-      view: params[:view],
+      view_type: params[:view_type],
       environment: @environment,
       merge_request: @merge_request,
       merge_request_diff: @merge_request_diff,
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb
index 6b695190569..10d020e05a5 100644
--- a/app/serializers/diff_file_entity.rb
+++ b/app/serializers/diff_file_entity.rb
@@ -159,7 +159,7 @@ class DiffFileEntity < Grape::Entity
     strong_memoize(:view_type) do
       types = ::Gitlab::Diff::File::VIEW_TYPES
 
-      return options[:view] if types.include?(options[:view])
+      return options[:view_type] if types.include?(options[:view_type])
 
       types.first
     end
diff --git a/spec/serializers/diff_file_entity_spec.rb b/spec/serializers/diff_file_entity_spec.rb
index d1d44c67a7f..434a1569c79 100644
--- a/spec/serializers/diff_file_entity_spec.rb
+++ b/spec/serializers/diff_file_entity_spec.rb
@@ -41,14 +41,14 @@ describe DiffFileEntity do
     end
 
     context 'when view type is parallel' do
-      let(:entity) { described_class.new(diff_file, request: {}, view: 'inline') }
+      let(:entity) { described_class.new(diff_file, request: {}, view_type: 'inline') }
 
       it { is_expected.not_to include(:parallel_diff_lines) }
       it { is_expected.to include(:highlighted_diff_lines) }
     end
 
     context 'when view type is inline' do
-      let(:entity) { described_class.new(diff_file, request: {}, view: 'parallel') }
+      let(:entity) { described_class.new(diff_file, request: {}, view_type: 'parallel') }
 
       it { is_expected.to include(:parallel_diff_lines) }
       it { is_expected.not_to include(:highlighted_diff_lines) }