David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00

..

activitypub

…

admin

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

api

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

auth

Fix some rubocop style issues (#5730)

2017-11-17 10:06:26 +09:00

concerns

Add moderator role and add pundit policies for admin actions (#5635)

2017-11-11 20:23:33 +01:00

oauth

…

settings

Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

Fix some rubocop style issues (#5730)

2017-11-17 10:06:26 +09:00

authorize_follows_controller.rb

…

emojis_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

home_controller.rb

…

intents_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

remote_follow_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

…

stream_entries_controller.rb

try to tighten up local only toot stuff, like... properly (#163)

2017-10-09 09:56:17 -04:00

tags_controller.rb

…