treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
19,852 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

1863 Commits (7db68e2dca7e2d8520bc7eec1d13f1f2f4ccd19f)

Author SHA1 Message Date
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
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
renovate[bot] 147417a6d0
Update dependency rspec-sidekiq to v4.1.0 (#27593) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-31 08:26:21 +00:00
renovate[bot] 204c00b5c6
Update dependency bootsnap to '~> 1.17.0' (#27617) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-31 08:24:04 +00:00
renovate[bot] 15ef654e9a
Update dependency pundit to v2.3.1 (#27585) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-27 13:43:00 +00:00
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Nick Schonning 5ef26d8fd5
Add RSpec GitHub annotations gem (#24040) 2023-10-17 18:28:09 +02:00
renovate[bot] 0036de46bc
Update dependency rubocop-performance to v1.19.1 (#26949) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-17 16:16:12 +02:00
Matt Jankowski 2528a0721f
Update `rubocop-capybara` to version 2.19.0 (#26982) 2023-10-17 16:10:50 +02:00
renovate[bot] 1996fb6fd6
Update dependency puma to v6.4.0 (#27006) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-17 16:10:16 +02:00
renovate[bot] f0ef87b84d
Update dependency i18n-tasks to v1.0.13 (#27403) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-16 11:08:13 +02:00
renovate[bot] 5c287c4958
Update dependency rubocop to v1.57.1 (#27389) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-13 11:46:25 +02:00
renovate[bot] 6a9aab38d7
Update dependency devise-two-factor to v4.1.1 (#27382) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-13 10:52:55 +02:00
renovate[bot] 85b36fbbd3
Update dependency devise to v4.9.3 (#27373) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-12 09:35:25 +02:00
renovate[bot] d0a3331caa
Update dependency rubocop to v1.57.0 (#27371) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:36:50 +02:00
renovate[bot] 1afb7f4104
Update dependency lograge to v0.14.0 (#27363) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:21:59 +02:00
renovate[bot] 0111e48893
Update dependency sidekiq to v6.5.12 (#27358) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-11 16:02:51 +02:00
renovate[bot] 1745c582f8
Update dependency sidekiq to v6.5.11 (#27345) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-10 09:52:09 +02:00
renovate[bot] 027c1bef8d
Update dependency active_model_serializers to v0.10.14 (#27303) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-06 11:43:30 +02:00
Renaud Chaput c4cff3d762
Remove Capistrano (#27295) 2023-10-06 11:33:43 +02:00
renovate[bot] 5606a17933
Update dependency sidekiq to v6.5.10 (#27287) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-05 16:35:05 +02:00
renovate[bot] e836d078bb
Update dependency haml_lint to v0.51.0 (#27250) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-03 10:48:05 +02:00