f09f5b35f2
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` |
||
|---|---|---|
| .. | ||
| credentials_spec.rb | ||
| familiar_followers_spec.rb | ||
| featured_tags_spec.rb | ||
| follower_accounts_spec.rb | ||
| following_accounts_spec.rb | ||
| identity_proofs_spec.rb | ||
| lists_spec.rb | ||
| lookup_spec.rb | ||
| notes_spec.rb | ||
| pins_spec.rb | ||
| relationships_spec.rb | ||
| search_spec.rb | ||
| statuses_spec.rb | ||