diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-10 19:09:27 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-10 19:09:27 +0100 |
| commit | f1a6f9062e00c0651680bf4d5d750ec0b078ac5a (patch) | |
| tree | 30d40f0b5df56e955f80a91ae3b44090bd918ed9 /config | |
| parent | d602c92b310545eb733a58caed49717341abe27c (diff) | |
| parent | 3dc1e3cfc3928ce709c3e60e98ecbd1edd6e2a7d (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 600090e78..ccaff84b4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1225,6 +1225,9 @@ en: reply: proceed: Proceed to reply prompt: 'You want to reply to this post:' + reports: + errors: + invalid_rules: does not reference valid rules scheduled_statuses: over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today over_total_limit: You have exceeded the limit of %{limit} scheduled posts diff --git a/config/routes.rb b/config/routes.rb index d0eeda1e8..0c7b27cb8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -335,7 +335,7 @@ Rails.application.routes.draw do # JSON / REST API namespace :v1 do - resources :statuses, only: [:create, :show, :destroy] do + resources :statuses, only: [:create, :show, :update, :destroy] do scope module: :statuses do resources :reblogged_by, controller: :reblogged_by_accounts, only: :index resources :favourited_by, controller: :favourited_by_accounts, only: :index |