mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 15:34: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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| connection_pool | ||
| ostatus | ||
| proof_provider/keybase | ||
| rss | ||
| settings | ||
| delivery_failure_tracker_spec.rb | ||
| extractor_spec.rb | ||
| feed_manager_spec.rb | ||
| formatter_spec.rb | ||
| hash_object_spec.rb | ||
| language_detector_spec.rb | ||
| request_pool_spec.rb | ||
| request_spec.rb | ||
| sanitize_config_spec.rb | ||
| spam_check_spec.rb | ||
| status_filter_spec.rb | ||
| status_finder_spec.rb | ||
| tag_manager_spec.rb | ||
| user_settings_decorator_spec.rb | ||
| webfinger_resource_spec.rb | ||