Commit Graph

1931 Commits (8f7784111039aeeff26fcc0ea66ced1ca1c1fa73)

Author SHA1 Message Date
Kurtis Rainbolt-Greene 9b8f587c8d Moved to the worker 2017-04-04 20:51:44 -07:00
Kurtis Rainbolt-Greene bea03b4553 Moving in the inline render 2017-04-04 20:51:18 -07:00
Kurtis Rainbolt-Greene dd66bce930 I don't actually think we need that. 2017-04-04 20:48:22 -07:00
Kurtis Rainbolt-Greene 7d887cea4b Moving the queue_at into the worker 2017-04-04 20:39:14 -07:00
Kurtis Rainbolt-Greene 9e58c2b0e3 This method isn't used anymore 2017-04-04 20:38:07 -07:00
Kurtis Rainbolt-Greene 4f2985cddc Replacing the broadcast method with the one defined in the feed manager 2017-04-04 20:36:03 -07:00
Kurtis Rainbolt-Greene de1bb4bd56 By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection 2017-04-04 20:23:40 -07:00
shel b6a6a0d3d9 Corrected misinformation regarding Direct Posts
Unless something changed recently I have no clue why this said that direct posts do not federate because they do.
2017-04-04 21:47:13 -04:00
Jason Snell 413d87cd50 SSL best practices for nginx 2017-04-04 18:43:21 -07:00
Ash Furrow 026dafe912 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen Rochko 825da6c758 Merge branch 'fakenine-add_more_tests_to_models' 2017-04-05 03:31:45 +02:00
Eugen Rochko d9f1e07c6c Fix spec 2017-04-05 03:31:26 +02:00
Eugen 744456cb55 Merge branch 'master' into add_more_tests_to_models 2017-04-05 03:27:38 +02:00
Eugen 1bb3d8d3f5 Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
2017-04-05 03:24:08 +02:00
Eugen bb582ac177 Merge pull request #839 from SirCmpwn/profile-readability
Improve readability of text on profiles
2017-04-05 03:23:16 +02:00
Eugen f9c7d2d52d Merge pull request #860 from pierreozoux/patch-1
Update the list of instances
2017-04-05 03:20:51 +02:00
Eugen cb1617245b Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen 58d8c64ce6 Merge pull request #859 from dereckson/patch-1
Add social.nasqueron.org instance
2017-04-05 03:20:01 +02:00
Eugen 49cd7f7fc4 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen 4fae68139c Merge pull request #843 from fmauNeko/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 03:18:48 +02:00
Eugen 4390ae7bf9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Drew DeVault 27e4759c00 Improve readability of text on profiles 2017-04-04 21:13:23 -04:00
Eugen 05de364fbc Merge pull request #863 from Eychics/master
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
Eugen c571ed77d7 Merge pull request #818 from JantsoP/master
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
Eugen 7603a1d5d2 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen 0662ab35eb Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen 9c47a07dfa Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen 3340074137 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 b3523a6a8d Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen cc82f3adff Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
2017-04-05 03:06:41 +02:00
Eugen 45c3772ddb Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
Eugen 27b758f328 Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
Eugen 4751381a24 Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
2017-04-05 03:04:58 +02:00
Eugen ae1b33d594 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 2f7da4167f Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
Eugen dd839491b6 Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Eugen a8468cc6cc Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
2017-04-05 02:54:03 +02:00
Eugen 6a8bb89f80 Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
2017-04-05 02:53:39 +02:00
Ash Furrow bd371b6adb Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Drew DeVault 932b0b2f1f Remote follow improvements
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
2017-04-04 20:52:31 -04:00
Eugen 497fc3894a Merge pull request #868 from Angristan/patch-4
Add file package
2017-04-05 02:52:00 +02:00
Eugen Rochko d2b7daf6bb Remove PuSH subscriptions when delivery is answered with a 4xx error 2017-04-05 02:34:33 +02:00
Jason Snell 1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Samy KACIMI 28ed6fb058 alphebatically order test gem group as required by rubocop 2017-04-05 00:52:55 +02:00
Samy KACIMI 06424fd912 fix rubocop issues 2017-04-05 00:47:17 +02:00
Ash Furrow 5e8e8ba01d Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Samy KACIMI 3c5248ca20 Merge branch 'master' into add_more_tests_to_models 2017-04-05 00:43:10 +02:00
Samy KACIMI 630ba25d44 update account_spec 2017-04-05 00:37:23 +02:00
Samy KACIMI 01c7e8ee7c rollback database.yml update 2017-04-05 00:31:31 +02:00