Eugen
48dfdad492
Merge branch 'master' into patch-1
2017-04-04 14:51:42 +02:00
Eugen
7f543e1fca
Merge pull request #800 from unascribed/patch-1
...
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
ed4a723a82
Merge pull request #800 from unascribed/patch-1
...
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
180aab6e2e
Merge pull request #799 from Wonderfall/master
...
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
c359e60034
Merge pull request #799 from Wonderfall/master
...
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
5f88226ad0
Merge pull request #832 from ndarville/patch-1
...
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
Eugen
4bb623a595
Merge pull request #832 from ndarville/patch-1
...
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
Eugen
b9c1c5bdd0
Merge pull request #788 from yiskah/patch-5
...
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Eugen
7c075b5551
Merge pull request #788 from yiskah/patch-5
...
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Niclas Darville
8eec03bb70
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:49:31 +02:00
Niclas Darville
904f9266ef
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:49:31 +02:00
Eugen
4068de0eed
Merge pull request #815 from walfie/patch-1
...
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Eugen
1e81cad3f3
Merge pull request #815 from walfie/patch-1
...
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Eugen
8e50f24a5c
Merge pull request #816 from leowzukw/patch-1
...
More consistent typography
2017-04-04 14:48:51 +02:00
Eugen
8e693b8e41
Merge pull request #816 from leowzukw/patch-1
...
More consistent typography
2017-04-04 14:48:51 +02:00
Eugen
283ef86463
Merge pull request #831 from ndarville/patch-1
...
Create ISSUE_TEMPLATE.md to bring down duplicate issues
2017-04-04 14:48:22 +02:00
Eugen
60d07c06c3
Merge pull request #831 from ndarville/patch-1
...
Create ISSUE_TEMPLATE.md to bring down duplicate issues
2017-04-04 14:48:22 +02:00
Niclas Darville
1e5ecbdf23
Create ISSUE_TEMPLATE.md
2017-04-04 14:46:08 +02:00
Niclas Darville
be2e7e1802
Create ISSUE_TEMPLATE.md
2017-04-04 14:46:08 +02:00
Eugen Rochko
e85ec98efb
Remove sidekiq-merger
2017-04-04 14:28:57 +02:00
Eugen Rochko
38b504b7a7
Remove sidekiq-merger
2017-04-04 14:28:57 +02:00
Eugen Rochko
e60c473917
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
Eugen Rochko
82aaedec46
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
Eugen Rochko
9123aca6df
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
Eugen Rochko
b1f3499c38
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
Eugen Rochko
1484df2db5
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
Eugen Rochko
b21f7c28f6
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
Eugen Rochko
fbf64105a5
Optimize 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
2017-04-04 13:01:14 +02:00
Eugen Rochko
ce9df2fa82
Optimize 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
2017-04-04 13:01:14 +02:00
halna_Tanaguru
c7e14e496b
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
halna_Tanaguru
3abb0f7bc7
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
JantsoP
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
db4a41cf58
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
JantsoP
dc89fc17cc
updated translation
2017-04-04 08:29:53 +02:00
JantsoP
fc2b031506
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
JantsoP
b8243c1b49
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
Leo Wzukw
cb21bf5b40
More consistent typography
2017-04-04 06:58:17 +02:00
Leo Wzukw
e81ba26be9
More consistent typography
2017-04-04 06:58:17 +02:00
walfie
766eabf194
Fix typo in Heroku guide
2017-04-04 00:00:56 -04:00
walfie
c22388fc79
Fix typo in Heroku guide
2017-04-04 00:00:56 -04:00
Eugen Rochko
5110975df4
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
Eugen Rochko
eb023beb49
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
Eugen Rochko
7a56845060
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
Eugen Rochko
b510a56c0c
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
Eugen Rochko
24793cdbaa
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
Eugen Rochko
4c53af64f0
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
Eugen Rochko
8eca42b265
Separate background jobs into different queues. ATTENTION: new queue "pull"
...
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
Eugen Rochko
f722bd2387
Separate background jobs into different queues. ATTENTION: new queue "pull"
...
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
Neville Park
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
