fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/lib
History
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
2020-01-12 15:57:34 +01:00
..
activitypub Clarify keyword arguments with ** (#12769) 2020-01-11 05:57:05 +09:00
connection_pool Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
nodeinfo Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
ostatus Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
proof_provider Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565) 2019-04-21 04:53:24 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
activity_tracker.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
formatter.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
hash_object.rb
inline_renderer.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
language_detector.rb Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
potential_friendship_tracker.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
proof_provider.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
request.rb Fix Ruby 2.7 support (#12831) 2020-01-12 15:49:30 +01:00
request_pool.rb Add request pool to improve delivery performance (#10353) 2019-07-02 00:34:38 +02:00
rss_builder.rb
sanitize_config.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
search_query_parser.rb Fix accounts search by full/partial display name and others (#11580) 2019-08-16 13:00:30 +02:00
search_query_transformer.rb Fix error when searching for empty phrase (#12711) 2019-12-30 18:30:24 +01:00
sidekiq_error_handler.rb Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230) 2019-07-02 01:01:17 +02:00
spam_check.rb Fix auto-report string saying the account has been auto-silenced (#12142) 2019-10-10 18:47:24 +02:00
status_filter.rb
status_finder.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
tag_manager.rb Refactor domain block checks (#11268) 2019-07-09 03:27:35 +02:00
themes.rb Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
toc_generator.rb Add fallback section ID with ToC (#11941) 2019-09-23 17:25:10 +02:00
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
webfinger_resource.rb Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00