Noa Himesaka
8f563dd680
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-11-11 13:44:26 +09: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
Noa Himesaka
b82a823bd5
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-07-05 00:47:49 +09:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Noa Himesaka
28a07d2e78
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-06-14 18:31:42 +09: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
Noa Himesaka
5496985873
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-05-16 18:43:16 +09:00
Noa Himesaka
a1f0d11784
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-05-12 22:51:39 +09: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
Noa Himesaka
d255c9e53e
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-03-30 01:28:12 +09: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
Noa Himesaka
4c6217d013
README edits
2024-02-27 01:17:16 +09: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
Noa Himesaka
25b4ae38e7
Glitch-YRYR YRYRi release
2023-10-01 20:09:35 +09:00
aaaaalbert
bb6c59a399
Fix #27010 : update the copyright year in README ( #27016 )
2023-09-21 13:57:24 +02:00
Noa Himesaka
e522f64d0d
Use Jenkins!
2023-09-11 18:07:03 +09: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
Noa Himesaka
f23a605e61
Merge branch 'glitch-soc:main' into main
2023-04-13 12:27:53 +09: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
Claire
bf5fc20858
Downgrade Node.js requirement to 14+ ( #22342 )
2023-01-05 13:47:36 +01:00
Sean
583df59df8
Add reference to mastodon/chart ( #22589 )
...
Reference mastodon/chart in the deployment section
2023-01-05 13:39:29 +01:00
Noa Himesaka
8611d9a5ef
source code location part 2
2022-12-23 11:33:55 +09:00
Effy Elden
1e49be3328
Align everything to Node.js 16 ( #22223 )
...
* Update nvmrc to Node.js 16
* Update package.json minimum Node engine to 16
* Update README requirements to Node.js 16
* Update devcontainer Node.js version to 16
* Update devcontainer Dockerfile Node.js choices to LTS versions that are still in support/maintenance
* Pin CircleCI Node image to 16
* Fix YAML type issue
* Update CircleCI Node.js to 16.18 to match #22019
2022-12-15 17:43:26 +01:00
Claire
098ced7420
Remove support for Ruby 2.6 ( #21477 )
...
As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193
at least one of our dependencies already dropped support for Ruby 2.6, and we
had removed Ruby 2.6 tests from the CI over a year ago (#16861 ).
So stop advertising Ruby 2.6 support, bump targeted version, and drop some
compatibility code.
2022-11-27 20:41:39 +01:00
Yamagishi Kazutoshi
4e26fb0ea9
Drop support for Ruby v2.5 and Node.js v12 ( #18323 )
...
* Drop support for Ruby v2.5 and Node.js v12
* Update package.json
2022-06-16 22:09:58 +02:00