me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/controllers/api
History
Thibaut Girka a96375d2ef 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
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
web Fix web push notifications for polls (#10864) 2019-05-28 00:26:08 +02:00
base_controller.rb Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
oembed_controller.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
proofs_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00