Merge remote-tracking branch 'parent/main' into upstream-20241113

spec/requests/api/v1/apps/credentials_spec.rb

@@ -44,6 +44,7 @@ RSpec.describe 'Credentials' do
         expect(response.parsed_body)
           .to not_include(client_id: be_present)
           .and not_include(client_secret: be_present)
+          .and not_include(client_secret_expires_at: be_present)
       end
     end
 

spec/requests/api/v1/apps_spec.rb

@@ -42,6 +42,7 @@ RSpec.describe 'Apps' do
             id: app.id.to_s,
             client_id: app.uid,
             client_secret: app.secret,
+            client_secret_expires_at: 0,
             name: client_name,
             website: website,
             scopes: ['read', 'write'],