monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/helpers
History
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
 		2023-10-08 17:26:43 +02:00
..
admin Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
accounts_helper.rb Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream 2023-07-13 14:22:20 +02:00
application_helper.rb Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
authorized_fetch_helper.rb Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958) 2023-09-18 09:37:29 +02:00
branding_helper.rb Fix Rails/ContentTag cop (#24691) 2023-04-30 06:47:15 +02:00
context_helper.rb Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream 2023-08-24 21:46:17 +02:00
database_helper.rb Fix ActiveRecord using two connection pools when no replica is defined (#27061) 2023-09-22 16:01:59 +02:00
domain_control_helper.rb Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
email_helper.rb Apply Rubocop Performance/StringReplacement (#23445) 2023-02-08 03:21:21 +01:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
formatting_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
home_helper.rb Fix regressions from change in account row design in web UI (#24343) 2023-04-01 09:27:23 +02:00
instance_helper.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
invites_helper.rb Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
jsonld_helper.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
languages_helper.rb Fix language sorting in settings (#27158) 2023-10-04 09:23:50 +02:00
mascot_helper.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
media_component_helper.rb Fix video player not being displayed in reports interface (#26801) 2023-09-05 20:05:58 +02:00
react_component_helper.rb Fix `/share` and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
routing_helper.rb Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) (#27189) 2023-09-28 16:52:11 +02:00
settings_helper.rb Fix language sorting in settings (#27158) 2023-10-04 09:23:50 +02:00
statuses_helper.rb Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00