You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		12 months ago
..
admin	Fix haml-lint Rubocop `Rails/*` cops (#26042)	12 months ago
accounts_helper.rb	Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream	1 year ago
application_helper.rb	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream	1 year ago
authorized_fetch_helper.rb	Fix `Setting.authorized_fetch` not being properly taken into consideration (#26958)	1 year ago
branding_helper.rb	Fix Rails/ContentTag cop (#24691)	1 year ago
context_helper.rb	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream	1 year ago
database_helper.rb	Fix ActiveRecord using two connection pools when no replica is defined (#27061)	1 year ago
domain_control_helper.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	1 year ago
email_helper.rb	Apply Rubocop Performance/StringReplacement (#23445)	2 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
home_helper.rb	Fix regressions from change in account row design in web UI (#24343)	1 year ago
instance_helper.rb	Remove instance variables from helper usage (#24203)	1 year ago
invites_helper.rb	Fix haml-lint `InstanceVariables` rule for invites/_form (#26064)	12 months ago
jsonld_helper.rb	Remove instance variables from helper usage (#24203)	1 year ago
languages_helper.rb	Fix language sorting in settings (#27158)	12 months ago
mascot_helper.rb	Simplify instance presenter view access (#26046)	12 months ago
media_component_helper.rb	Fix video player not being displayed in reports interface (#26801)	1 year ago
react_component_helper.rb	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
routing_helper.rb	Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) (#27189)	12 months ago
settings_helper.rb	Fix language sorting in settings (#27158)	12 months ago
statuses_helper.rb	Cleanup unused portions of statuses/status partial (#26045)	1 year ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago