luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-30 09:07:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/helpers
History
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
admin Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
settings
accounts_helper_spec.rb Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
application_helper_spec.rb
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb
jsonld_helper_spec.rb
routing_helper_spec.rb
settings_helper_spec.rb
statuses_helper_spec.rb Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00