treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/controllers/api/v1
History
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
 		2023-03-16 23:12:59 +01:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
admin Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
announcements Enable Rubocop HTTP status rules (#23717) 2023-02-20 11:16:40 +09:00
apps Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
emails Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
featured_tags Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
instances Replace `Status#translatable?` with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
lists Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
polls Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
push Autofix Rubocops RSpec/ScatteredLet (#23725) 2023-02-20 11:17:41 +09:00
statuses Replace `Status#translatable?` with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
trends Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
accounts_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
announcements_controller_spec.rb Enable Rubocop HTTP status rules (#23717) 2023-02-20 11:16:40 +09:00
apps_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
blocks_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
bookmarks_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
conversations_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
custom_emojis_controller_spec.rb
…
directories_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
domain_blocks_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
endorsements_controller_spec.rb Add spec for Api::V1::EndorsementsController (#9543) 2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
featured_tags_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
filters_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
follow_requests_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
followed_tags_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
instances_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
lists_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
markers_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
media_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
mutes_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
notifications_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
polls_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
preferences_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
reports_controller_spec.rb Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
scheduled_statuses_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
statuses_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
streaming_controller_spec.rb Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
suggestions_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
tags_controller_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00