about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2021-07-19no, we're not letting go of monsterpit.net eitherStarfall
2021-07-19Rest in Peace Anna Harren @garblefart@awoo.spaceStarfall
2021-07-07Transition away from GitHub repositoryStarfall
* Change link footer and onboarding model to point to our personal Git repository and direct folks to email us for collaboration * Remove now-unnecessary .github folder and add it to .gitignore [I am not actually sure if this will prevent us from getting those files again in the future.] * Restore English locale to upstream version and move our changes into the en-cafe custom locale. * Remove most of the README for clarity. After GitHub's contract with ICE came to light, we moved our personal projects away from the site. With Copilot now effectively laundering code under free licenses through machine learning by claiming that training a model is "fair use" even when it directly quotes the input, it's clear now that making the effort to move our Mastodon fork off of GitHub is worth the effort. But even if the model *never* recited anyone's source, we consider it to be clearly unethical to use open source code in this way without a permissive license or written consent from the authors of any non-trivial contributions. Whether or not the law agrees, this is clearly a derivative work in the colloquial sense of the term. We needed to build our own CI/CD solution in the next week and a half anyway because Docker Hub is removing automatic builds from the free tier. We're under no illusions that moving to our personal Git host will actually stop anyone from doing whatever they want with what we post publicly on the Internet. But we're both sending a message and learning how to build our own infrastructure, which will hopefully be helpful to us in the future. You can read more about GitHub's ICE deals here: https://www.zdnet.com/article/microsoft-github-ceo-why-we-defend-ice-deal-in-the-face-of-employee-anger/ You can read about GitHub Copilot quoting source code, and the steps they've taken to reduce its frequency, here: https://docs.github.com/en/github/copilot/research-recitation
2021-07-07Merge branch 'glitch'Starfall
2021-07-02Merge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-07-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-07-02Fix not being able to suspend accounts that already have a canonical e-mail ↵Eugen Rochko
block (#16455)
2021-07-01Bump ws from 7.5.0 to 7.5.1 (#16452)dependabot[bot]
Bumps [ws](https://github.com/websockets/ws) from 7.5.0 to 7.5.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.5.0...7.5.1) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-07-01Bump rubocop from 1.17.0 to 1.18.1 (#16451)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.17.0...v1.18.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-07-01Bump sidekiq-unique-jobs from 7.0.12 to 7.1.1 (#16450)dependabot[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.0.12 to 7.1.1. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.12...v7.1.1) --- updated-dependencies: - dependency-name: sidekiq-unique-jobs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Bump babel-jest from 27.0.2 to 27.0.6 (#16441)dependabot[bot]
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.0.2 to 27.0.6. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v27.0.6/packages/babel-jest) --- updated-dependencies: - dependency-name: babel-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Bump rubocop-rails from 2.11.0 to 2.11.1 (#16439)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.0...v2.11.1) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Bump @babel/preset-env from 7.14.5 to 7.14.7 (#16443)dependabot[bot]
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.5 to 7.14.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.7/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Bump mini-css-extract-plugin from 1.6.0 to 1.6.2 (#16444)dependabot[bot]
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.6.0 to 1.6.2. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.6.0...v1.6.2) --- updated-dependencies: - dependency-name: mini-css-extract-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Bump oj from 3.11.6 to 3.11.7 (#16437)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.11.6 to 3.11.7. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.11.6...v3.11.7) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-30Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-30Fix missing on_delete: :cascade for canonical_email_blocks foreign key (#16448)Claire
2021-06-30Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-30[Glitch] Hide /about/more footer link in limited federation modeDavid Sterry
Port 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.
2021-06-27Fix #16407 (#16432)David Sterry
2021-06-25Replace to issue form (#16429)Yamagishi Kazutoshi
2021-06-25Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-25Fix styling of boost button in media modal not reflecting ability to boost ↵Claire
(#16387)
2021-06-25Fix WebUI crash when a toot with a playing video gets deleted (#16384)Claire
* Fix WebUI crash when a toot with a playing video gets deleted * Fix pop-up player not closing the moment a status is deleted
2021-06-25Fix compression-webpack-plugin configuration (#16356)Claire
compression-webpack-plugin 6.0.0 has changed how filenames were generated, so from #14892 onward (Mastodon v3.3.0 and later), compressed files were output to a file named `.gz` instead of the correct filenames.
2021-06-24Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-25Bump rubocop from 1.16.1 to 1.17.0 (#16424)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.16.1 to 1.17.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.16.1...v1.17.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump rubocop-rails from 2.10.1 to 2.11.0 (#16419)dependabot[bot]
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.10.1...v2.11.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump bindata from 2.4.8 to 2.4.10 (#16430)dependabot[bot]
Bumps [bindata](https://github.com/dmendel/bindata) from 2.4.8 to 2.4.10. - [Release notes](https://github.com/dmendel/bindata/releases) - [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc) - [Commits](https://github.com/dmendel/bindata/compare/v2.4.8...v2.4.10) --- updated-dependencies: - dependency-name: bindata dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crashClaire
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
2021-06-24[Glitch] Fix styling of boost button in media modal not reflecting ability ↵Claire
to boost Port tootsuite#16387 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24Fix pop-up player not closing the moment a status is deletedClaire
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24Fix WebUI crash when a toot with a playing video gets deletedClaire
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-06-24Bump @babel/runtime from 7.14.5 to 7.14.6 (#16423)dependabot[bot]
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.14.5 to 7.14.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.6/packages/babel-runtime) --- updated-dependencies: - dependency-name: "@babel/runtime" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump eslint from 7.28.0 to 7.29.0 (#16422)dependabot[bot]
Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.28.0...v7.29.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump oj from 3.11.5 to 3.11.6 (#16421)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.11.5 to 3.11.6. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.11.5...v3.11.6) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump sass from 1.34.1 to 1.35.1 (#16420)dependabot[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.34.1 to 1.35.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.34.1...1.35.1) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump @babel/core from 7.14.5 to 7.14.6 (#16425)dependabot[bot]
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.5 to 7.14.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.6/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-24Bump ws from 7.4.6 to 7.5.0 (#16426)dependabot[bot]
Bumps [ws](https://github.com/websockets/ws) from 7.4.6 to 7.5.0. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.4.6...7.5.0) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-23Fix newlines in accout notes added by the Move handler (#16415)Claire
* Fix newlines in account notes added by the move handler * Make MoveWorker more robust
2021-06-23Add full user agent in tooltips for login activities (#16428)Claire
Also adds timestamp in HTML itself to not rely on javascript
2021-06-23Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-06-23Fix login date not showing up in login history by using “public” packClaire
2021-06-23[Glitch] Add authentication historyEugen Rochko
Port SCSS changes from d174d12c831989bf1d5d3ca54d4f26d28c2c8925 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
generated by cgit-pink (git 2.37.1) at 2025-02-16 21:03:59 +0000