fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-05-26 22:49:47 +02:00
admin Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-05-26 22:49:47 +02:00
concerns Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
disputes Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
oauth Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
well_known Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
about_controller.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +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 2022-05-11 09:37:48 +02:00
application_controller.rb Move glitch-soc-specific theming methods to ThemingConcern 2022-02-05 10:58:51 +01:00
authorize_interactions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
custom_css_controller.rb Remove set-cookie header on custom.css (#16314) 2021-05-30 17:57:47 +02:00
directories_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
emojis_controller.rb Add (back) rails-level JSON caching (#11333) 2019-07-21 22:32:16 +02:00
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 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
following_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
health_controller.rb Change health check (#15988) 2021-04-03 02:39:04 +02:00
home_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28:59 +02:00
instance_actors_controller.rb Fix instance actor not being dereferenceable (#17457) 2022-02-06 15:31:03 +01:00
intents_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
manifests_controller.rb Fix redirecting non-functional accounts on public pages (#11978) 2019-09-28 01:33:27 +02:00
media_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
media_proxy_controller.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
public_timelines_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
statuses_cleanup_controller.rb Fix account statuses cleanup settings controller for glitch-soc's theming system 2021-08-09 23:28:06 +02:00
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
tags_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00