FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers
History
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
 		2021-04-20 12:17:14 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
api Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2021-03-19 13:57:15 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
well_known Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
about_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
account_follow_controller.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
account_unfollow_controller.rb
…
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
custom_css_controller.rb
…
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
emojis_controller.rb
…
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
health_controller.rb Change health check (#15988) 2021-04-03 02:39:04 +02:00
home_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
instance_actors_controller.rb Create instance actor if it hasn't been properly seeded (#15693) 2021-02-09 18:12:54 +01:00
intents_controller.rb
…
invites_controller.rb
…
manifests_controller.rb
…
media_controller.rb Fix embedded player 2020-08-12 00:00:42 +02:00
media_proxy_controller.rb replace all instances of "ends_with?" with "end_with?" (#15745) 2021-02-19 09:56:14 +01:00
public_timelines_controller.rb
…
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-24 15:33:41 +02:00
shares_controller.rb
…
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00