luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 12:52:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
v2
web
base_controller_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
oembed_controller_spec.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
proofs_controller_spec.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00