luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-25 06:36:45 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
activitypub
admin lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
auth fix: Execute PAM authentication tests on CircleCI (#9029) 2018-10-20 17:28:04 +02:00
concerns Improve signature verification safeguards (#8959) 2018-10-12 07:00:41 +02:00
oauth Add force_login option to OAuth authorize page (#8655) 2018-09-09 04:10:44 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
well_known
about_controller_spec.rb Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
application_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
authorize_interactions_controller_spec.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
emojis_controller_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb Add tests for following accounts controller (#7800) 2018-06-14 10:49:17 +09:00
home_controller_spec.rb
intents_controller_spec.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
invites_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
manifests_controller_spec.rb
media_controller_spec.rb
remote_follow_controller_spec.rb
remote_unfollows_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
shares_controller_spec.rb Add tests for shares_controller (#7835) 2018-06-18 10:45:20 +09:00
statuses_controller_spec.rb
stream_entries_controller_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
tags_controller_spec.rb