mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
4a70792b4a
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. |
||
|---|---|---|
| .. | ||
| exports | ||
| preferences | ||
| two_factor_authentication | ||
| applications_controller_spec.rb | ||
| deletes_controller_spec.rb | ||
| exports_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| flavours_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| imports_controller_spec.rb | ||
| migrations_controller_spec.rb | ||
| profiles_controller_spec.rb | ||
| sessions_controller_spec.rb | ||
| two_factor_authentications_controller_spec.rb | ||