luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 04:43:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
schema.rb Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
seeds.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00