Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,760 Commits 74 Branches 58 Tags
7ea3c6a039b4d2715a7e0ce5fea648efa56409fd
Commit Graph

157 Commits

Author SHA1 Message Date
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00
Renaud Chaput
b80ec3721d Drop support for PostgreSQL 13 (#36540) 2025-10-21 14:26:00 +00:00
Claire
8d602df786 Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream 2025-08-18 13:44:06 +02:00
Matt Jankowski
4de21056ff Update sidekiq to version 8.0.7 (#34824) 2025-08-14 15:25:31 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Andy Piper
5a7c0d42f7 Add specific language confirming that we test with BrowserStack and Chromatic (#35248) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-07-03 20:51:32 +00:00
Andy Piper
2cfa6cb0e0 Update README with testing tool references. (#35236) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-07-02 12:00:15 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Andy Piper
68f951b945 Add security policy in CONTRIBUTING, update year refs. (#34761) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-05-22 10:03:26 +00:00
Claire
dab31f7a88 Drop support for PostgreSQL 12 (#34744) 2025-05-20 14:48:29 +00:00
Renaud Chaput
a8f12a6fd8 Change Node.js minimum version to Node 20 (#34390) 2025-05-20 14:25:51 +00:00
Claire
f94b1fce41 Drop compatibility with Redis < 6.2 (#30413) 2025-05-20 12:55:42 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
78e0d6a11a Extract development section from top-level readme into standalone doc (#33328) 2025-01-08 14:29:32 +00:00
Lamparter
2c36283a89 Refresh README.md (#32143) 2025-01-08 14:03:21 +00:00
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
Matt Jankowski
b231c3c1bf Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Sujay
a5a1584675 Update README.md (#30626) 2024-06-12 13:48:30 +00:00
Claire
be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
Matt Jankowski
28921a12fe Update macOS local dev setup instructions (#30641) 2024-06-10 15:22:26 +00:00
Matt Jankowski
521b433933 Doc updates for Docker/devcontainers/codespace (#30582) 2024-06-07 20:18:02 +00:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Fabio Leandro Janiszevski
cd4b00810d Clear the docker setup - Deprecate post-create.sh and use bin/setup (#30502) 2024-06-06 09:00:09 +00:00
Matt Jankowski
569b7d2f25 Clarify the purpose of separate Docker resources (#30568) 2024-06-05 23:54:59 +00:00
Nick Schonning
9ab7e66cae Cleanup leftover Nanobox references (#30550) 2024-06-04 17:29:08 +00:00
Claire
f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Joshua Young
164b09bfcc Update README.md setup steps (#30063) 2024-05-10 12:34:32 +00:00
Claire
946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Matt Jankowski
1549e6a9dc Drop support for Ruby 3.0 (reaching EOL) (#29702) 2024-04-15 10:19:23 +00:00
Claire
a11151d58f Update our README and include upstream's (#2663) 2024-03-06 22:12:57 +01:00
Matt Jankowski
64b8ba36bb Add bin/dev script to launch foreman (#28242) 2024-03-02 18:31:43 +00:00
Matt Jankowski
844aa59bdf Doc update about ruby version 3.0+ (#29202) 2024-02-14 16:44:27 +00:00
Dennis Kamau
ac588daf37 Update copyright year to 2024 (#28550) 2024-01-01 19:08:01 +00:00
Ken Greeff
5d97a897c8 Add note to install libidn on MacOS (#28259) 2023-12-07 12:45:55 +00:00
Renaud Chaput
757d7c73c0 Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
Matt Jankowski
4aa05d45fc Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
François Hodierne
608cd66239 Update README requirements from node 14 to node 16 (#27369) 2023-10-11 16:24:28 +02:00
aaaaalbert
bb6c59a399 Fix #27010: update the copyright year in README (#27016) 2023-09-21 13:57:24 +02:00
Christian Schmidt
075cc8e8a6 Improve Codespaces port forwarding (#26400) 2023-08-29 10:20:36 +02:00
Jay Prakash Kalia
8d5d707cc1 Update README.md (#25435) 2023-07-28 23:09:19 +02:00
forsamori
55cf18b689 Add MacOS M1/2 setup steps to README (#25682) 
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
 2023-07-18 09:02:45 +02:00
Claire
29a91b871e Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Nick Schonning
c6c03b49b2 Add Roadmap to README (#24288) 2023-03-31 19:20:11 +02:00
Nick Schonning
2115413fa1 Remove remaining CodeClimate references (#24289) 2023-03-28 02:07:06 +02:00
Renaud Chaput
f9bdaebad2 Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
Nick Schonning
e594bb7d50 Convert CircleCI to GitHub Actions (#23608) 2023-03-07 04:49:43 +01:00
Samruddhi Khandale
ade3c5d40c Updates dev container and adds doc for getting started with GitHub Codespaces (#23872) 2023-03-05 00:35:00 +01:00
mon1kasenpai
6a71bb23c2 Update README.md (#23409) 
Fixed grammatical error in first paragraph
 2023-02-07 01:23:21 +01:00