Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`
This commit is contained in:
commit
f09f5b35f2
47 files changed
+622
-476
No files matched your search
@@ -79,7 +79,7 @@ RSpec.describe 'credentials API' do
|
||||
end
|
||||
|
||||
describe 'with invalid data' do
|
||||
let(:params) { { note: "This is too long. #{'a' * Account::MAX_NOTE_LENGTH}" } }
|
||||
let(:params) { { note: "This is too long. #{'a' * Account::NOTE_LENGTH_LIMIT}" } }
|
||||
|
||||
it 'returns http unprocessable entity' do
|
||||
subject
|
||||
|
||||
Reference in new issue
Block a user