38b504b7a7Remove sidekiq-merger
Eugen Rochko
2017-04-04 14:28:57 +02:00
82aaedec46Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time)
Eugen Rochko
2017-04-04 13:58:34 +02:00
b1f3499c38Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
Eugen Rochko
2017-04-04 13:43:36 +02:00
b21f7c28f6Move OStatus processing back into default queue
Eugen Rochko
2017-04-04 13:02:49 +02:00
ce9df2fa82Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
Eugen Rochko
2017-04-04 13:01:14 +02:00
3abb0f7bc7Merge branch 'master' into development
halna_Tanaguru
2017-04-04 12:06:53 +02:00
db4a41cf58Merge branch 'master' into master
JantsoP
2017-04-04 08:41:46 +02:00
b8243c1b49changed line 25 for better translation
JantsoP
2017-04-04 08:26:59 +02:00
e81ba26be9More consistent typography
Leo Wzukw
2017-04-04 06:58:17 +02:00
c22388fc79Fix typo in Heroku guide
walfie
2017-04-04 00:00:56 -04:00
eb023beb49Fix#808 - smaller elephant friend PNG for frontpage
Eugen Rochko
2017-04-04 02:03:16 +02:00
b510a56c0cOnly call regeneration worker after first login after a 14 day break
Eugen Rochko
2017-04-04 02:00:10 +02:00
4c53af64f0Fix ActionController::Parameters in API issue
Eugen Rochko
2017-04-04 01:33:34 +02:00
f722bd2387Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file
Eugen Rochko
2017-04-04 00:53:20 +02:00
ce1ca28594Changed "reblogs" to "boosts"
Neville Park
2017-04-03 17:45:36 -04:00
5b6f4fdeb4Add octodon.social
Alice
2017-04-03 23:05:03 +02:00
8232f76c48Add check for visibility.nil? even though it can't ever be, to check for race conditions
Eugen Rochko
2017-04-03 22:54:46 +02:00
1ed37fae9bAdd fern.surgeplay.com to the instances list
Aesen
2017-04-03 15:52:33 -04:00
cc451e1fcbupdate social.targaryen.house info
Wonderfall
2017-04-03 21:36:28 +02:00
0700521ef3added Esperanto (eo)
axolotl
2017-04-03 20:22:50 +02:00
98a93aa07eFix norwegian translation being malformed
Eugen Rochko
2017-04-03 19:50:55 +02:00
68f829e11cAdd basic logging of who resolved report
Eugen Rochko
2017-04-03 19:27:30 +02:00
71458dc6dfWhen taking action on a report (silence/suspend), it dismisses all other reports for that user automatically
Eugen Rochko
2017-04-03 19:17:56 +02:00
ec8029a955Updated and fixed orthography
Korbinian
2017-04-03 19:10:48 +02:00
7dd5ba42a3Updated and fixed german orthography
Korbinian
2017-04-03 19:01:17 +02:00
b7c1b12367Make default admin UI page reports. Add admin UI for creating a domain block
Eugen Rochko
2017-04-03 18:55:06 +02:00
8a45a97e2eAdd instances from instances.mastodon.xyz
shel
2017-04-03 12:28:36 -04:00
f6e9251054Merge pull request #777 from chriswk/master
Eugen
2017-04-03 18:06:37 +02:00
9738aaf5fbMerge pull request #782 from wxcafe/patch-1
Eugen
2017-04-03 18:06:16 +02:00
ce433e22f6Merge pull request #784 from singingwolfboy/github-capitalized
Eugen
2017-04-03 18:06:02 +02:00
5652f00d81GitHub should be capitalized
David Baumgold
2017-04-03 11:44:11 -04:00