monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,975 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

1883 Commits

Author SHA1 Message Date
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
 2023-12-20 20:10:45 +01:00
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
 2023-12-19 21:24:01 +01:00
Claire 2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability.
 2023-12-19 20:51:37 +01:00
Claire d288a6162a Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream 2023-12-19 20:40:05 +01:00
Claire 8afd313807 Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream split some dependencies, including `express`, to
  `streaming/package.json`.
  However, glitch-soc had extra dependencies textually close to `express`.
  Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
  Upstream split some dependencies, including `express`, to
  `streaming/package.json`.
  However, glitch-soc had extra dependencies textually close to `express`.
  Kept the extra dependencies and moved `express` to streaming.
 2023-12-19 20:06:32 +01:00
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
Claire 46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
 2023-12-18 18:07:24 +01:00
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
 2023-12-17 23:04:16 +01:00
Claire ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01:00
Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
 2023-12-17 15:32:29 +01:00
Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
Claire c0e562916c
Fix glitch-soc being uninstallable because of yanked dependency (#2507) 2023-12-06 13:32:27 +01:00
renovate[bot] 3e1e41054b
chore(deps): update dependency pghero to v3.4.0 (#28117) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-29 09:00:07 +00:00
Matt Jankowski b9492d84a0
Update `bcrypt` to version 3.1.20 (#28084) 2023-11-28 18:36:21 +00:00
Matt Jankowski b45fe15c06
Update temple to version 0.10.3 (#28086) 2023-11-28 18:36:16 +00:00
renovate[bot] c824d98cec
chore(deps): update dependency fabrication to v2.31.0 (#28089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-28 09:17:00 +00:00
renovate[bot] b8fe77353e
Update dependency aws-sdk-s3 to v1.140.0 (#28080) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-27 10:07:14 +00:00
renovate[bot] bf7e8e81de
Update dependency doorkeeper to v5.6.7 (#28051) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-23 10:37:05 +00:00
renovate[bot] 990c63b440
Update dependency aws-sdk-s3 to v1.139.0 (#28047) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-23 09:24:48 +00:00
renovate[bot] 183afc2465
Update dependency aws-sdk-s3 to v1.138.0 (#28031) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-22 15:28:14 +00:00
renovate[bot] c3d3ada07b
Update dependency test-prof to v1.3.0 (#28032) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-22 15:27:54 +00:00
Emelia Smith c9ffdcbaa2
Add debug + irb gems to assist with debugging in development and tests (#27960) 2023-11-21 16:41:04 +00:00
renovate[bot] f91e751383
Update dependency rspec-rails to v6.1.0 (#28017) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-21 13:23:23 +00:00
renovate[bot] c836e71218
Update dependency aws-sdk-s3 to v1.137.0 (#27961) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-21 11:05:41 +00:00
renovate[bot] 3a8dc9a5c6
Update dependency nokogiri to v1.15.5 (#27939) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-20 09:29:46 +00:00
renovate[bot] 6464b7cc45
Update dependency public_suffix to v5.0.4 (#27931) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-20 08:50:00 +00:00
renovate[bot] 135c4d8250
Update dependency rubocop-rails to v2.22.2 (#27975) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-20 08:46:18 +00:00
Matt Jankowski 549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` (#27902) 2023-11-17 09:50:19 +00:00
Nick Schonning 36d7d1781f
Add CodeCov for Ruby coverage reports (#23868) 2023-11-14 16:53:38 +00:00
renovate[bot] 3b989e4d64
Update dependency rails to v7.1.2 (#27812) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-13 13:13:53 +00:00
renovate[bot] 5af47fbff8
Update dependency fog-openstack to v1 (#25968) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-09 09:06:57 +00:00
renovate[bot] 389a6cc4c0
Update dependency net-http to '~> 0.4.0' (#27721) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:07:12 +00:00
renovate[bot] 565d9a6cf3
Update dependency sanitize to v6.1.0 (#27723) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:05:13 +00:00
renovate[bot] 8b0d86d407
Update dependency simple_form to v5.3.0 (#27725) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:04:40 +00:00
renovate[bot] b36b35318a
Update dependency selenium-webdriver to v4.15.0 (#27649) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:03:31 +00:00
renovate[bot] bcdfb72686
Update dependency json-ld-preloaded to v3.3.0 (#26763) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:03:09 +00:00
renovate[bot] 4b8aee7ad8
Update dependency thor to v1.3.0 (#27464) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:02:28 +00:00
renovate[bot] 1341790207
Update dependency sidekiq-unique-jobs to v7.1.30 (#26091) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:02:04 +00:00
renovate[bot] b2619a10a5
Update dependency json-ld to v3.3.0 (#26762) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:01:09 +00:00
renovate[bot] 110ace0474
Update dependency json-schema to v4.1.1 (#26933) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:00:34 +00:00
renovate[bot] feea257f44
Update dependency aws-sdk-s3 to v1.136.0 (#26999) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 22:00:13 +00:00
renovate[bot] b41e9b1d29
Update dependency strong_migrations to v1.6.4 (#27631) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-07 21:59:35 +00:00
Matt Jankowski bbad5b6456
Remove false positive cop detection (#27457) 2023-11-07 10:44:15 +00:00
Matt Jankowski d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops (#27730) 2023-11-06 16:25:40 +00:00
renovate[bot] 1416745a2b
Update dependency faker to v3.2.2 (#27718) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-06 09:54:59 +00:00
renovate[bot] afd1371fa3
Update dependency rubocop to v1.57.2 (#27719) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-06 09:53:13 +00:00
renovate[bot] ef140da349
Update dependency discard to v1.3.0 (#27720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-11-06 09:52:50 +00:00
Matt Jankowski 9d799d40ba
Reduce CI job matrix job count (#27660) 2023-11-03 14:58:33 +00:00
Matt Jankowski b264318431
Update strong_migrations to version 1.3.0 (#25991) 2023-10-31 11:09:32 +00:00