autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,822 Commits 1 Branch 4 Tags
0adee18d73daef653379d7635c8bc972c563bcd4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale 2017-04-07 13:07:03 +02:00
Eugen Rochko e3a3422a65 Allow setting of default language through config 
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
 2017-04-07 12:40:26 +02:00
Eugen Rochko 624a9a7136 Re-add forgotten <author> element on standalone <entry> 2017-04-07 12:21:00 +02:00
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140) 2017-04-07 11:09:14 +02:00
Eugen 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) 
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder

StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker

PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.

All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri

* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
 2017-04-07 05:56:56 +02:00
Eugen Rochko 31597fd377 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
Eugen 8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size 
Reduce size of background-photo.jpeg
 2017-04-06 22:59:48 +02:00
Eugen acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 
Add a couple of network performance tweaks to Vagrantfile.
 2017-04-06 22:58:44 +02:00
Eugen cd77c75d6c Merge pull request #1088 from Wonderfall/master 
Add metadata to Dockerfile
 2017-04-06 21:35:10 +02:00
Eugen fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile 
Optimize Dockerfile
 2017-04-06 19:32:50 +02:00
Eugen c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click 
Cosmetic changes to the scalingo deployment
 2017-04-06 19:32:12 +02:00
Eugen 5e63828917 Merge pull request #1048 from ashfurrow/slugignore 
Updates slugignore
 2017-04-06 19:09:45 +02:00
Eugen ea86f4db15 Merge pull request #1070 from alexgleason/patch-4 
Linux users must enable NFS for Vagrant
 2017-04-06 19:02:14 +02:00
Eugen Rochko 51d7caaf19 Fix wrong pubsub channel on public timelines 2017-04-06 04:03:23 +02:00
Eugen a9c0062e80 Merge pull request #1013 from blackle/master 
Catch more errors in process_follows so it doesn't fail
 2017-04-06 02:35:34 +02:00
Eugen Rochko dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService, 
slightly optimized FanOutOnWriteService again
 2017-04-06 02:26:59 +02:00
Eugen dea6e47de0 Merge pull request #993 from foozmeat/patch-1 
Use NFS for the shared folder because it dramatically decreases latency for git operations.
 2017-04-05 23:26:44 +02:00
Eugen Rochko 5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job 2017-04-05 21:43:10 +02:00
Eugen bafbf63fcc Merge pull request #958 from yiskah/patch-1 
Correct innacurate info and other fixes
 2017-04-05 20:48:19 +02:00
Eugen Rochko d13d169922 Merge branch 'krainboltgreene-broadcast-to-worker' 2017-04-05 19:46:28 +02:00
Eugen Rochko 5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast 2017-04-05 19:45:18 +02:00
Eugen Rochko d755ce96da Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker 2017-04-05 19:29:46 +02:00
Eugen Rochko 29ffe1cad3 Make sure Rabl is using Oj 2017-04-05 19:29:30 +02:00
Eugen c9ebd5d19f Fix wrong variable used in publish channel 2017-04-05 18:58:32 +02:00
Eugen 1b8c244dff Add proper message to PushUpdateWorker, use redis directly 2017-04-05 18:48:41 +02:00
Eugen 3d8b80e1cc Merge branch 'master' into broadcast-to-worker 2017-04-05 18:44:33 +02:00
Eugen b142a2ebf5 Merge pull request #947 from johnsudaar/feature/scalingo_one_click 
Add Scalingo deployment support
 2017-04-05 16:50:46 +02:00
Eugen a371a9e002 Merge pull request #940 from fahy/patch-1 
Adding mastodon.irish
 2017-04-05 15:24:52 +02:00
Eugen be807ff7bd Merge pull request #930 from nicobz25/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-05 15:24:40 +02:00
Eugen 68e0421577 Merge pull request #939 from JantsoP/master 
More translation updates
 2017-04-05 15:24:24 +02:00
Eugen b45b4865a7 Merge pull request #938 from wxcafe/patch-3 
Updates description for `social.wxcafe.net`
 2017-04-05 14:57:38 +02:00
Eugen 188172c401 Merge pull request #931 from farlistener/patch-3 
Typography on partY
 2017-04-05 14:57:14 +02:00
Eugen 7c4dde56a3 Merge pull request #936 from Angristan/patch-7 
Add git and curl as dependencies
 2017-04-05 14:57:01 +02:00
Eugen Rochko 220bc48e8e Only render public payload once in FanOutOnWrite 2017-04-05 14:26:17 +02:00
Eugen Rochko cfe91ac984 Add index on mentions status_id 2017-04-05 13:32:57 +02:00
Eugen Rochko 8530f9413b Replace ActionCable broadcast call with simple redis publish 2017-04-05 13:28:46 +02:00
Eugen f8a5ff95ec Merge pull request #923 from jguerder/patch-1 
Added mastodon.cx
 2017-04-05 12:33:02 +02:00
Eugen af0decf597 Merge pull request #925 from Angristan/patch-6 
Add mstdn.io
 2017-04-05 12:26:17 +02:00
Eugen ba5e23ecce Merge pull request #926 from farlistener/patch-2 
Add mastodon.partipirate.org
 2017-04-05 12:26:02 +02:00
Eugen a107de07c9 Merge pull request #922 from Angristan/patch-5 
ECDH only
 2017-04-05 12:18:57 +02:00
Eugen 792389da38 Merge pull request #909 from scriptjunkie/master 
Add https://securitymastod.one/
 2017-04-05 10:29:58 +02:00
Eugen 8b8839978a Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen 78cf0fe1c7 Merge pull request #901 from ashfurrow/patch-3 
Adds mastodon.technology instance
 2017-04-05 10:29:14 +02:00
Eugen 18d0e817dd Merge pull request #911 from IMcD23/patch-1 
Added mastodon.network instance.
 2017-04-05 10:28:58 +02:00
Eugen 1904a1aa14 Merge pull request #919 from JantsoP/master 
More updates to Finnish language
 2017-04-05 10:27:12 +02:00
Eugen b5f8273312 Merge pull request #902 from asm/ssl_best_practices 
SSL best practices for nginx
 2017-04-05 10:26:32 +02:00
Eugen 3504da5cac Fix API method URL typo 2017-04-05 10:25:05 +02:00
Eugen 8814f90eb5 Merge pull request #903 from yiskah/patch-6 
Corrected misinformation regarding Direct Posts
 2017-04-05 10:24:25 +02:00
Eugen 6b566c6b88 Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic 
ApplicationWorker for shared worker behavior
 2017-04-05 10:23:52 +02:00
Eugen 6b02591fa3 Merge pull request #910 from krainboltgreene/master 
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
 2017-04-05 10:23:32 +02:00
Eugen aab818717e Merge pull request #914 from bradurani/bu/query_cleanup 
Eliminate unnecessary queries and query clauses with none and all
 2017-04-05 10:23:10 +02:00
Eugen Rochko ccb6a658fd Merge branch 'fakenine-add_more_tests_to_models' 2017-04-05 03:31:45 +02:00
Eugen Rochko 667ffafef8 Fix spec 2017-04-05 03:31:26 +02:00
Eugen 4c92f15664 Merge branch 'master' into add_more_tests_to_models 2017-04-05 03:27:38 +02:00
Eugen 94d00f2788 Merge pull request #885 from optikfluffel/patch-1 
Update Production-guide.md
 2017-04-05 03:24:08 +02:00
Eugen afdcdce551 Merge pull request #839 from SirCmpwn/profile-readability 
Improve readability of text on profiles
 2017-04-05 03:23:16 +02:00
Eugen 731f397b08 Merge pull request #860 from pierreozoux/patch-1 
Update the list of instances
 2017-04-05 03:20:51 +02:00
Eugen aa464aa0d8 Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen a23123e49c Merge pull request #859 from dereckson/patch-1 
Add social.nasqueron.org instance
 2017-04-05 03:20:01 +02:00
Eugen 78c1e2e958 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen ab98591af8 Merge pull request #843 from fmauNeko/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-05 03:18:48 +02:00
Eugen bdaf31bcc9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen 086a88f3bb Merge pull request #863 from Eychics/master 
Add closed_registrations message on French language
 2017-04-05 03:11:13 +02:00
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master 
Updated Finnish Translation
 2017-04-05 03:09:20 +02:00
Eugen f735efdbc1 Merge pull request #846 from TrollDecker/master 
Update social.diskseven.com's IPv6 status
 2017-04-05 03:08:59 +02:00
Eugen 1709dee0f1 Merge pull request #842 from Angristan/patch-2 
Missing quotes
 2017-04-05 03:08:24 +02:00
Eugen 1c634ad21a Merge pull request #845 from thurloat/patch-1 
Add mastodon.club to running instances list
 2017-04-05 03:07:59 +02:00
Eugen 682c8a6fc8 Merge pull request #848 from ProgVal/patch-3 
Add oc.todon.fr to the list of instances.
 2017-04-05 03:07:46 +02:00
Eugen 66ec005bf8 Merge pull request #854 from Angristan/patch-3 
Fix crontab edit
 2017-04-05 03:07:28 +02:00
Eugen c12214963e Merge pull request #866 from kklleemm/patch-1 
Fix typos on french translations
 2017-04-05 03:06:41 +02:00
Eugen aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master 
Updated and fixed german orthography
 2017-04-05 03:05:50 +02:00
Eugen ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
 2017-04-05 03:05:31 +02:00
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817 
[#817] Add email whitelist
 2017-04-05 03:04:58 +02:00
Eugen d3dab68978 Merge pull request #891 from ashfurrow/patch-1 
Adds instructions for adding admin users for Heroku installs
 2017-04-05 03:01:43 +02:00
Eugen 57466d542b Merge pull request #805 from nevillepark/master 
Changed "reblogs" to "boosts"
 2017-04-05 03:00:57 +02:00
Eugen 417273326a Merge pull request #894 from asm/mastodon_cc 
Adding https://mastodon.cc
 2017-04-05 02:56:54 +02:00
Eugen 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements 
Remote follow improvements
 2017-04-05 02:54:03 +02:00
Eugen 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6 
Use active record shorthand
 2017-04-05 02:53:39 +02:00
Eugen feea517046 Merge pull request #872 from kwaio/patch-1 
typo in admin doc
 2017-04-05 02:53:09 +02:00
Eugen e55fbdede3 Merge pull request #868 from Angristan/patch-4 
Add file package
 2017-04-05 02:52:00 +02:00
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Eugen ed22f65b3c Merge pull request #876 from krainboltgreene/patch-7 
Quick attempt to get pull requests passing
 2017-04-04 23:11:34 +02:00
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed 2017-04-04 19:21:37 +02:00
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
Eugen 405c495c23 Merge pull request #804 from fhalna/development 
Accessibility Fix.
 2017-04-04 14:52:27 +02:00
Eugen fee3312193 Merge pull request #803 from 0xa/patch-1 
Add octodon.social
 2017-04-04 14:51:47 +02:00
Eugen 48dfdad492 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +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 c359e60034 Merge pull request #799 from Wonderfall/master 
update social.targaryen.house info
 2017-04-04 14:50:35 +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 7c075b5551 Merge pull request #788 from yiskah/patch-5 
Add instances from instances.mastodon.xyz
 2017-04-04 14:49:48 +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 8e693b8e41 Merge pull request #816 from leowzukw/patch-1 
More consistent typography
 2017-04-04 14:48:51 +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
Eugen Rochko 38b504b7a7 Remove sidekiq-merger 2017-04-04 14:28:57 +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 b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge 2017-04-04 13:43:36 +02:00
Eugen Rochko b21f7c28f6 Move OStatus processing back into default queue 2017-04-04 13:02:49 +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
Eugen Rochko eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage 2017-04-04 02:03:16 +02:00