David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss

2018-01-19 15:22:10 -06:00

..

assets.rake

Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)

2017-10-09 20:51:24 +02:00

auto_annotate_models.rake

Improve RuboCop rules (compatibility to Code Climate) (#3636)

2017-06-08 13:24:28 +02:00

db.rake

Set snowflake IDs for backdated statuses (#5260)

2017-10-08 17:34:34 +02:00

emojis.rake

Compress and combine emoji data (#5229)

2017-10-06 03:42:34 +02:00

glitchsoc.rake

Add Rake task to backfill local-only flag (#253)

2017-12-10 22:49:59 -06:00

mastodon.rake

Fix regeneration marker not expiring (#6290)

2018-01-18 20:29:56 +01:00

statistics.rake

add task to report code statistics (#2489)

2017-04-26 18:47:22 +02:00