Merge branch 'issue_55024' into 'master'

Do not save user preferences on read-only mode

Closes #55024

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

4 files changed, 38 insertions, 0 deletions

diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index a597996a362..789e0dc736e 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -126,6 +126,8 @@ module IssuableCollections
     sort_param = params[:sort]
     sort_param ||= user_preference[issuable_sorting_field]
 
+    return sort_param if Gitlab::Database.read_only?
+
     if user_preference[issuable_sorting_field] != sort_param
       user_preference.update_attribute(issuable_sorting_field, sort_param)
     end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 02930edbf72..6240ab6d867 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -42,6 +42,8 @@ describe Projects::IssuesController do
 
       it_behaves_like "issuables list meta-data", :issue
 
+      it_behaves_like 'set sort order from user preference'
+
       it "returns index" do
         get :index, namespace_id: project.namespace, project_id: project
 
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 7f15da859e5..a37a831ddbb 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -160,6 +160,8 @@ describe Projects::MergeRequestsController do
 
     it_behaves_like "issuables list meta-data", :merge_request
 
+    it_behaves_like 'set sort order from user preference'
+
     context 'when page param' do
       let(:last_page) { project.merge_requests.page().total_pages }
       let!(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
diff --git a/spec/support/shared_examples/controllers/set_sort_order_from_user_preference_shared_examples.rb b/spec/support/shared_examples/controllers/set_sort_order_from_user_preference_shared_examples.rb
new file mode 100644
index 00000000000..b34948be670
--- /dev/null
+++ b/spec/support/shared_examples/controllers/set_sort_order_from_user_preference_shared_examples.rb
@@ -0,0 +1,32 @@
+shared_examples 'set sort order from user preference' do
+  describe '#set_sort_order_from_user_preference' do
+    # There is no issuable_sorting_field defined in any CE controllers yet,
+    # however any other field present in user_preferences table can be used for testing.
+    let(:sorting_field) { :issue_notes_filter }
+    let(:sorting_param) { 'any' }
+
+    before do
+      allow(controller).to receive(:issuable_sorting_field).and_return(sorting_field)
+    end
+
+    context 'when database is in read-only mode' do
+      it 'it does not update user preference' do
+        allow(Gitlab::Database).to receive(:read_only?).and_return(true)
+
+        expect_any_instance_of(UserPreference).not_to receive(:update_attribute).with(sorting_field, sorting_param)
+
+        get :index, namespace_id: project.namespace, project_id: project, sort: sorting_param
+      end
+    end
+
+    context 'when database is not in read-only mode' do
+      it 'updates user preference' do
+        allow(Gitlab::Database).to receive(:read_only?).and_return(false)
+
+        expect_any_instance_of(UserPreference).to receive(:update_attribute).with(sorting_field, sorting_param)
+
+        get :index, namespace_id: project.namespace, project_id: project, sort: sorting_param
+      end
+    end
+  end
+end