18556d3e9b
Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper_spec.rb | ||
| application_helper_spec.rb | ||
| flashes_helper_spec.rb | ||
| formatting_helper_spec.rb | ||
| home_helper_spec.rb | ||
| instance_helper_spec.rb | ||
| json_ld_helper_spec.rb | ||
| languages_helper_spec.rb | ||
| media_component_helper_spec.rb | ||
| react_component_helper_spec.rb | ||
| routing_helper_spec.rb | ||
| self_destruct_helper_spec.rb | ||
| settings_helper_spec.rb | ||
| statuses_helper_spec.rb | ||
| theme_helper_spec.rb | ||