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

1836 Commits

Author SHA1 Message Date
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] 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
renovate[bot] f9eefb2785
Update dependency rubocop to v1.56.4 (#27188) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 16:25:14 +02:00
renovate[bot] fdc9f971f7
Update dependency selenium-webdriver to v4.13.1 (#27141) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 10:47:34 +02:00
renovate[bot] 97e4011c3c
Update dependency rails to v7.0.8 (#26907) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-13 10:01:31 +02:00
renovate[bot] 9ac9aca142
Update dependency test-prof to v1.2.3 (#26894) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-12 10:45:54 +02:00
renovate[bot] 7730083611
Update dependency kt-paperclip to v7.2.1 (#26869) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 11:51:42 +02:00
renovate[bot] b98edfa4ba
Update dependency rubocop to v1.56.3 (#26883) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-11 10:11:59 +02:00
renovate[bot] 8c321b8c3a
Update dependency pghero to v3.3.4 (#26808) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-06 09:19:43 +02:00
renovate[bot] 59361dfde2
Update dependency rubocop to v1.56.2 (#26568) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:00:55 +02:00
renovate[bot] bb0edb178f
Update dependency pg to v1.5.4 (#26750) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-01 10:48:49 +02:00
renovate[bot] 630e558677
Update dependency oj to v3.16.1 (#26749) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-01 10:17:08 +02:00
renovate[bot] 0e1bff178e
Update dependency chewy to v7.3.4 (#26717) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-30 09:45:13 +02:00
renovate[bot] 168688ef1c
Update dependency webmock to v3.19.1 (#26722) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-30 09:34:07 +02:00
renovate[bot] 4ad1c5aa71
Update dependency aws-sdk-s3 to v1.133.0 (#26616) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-29 10:53:01 +02:00
renovate[bot] dd72a8d28b
Update dependency stoplight to v3.0.2 (#26698) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 17:10:58 +02:00
renovate[bot] b42fe5e338
Update dependency haml_lint to v0.50.0 (#26665) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-28 10:32:13 +02:00
renovate[bot] e3fd071973
Update dependency rspec-sidekiq to v4 (#26627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-24 09:03:40 +02:00
renovate[bot] 060b554a9d
Update dependency oj to v3.16.0 (#26520) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:38 +02:00
renovate[bot] 74b8b8ea14
Update dependency rails to v7.0.7.2 (#26612) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 08:22:48 +02:00
renovate[bot] dc09c10fa8
Update dependency mime-types to v3.5.1 (#26595) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-22 16:47:40 +02:00
Nick Schonning b970ed6098
Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
renovate[bot] 581ebf2bb5
Update dependency puma to v6.3.1 (#26537) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-18 08:33:33 +02:00
renovate[bot] 07f43daadc
Update dependency nokogiri to v1.15.4 (#26476) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 14:10:46 +02:00
renovate[bot] 273730c4e8
Update dependency faker to v3.2.1 (#26474) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 13:38:41 +02:00
renovate[bot] 1a308d1a22
Update dependency rails to v7.0.7 (#26428) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:44:00 +02:00
renovate[bot] 43741ba2b9
Update dependency mime-types to '~> 3.5.0' (#26431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:24:34 +02:00
renovate[bot] 65f56bd849
Update dependency haml_lint to v0.49.3 (#26424) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:50:22 +02:00
renovate[bot] 426ca4f76c
Update dependency aws-sdk-s3 to v1.132.1 (#26423) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:47:55 +02:00