David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

assets.rake

Do not fetch environment variables to determine default locale (#6618)

2018-03-04 10:00:46 +01: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 missing column in select in mastodon:feeds:build task (#7720)

2018-06-04 04:21:15 +02:00

statistics.rake

add task to report code statistics (#2489)

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