~cytrogen/masto-fe

d7fcd700 — Claire 2 years ago
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
cfc0da77 — Michael Stanclift 2 years ago
[Glitch] Fix retention dashboard not displaying correct month

Port 7fddeca1907493fb327316c5447740922acb934f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2016c5d9 — Matt Jankowski 2 years ago
Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) (#27190)

99e289f0 — Matt Jankowski 2 years ago
Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) (#27189)

89a17878 — Matt Jankowski 2 years ago
Fix haml-lint `InstanceVariables` rule for admin/roles/_form (#26063)

f9eefb27 — renovate[bot] 2 years ago
Update dependency rubocop to v1.56.4 (#27188)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9d56c194 — Matt Jankowski 2 years ago
Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form (#26062)

3060bfa4 — Matt Jankowski 2 years ago
Extract filename and csv helper methods from `Form::Import` (#26129)

937dc42f — Matt Jankowski 2 years ago
Extract methods for file movement in `CLI::Upgrade` (#25120)

56c0babc — Matt Jankowski 2 years ago
Fix rubocop `Layout/ArgumentAlignment` cop (#26060)

e6b903b2 — Matt Jankowski 2 years ago
Fix haml-lint `InstanceVariables` rule for invites/_form (#26064)

1da3c588 — Claire 2 years ago
Fix link handling of mentions in user profiles when logged out (#27185)

686406cc — Claire 2 years ago
Fix filtering audit log for entries about disabling 2FA (#27186)

f0c720cf — Claire 2 years ago
Bump version to v4.3.0-alpha.0 (#27022)

b93ce7d8 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27168)

Co-authored-by: GitHub Actions <noreply@github.com>
6d076755 — Christian Schmidt 2 years ago
Make notification respect reduce-motion (#27178)

66a7bc21 — renovate[bot] 2 years ago
Update dependency glob to v10.3.10 (#27169)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
0f588a4a — renovate[bot] 2 years ago
Update dependency axios to v1.5.1 (#27159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
7fddeca1 — Michael Stanclift 2 years ago
Fix retention dashboard not displaying correct month (#27180)

Next