mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 04:33:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/spec/controllers/api/v1/accounts
History
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
credentials_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
follower_accounts_controller_spec.rb Fix own following/followers not showing muted users (#13614) 2020-05-08 20:36:34 +02:00
following_accounts_controller_spec.rb Fix own following/followers not showing muted users (#13614) 2020-05-08 20:36:34 +02:00
lists_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
pins_controller_spec.rb Add specs for Accounts::PinsController (#9542) 2018-12-17 06:03:51 +01:00
relationships_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
search_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
statuses_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00