Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,086 Commits 74 Branches 58 Tags
c3274513002c492522aec68cbad822b7e62e5c12
Commit Graph

381 Commits

Author SHA1 Message Date
Claire
0fda1f0e94 Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream 2025-05-15 18:52:02 +02:00
Claire
ae281f31db Add dev:populate_sample_data rake task to populate test data (#34676) 2025-05-15 08:51:07 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Claire
4e2aa78a56 Fix tootctl accounts create failing because of date-of-birth check (#34663) 2025-05-12 09:28:12 +00:00
Claire
8d98d91f33 Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream 2025-05-06 12:06:51 +02:00
Claire
41d00bc28b Fix libvips being unconditionally required by tasks (#34620) 2025-05-06 09:45:32 +00:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Essem
e96044f389 Update to Twemoji 15.1.0 (#34321) 2025-04-28 14:22:14 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Damien Erambert
debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Claire
a6fc776c6f Change mastodon:setup to prevent overwriting already-configured servers (#33684) 2025-01-22 15:34:22 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Claire
ab4874ff13 Further harden the warnings against changing encryption secrets (#33631) 2025-01-17 10:42:52 +00:00
Matt Jankowski
a19141441d Move clear environment portion of mastodon:setup to private method (#33616) 2025-01-16 15:45:02 +00:00
Matt Jankowski
69b8a0b9bf Collect errors in setup rake task (#33603) 2025-01-16 14:58:59 +00:00
Claire
807bf8be24 Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream 2025-01-04 15:27:49 +01:00
Matt Jankowski
af7d6e59af Replace deprecated STATS_DIRECTORIES with Rails::CodeStatistics.register_directory approach (#33445) 2025-01-03 21:52:16 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
Matt Jankowski
342055cb15 Update rubocop to version 1.69.1 (#32967) 2024-12-09 14:52:49 +00:00
Claire
1ee149d015 Add explicit migration breakpoints (#33089) 2024-12-05 11:40:30 +00:00
Claire
6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
Andrew W. Lee
3e44dca0b4 Change dependency from annotate to annotaterb (#30232) 2024-11-18 14:40:02 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Matt Jankowski
41227aeb95 Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
Claire
befb44a08c Fix “uninitialized constant HttpLog” errors in tootctl (#32796) 2024-11-07 09:57:42 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Claire
ffa1032381 Add further warnings about encryption secrets (#32476) 2024-10-14 13:00:20 +00:00
Claire
bb0cf04d71 Add note about not changing ActiveRecord encryption secrets once they are set (#32413) 2024-10-11 09:19:48 +00:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Emelia Smith
c5f0da98e4 Add detection and download of material_symbol icons in config/navigation.rb (#31366) 2024-10-01 12:49:04 +00:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio
10143d053a Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +00:00
Claire
11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Matt Jankowski
bcc4b1078c Fix Rails/RootPathnameMethods cop (#31582) 2024-08-26 07:35:07 +00:00
Claire
d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
Claire
c493689e84 Change output format of repo:changelog task (#31546) 2024-08-23 12:55:54 +00:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68 Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Matt Jankowski
1b839d2cba Fix mastodon:stats decoration of stats rake task (#31104) 2024-07-23 06:51:57 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Claire
7a84b76bb1 Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Emelia Smith
e02d23b549 Change read:me scope to profile scope (#30357) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-06 07:30:10 +00:00
Claire
57fb2cf948 Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream 2024-05-17 12:33:41 +02:00
Claire
12472e7f40 Add emphasis on ActiveRecord Encryption configuration values being secret (#30340) 2024-05-17 09:28:40 +00:00
Claire
f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Matt Jankowski
0d397db5dd Consolidate system specs into single directory, use rspec tags for configuration (#30206) 2024-05-10 12:36:09 +00:00
Claire
f7dadc9f0b Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream 2024-05-07 12:13:02 +02:00