mastodon/spec
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 00:57:13 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
policies
presenters
requests Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
routing
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-10 16:48:44 +01:00
support
validators
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
spec_helper.rb