luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-18 21:44:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api/v1
History
Claire 8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
..
accounts Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
admin Migrate to request specs in /api/v1/admin/email_domain_blocks (#25337) 2023-06-09 14:00:14 +02:00
announcements Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
apps Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
emails Add polling and automatic redirection to /start on email confirmation (#25013) 2023-05-16 18:03:52 +02:00
featured_tags Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
instances Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
lists Change lists to be able to include accounts with pending follow requests (#19727) 2023-05-02 14:40:36 +02:00
polls Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
push Autofix Rubocops RSpec/ScatteredLet (#23725) 2023-02-20 11:17:41 +09:00
statuses Translate CW, poll options and media descriptions (#24175) 2023-06-01 00:10:21 +02:00
timelines Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
trends Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
accounts_controller_spec.rb Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
announcements_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
apps_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
blocks_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
bookmarks_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
conversations_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
custom_emojis_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
directories_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
domain_blocks_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
endorsements_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
favourites_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
filters_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
follow_requests_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
followed_tags_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
instances_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
lists_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
markers_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
media_controller_spec.rb Fix RSpec/ExpectInHook cop (#25100) 2023-05-23 16:40:21 +02:00
mutes_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
notifications_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
polls_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
preferences_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
reports_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
scheduled_statuses_controller_spec.rb Specs api v1 controllers (#23930) 2023-03-04 17:12:54 +01:00
statuses_controller_spec.rb Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
streaming_controller_spec.rb Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
suggestions_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
tags_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00