about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-04-05Merge pull request #910 from krainboltgreene/masterEugen
2017-04-05Merge pull request #914 from bradurani/bu/query_cleanupEugen
2017-04-05Eliminate unnecessary queries and query clauses with none and allBrad Urani
2017-04-04Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0Kurtis Rainbolt-Greene
2017-04-05Merge branch 'fakenine-add_more_tests_to_models'Eugen Rochko
2017-04-05Fix specEugen Rochko
2017-04-05Merge branch 'master' into add_more_tests_to_modelsEugen
2017-04-05Merge pull request #885 from optikfluffel/patch-1Eugen
2017-04-05Merge pull request #839 from SirCmpwn/profile-readabilityEugen
2017-04-05Merge pull request #860 from pierreozoux/patch-1Eugen
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-05Merge pull request #859 from dereckson/patch-1Eugen
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-05Merge pull request #843 from fmauNeko/patch-1Eugen
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-04Improve readability of text on profilesDrew DeVault
2017-04-05Merge pull request #863 from Eychics/masterEugen
2017-04-05Merge pull request #818 from JantsoP/masterEugen
2017-04-05Merge pull request #846 from TrollDecker/masterEugen
2017-04-05Merge pull request #842 from Angristan/patch-2Eugen
2017-04-05Merge pull request #845 from thurloat/patch-1Eugen
2017-04-05Merge pull request #848 from ProgVal/patch-3Eugen
2017-04-05Merge pull request #854 from Angristan/patch-3Eugen
2017-04-05Merge pull request #866 from kklleemm/patch-1Eugen
2017-04-05Merge pull request #792 from chapeaumeinfreund/masterEugen
2017-04-05Merge pull request #790 from chapeaumeinfreund/patch-1Eugen
2017-04-05Merge pull request #852 from peterkeen/email-whitelist-817Eugen
2017-04-05Merge pull request #891 from ashfurrow/patch-1Eugen
2017-04-05Merge pull request #805 from nevillepark/masterEugen
2017-04-05Merge pull request #894 from asm/mastodon_ccEugen
2017-04-05Merge pull request #898 from SirCmpwn/remote-follow-improvementsEugen
2017-04-05Merge pull request #858 from krainboltgreene/patch-6Eugen
2017-04-04Updates instructions.Ash Furrow
2017-04-05Merge pull request #872 from kwaio/patch-1Eugen
2017-04-04Remote follow improvementsDrew DeVault
2017-04-05Merge pull request #868 from Angristan/patch-4Eugen
2017-04-05Remove PuSH subscriptions when delivery is answered with a 4xx errorEugen Rochko
2017-04-04Adding https://mastodon.ccJason Snell
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