about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-04-05alphebatically order test gem group as required by rubocopSamy KACIMI
2017-04-05fix rubocop issuesSamy KACIMI
2017-04-04Adds instructions for adding admin users.Ash Furrow
2017-04-05Merge branch 'master' into add_more_tests_to_modelsSamy KACIMI
2017-04-05update account_specSamy KACIMI
2017-04-05rollback database.yml updateSamy KACIMI
2017-04-05add more tests to modelsSamy KACIMI
2017-04-04Update Production-guide.mdUdo Kramer
2017-04-04Merge pull request #876 from krainboltgreene/patch-7Eugen
2017-04-04Quick attempt to get pull requests passingKurtis Rainbolt-Greene
2017-04-04typo in admin docNope Nope
2017-04-04Add file packageAngristan
2017-04-04Spawn FeedInsertWorker to deliver status into personal feedEugen Rochko
2017-04-04Fix typos on french translationsClément D
2017-04-04Add closed_registrations message on French languageThibaut (Eychics)
2017-04-04Update the list of instancesPierre Ozoux
2017-04-04Add oc.todon.fr to the list of instances.Valentin Lorentz
2017-04-04Add social.nasqueron.org instanceSébastien Santoro
2017-04-04Use active record shorthandKurtis Rainbolt-Greene
2017-04-04Fix crontab editAngristan
2017-04-04[#817] Add email whitelistPete Keen
2017-04-04Update social.diskseven.com's IPv6 statusJo Decker
2017-04-04Add mastodon.club to running instances listAdam Thurlow
2017-04-04Update List-of-Mastodon-instances.mdFlorian Maunier
2017-04-04Missing quotesAngristan
2017-04-04New admin setting: open/close registrations, with custom message, from the ad...Eugen Rochko
2017-04-04updated line 28 about GitHubJantsoP
2017-04-04Merge pull request #804 from fhalna/developmentEugen
2017-04-04Merge pull request #803 from 0xa/patch-1Eugen
2017-04-04Merge branch 'master' into patch-1Eugen
2017-04-04Merge pull request #800 from unascribed/patch-1Eugen
2017-04-04Merge pull request #799 from Wonderfall/masterEugen
2017-04-04Merge pull request #832 from ndarville/patch-1Eugen
2017-04-04Merge pull request #788 from yiskah/patch-5Eugen
2017-04-04Fix typo in ISSUE_TEMPLATENiclas Darville
2017-04-04Merge pull request #815 from walfie/patch-1Eugen
2017-04-04Merge pull request #816 from leowzukw/patch-1Eugen
2017-04-04Merge pull request #831 from ndarville/patch-1Eugen
2017-04-04Create ISSUE_TEMPLATE.mdNiclas Darville
2017-04-04Remove sidekiq-mergerEugen Rochko
2017-04-04Reduce number of items in feeds, optimize regeneration worker slightly,Eugen Rochko
2017-04-04Optimize FeedManager#unmerge, and slightly optimize FeedManager#mergeEugen Rochko
2017-04-04Move OStatus processing back into default queueEugen Rochko
2017-04-04Optimize filter methods in FeedManager a bit, use redis pipelining on merge/u...Eugen Rochko
2017-04-04Merge branch 'master' into developmenthalna_Tanaguru
2017-04-04Merge branch 'master' into masterJantsoP
2017-04-04updated translationJantsoP
2017-04-04changed line 25 for better translationJantsoP
2017-04-04More consistent typographyLeo Wzukw
2017-04-04Fix typo in Heroku guidewalfie