~cytrogen/masto-fe

702d1629 — Claire 2 years ago
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
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
5393be7a — renovate[bot] 2 years ago
Update eslint (non-major) to v6.7.3 (#27213)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
48ef7d0f — renovate[bot] 2 years ago
Update libretranslate/libretranslate Docker tag to v1.3.12 (#27214)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9b785877 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27212)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
695e42de — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27202)

Co-authored-by: GitHub Actions <noreply@github.com>
665093a7 — renovate[bot] 2 years ago
Update dependency postcss to v8.4.31 (#27199)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
a1becc91 — renovate[bot] 2 years ago
Update dependency node to 20.8 (#27201)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
340f1a68 — Matt Jankowski 2 years ago
Simplify instance presenter view access (#26046)

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)

Next