1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-19 16:07:08 +00:00
mastodon/spec
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
features rubocop issues - Cleaning up () 2018-10-08 04:50:11 +02:00
fixtures Fix undefined method error in sidekiq () 2019-01-14 17:28:41 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
mailers Improve e-mail digest () 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +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 () 2018-04-21 21:35:07 +02:00
routing Move create/destroy actions for api/v1/statuses to namespace () 2017-06-10 09:39:26 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
support Remove empty strings () 2017-11-17 10:52:30 +09:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
workers Add scheduled statuses () 2019-01-05 12:43:28 +01:00
rails_helper.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers () 2019-01-15 23:11:46 +01:00
spec_helper.rb Disable simplecov on CircleCI () 2018-05-09 16:59:58 +02:00