Merge branch '284116-sync-or-remove-single-file-mode-user-preference' into 'master'

Support "view_diffs_file_by_file" param in the Users create and update API

See merge request gitlab-org/gitlab!54595

app/services/users/build_service.rb

@@ -83,7 +83,8 @@ module Users
         :location,
         :public_email,
         :user_type,
-        :note
+        :note,
+        :view_diffs_file_by_file
       ]
     end
 

changelogs/unreleased/284116-sync-or-remove-single-file-mode-user-preference.yml

+---
+title: Support "view_diffs_file_by_file" param in the Users create and update API
+merge_request: 54595
+author:
+type: added

doc/api/users.md

@@ -448,6 +448,7 @@ Parameters:
 | `theme_id`                           | No       | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information)                    |
 | `twitter`                            | No       | Twitter account                                                                                                                                         |
 | `username`                           | Yes      | Username                                                                                                                                                |
+| `view_diffs_file_by_file`            | No       | Flag indicating the user sees only one file diff per page                                                                                               |
 | `website_url`                        | No       | Website URL                                                                                                                                             |
 
 ## User modification
@@ -489,6 +490,7 @@ Parameters:
 | `theme_id`                           | No       | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information)                    |
 | `twitter`                            | No       | Twitter account                                                                                                                                         |
 | `username`                           | No       | Username                                                                                                                                                |
+| `view_diffs_file_by_file`            | No       | Flag indicating the user sees only one file diff per page                                                                                               |
 | `website_url`                        | No       | Website URL                                                                                                                                             |
 
 On password update, the user is forced to change it upon next login.

lib/api/users.rb

@@ -58,6 +58,7 @@ module API
           optional :color_scheme_id, type: Integer, desc: 'The color scheme for the file viewer'
           optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile'
           optional :note, type: String, desc: 'Admin note for this user'
+          optional :view_diffs_file_by_file, type: Boolean, desc: 'Flag indicating the user sees only one file diff per page'
           all_or_none_of :extern_uid, :provider
 
           use :optional_params_ee

spec/requests/api/users_spec.rb

@@ -952,6 +952,18 @@ RSpec.describe API::Users do
       expect(new_user.private_profile?).to eq(true)
     end
 
+    it "creates user with view_diffs_file_by_file" do
+      post api('/users', admin), params: attributes_for(:user, view_diffs_file_by_file: true)
+
+      expect(response).to have_gitlab_http_status(:created)
+
+      user_id = json_response['id']
+      new_user = User.find(user_id)
+
+      expect(new_user).not_to eq(nil)
+      expect(new_user.user_preference.view_diffs_file_by_file?).to eq(true)
+    end
+
     it "does not create user with invalid email" do
       post api('/users', admin),
         params: {
@@ -1266,6 +1278,13 @@ RSpec.describe API::Users do
       expect(user.reload.private_profile).to eq(true)
     end
 
+    it "updates viewing diffs file by file" do
+      put api("/users/#{user.id}", admin), params: { view_diffs_file_by_file: true }
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(user.reload.user_preference.view_diffs_file_by_file?).to eq(true)
+    end
+
     it "updates private profile to false when nil is given" do
       user.update!(private_profile: true)