From 5b515b1adb96cbfe92d3c9a15387ca943d6af993 Mon Sep 17 00:00:00 2001 From: Starfall Date: Wed, 7 Jul 2021 12:25:51 -0500 Subject: Transition away from GitHub repository * 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 --- README.md | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 502e0d8db..f0b4ba455 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,10 @@ ![Mastodon](https://i.imgur.com/NhZc40l.png) ======== -[![Build Status](https://img.shields.io/docker/cloud/build/pluralcafe/mastodon)](https://hub.docker.com/repository/docker/pluralcafe/mastodon) [![Site Status](https://img.shields.io/website?label=plural.cafe&logo=mastodon&url=https%3A%2F%2Fplural.cafe)](https://plural.cafe) +[![Site Status](https://img.shields.io/website?label=plural.cafe&logo=mastodon&url=https%3A%2F%2Fplural.cafe)](https://plural.cafe) Mastodon is a **free, open-source social network server** based on **open web protocols** like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools. **Ruby on Rails** is used for the back-end, while **React.js** and Redux are used for the dynamic front-end. A static front-end for public resources (profiles and statuses) is also provided. -This repository specifically is for [Plural Café](https://plural.cafe) and has three branches: - -* **main** (**edge** on Docker Hub) for all development and staging work, -* **glitch** for all commits from upstream that will automatically be synched to this repository, and -* **production** (**latest** on Docker Hub) for what goes onto the main website. - -In addition, there are several repositories in this GitHub organization: - -* **pluralcafe/mastodon** is this repository and is the codebase for what Plural Café runs, -* [**pluralcafe/utils**](https://github.com/pluralcafe/utils) are an assortment of scripts and tutorials to help in Mastodon system administration or general helper files this instance uses, -* [**pluralcafe/barkeep**](https://github.com/pluralcafe/barkeep) is forked from [mbilokonsky/ambassador](https://github.com/mbilokonsky/ambassador) and serves as the Ambassador bot that is run on the instance. - -This instance is a fork of a fork: this has the [Mastodon Glitch Edition](https://github.com/glitch-soc/mastodon) commits. Documentation for Mastodon Glitch Edition [can be found here](https://glitch-soc.github.io/docs/). Anyone wishing to use Glitch Edition in a Docker image for their own site can use the `pluralcafe/mastodon:glitch` image. - ---- - -## Notable changes from upstream - -See output of `git log glitch..main --oneline | grep -v '[mM]erge' | less` for a (more) complete history. - -* <ol> margin issue fixed so numbered lists aren't cut off a few pixels shy of 1 number -* HTML summary/details tags are allowed in toots -* gemini protocol links are supported (not yet supported: automatically marking gemini:// text as links) -* authentication required for account api endpoints to block some naive scrapers +This repository specifically is for [Plural Café](https://plural.cafe) and is a fork of a fork based on [Mastodon Glitch Edition](https://github.com/glitch-soc/mastodon). Documentation for Mastodon Glitch Edition [can be found here](https://glitch-soc.github.io/docs/). -- cgit