diff options
| author | Evan Minto <evan.minto@gmail.com> | 2017-04-25 06:06:06 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-25 15:06:06 +0200 |
| commit | 122d59ac41a0c637b19357c2b7422002ffa0381c (patch) | |
| tree | 150a8793fcc7d51793a24b2b1df900025799dc73 /config | |
| parent | 8b5179d006a07cf759e751e9d883bfe472cee868 (diff) | |
Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
* Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 7711b96a0..996fd5f84 100644 --- a/config/application.rb +++ b/config/application.rb @@ -64,7 +64,7 @@ module Mastodon config.middleware.insert_before 0, Rack::Cors do allow do origins '*' - + resource '/@:username', headers: :any, methods: [:get], credentials: false resource '/api/*', headers: :any, methods: [:post, :put, :delete, :get, :patch, :options], credentials: false, expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id'] resource '/oauth/token', headers: :any, methods: [:post], credentials: false end diff --git a/config/locales/en.yml b/config/locales/en.yml index c226da3e4..6f54e343e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -43,12 +43,12 @@ en: activitypub: activity: announce: - name: "%{account_name} announced an activity." + name: "%{account_name} shared an activity." create: name: "%{account_name} created a note." outbox: name: "%{account_name}'s Outbox" - summary: A collection of activities from user %{account_name}. + summary: "A collection of activities from user %{account_name}." admin: accounts: are_you_sure: Are you sure? |