mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
controllers
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-16 14:14:20 +01:00
fabricators
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
features
rubocop issues - Cleaning up (#8912)
2018-10-08 04:50:11 +02:00
fixtures
Fix undefined method error in sidekiq (#9807)
2019-01-14 17:28:41 +01:00
helpers
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-16 14:14:20 +01:00
lib
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
mailers
Improve e-mail digest (#9689)
2019-01-02 10:47:32 +01:00
models
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00
policies
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-10 21:00:30 +01:00
presenters
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-14 17:17:20 +01:00
requests
Redesign landing page (#10232)
2019-03-12 17:34:00 +01:00
routing
Move create/destroy actions for api/v1/statuses to namespace (#3678)
2017-06-10 09:39:26 +02:00
serializers/activitypub
Improved remote thread fetching (#10106)
2019-02-28 15:22:21 +01:00
services
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
support
Remove empty strings (#5732)
2017-11-17 10:52:30 +09:00
validators
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
views
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00
workers
Improved remote thread fetching (#10106)
2019-02-28 15:22:21 +01:00
rails_helper.rb
Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)
2019-01-15 23:11:46 +01:00
spec_helper.rb
Disable simplecov on CircleCI (#7416)
2018-05-09 16:59:58 +02:00