treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/controllers
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 		2023-02-25 14:00:40 +01:00
..
activitypub Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
admin Fix mispelled spec filenames (#23834) 2023-02-23 11:28:56 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
auth Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
concerns Enable Rubocop HTTP status rules (#23717) 2023-02-20 11:16:40 +09:00
disputes Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
oauth Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
well_known Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
about_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
accounts_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
authorize_interactions_controller_spec.rb Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
emojis_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
follower_accounts_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
following_accounts_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
health_controller_spec.rb Fix glitch-soc-specific health check spec 2021-04-05 15:21:38 +02:00
home_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
instance_actors_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
intents_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
invites_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
manifests_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
media_controller_spec.rb Fix error when rendering public pages with media attachments (#16763) 2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
shares_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
statuses_cleanup_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
statuses_controller_spec.rb Autofix Rubocop RSpec/BeNil (#23653) 2023-02-17 21:45:27 +09:00
tags_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00