treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/controllers
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
..
activitypub Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
admin Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
api Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 2023-06-10 17:18:36 +02:00
auth Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
concerns Fix RSpec/ExpectChange cop (#25101) 2023-05-24 11:23:40 +02:00
disputes Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
filters Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
oauth Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
settings Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream 2023-05-28 16:41:14 +02:00
well_known Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
.rubocop.yml Fix `RSpec/DescribedClass` cop (#25104) 2023-06-06 13:58:33 +02:00
about_controller_spec.rb 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
application_controller_spec.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
authorize_interactions_controller_spec.rb Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
custom_css_controller_spec.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
emojis_controller_spec.rb Fix RSpec/MultipleSubjects cop (#24738) 2023-05-04 05:48:35 +02:00
filters_controller_spec.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
follower_accounts_controller_spec.rb Fix RSpec/MultipleSubjects cop (#24738) 2023-05-04 05:48:35 +02:00
following_accounts_controller_spec.rb Fix RSpec/MultipleSubjects cop (#24738) 2023-05-04 05:48:35 +02:00
health_controller_spec.rb Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01:00
home_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
instance_actors_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
intents_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
invites_controller_spec.rb Fix RSpec/ExpectChange cop (#25101) 2023-05-24 11:23:40 +02:00
manifests_controller_spec.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02: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
privacy_controller_spec.rb Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01:00
relationships_controller_spec.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
shares_controller_spec.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
statuses_cleanup_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00
statuses_controller_spec.rb Implement pending specs for StatusesController (#23969) 2023-05-22 13:43:05 +02:00
tags_controller_spec.rb Fix RSpec/InferredSpecType cop (#24736) 2023-05-04 05:49:53 +02:00