mastodon/spec
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
features rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
fixtures Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510) 2018-12-17 19:19:45 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +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-01-02 15:36:53 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
presenters Change instance_presenter_spec to point to glitch-soc instead of tootsuite 2018-12-23 11:45:26 +01:00
requests Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
routing
services Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +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-01-02 15:36:53 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
workers Lists (#5703) 2017-11-18 00:16:48 +01:00
rails_helper.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00