mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Go to file

Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.

2020-04-02 20:32:00 +02:00

.circleci

Set BUNDLE_PATH in CircleCI (#13214 )

2020-03-08 15:45:19 +01:00

.dependabot

Change dependabot update schedule from live to weekly (#10949 )

2019-06-04 11:23:19 +02:00

.github

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +01:00

app

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

bin

Bump webpacker from 3.5.5 to 4.0.2 (#10277 )

2019-03-15 15:05:31 +01:00

config

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

Merge branch 'master' into glitch-soc/merge-upstream

2020-03-22 16:10:44 +01:00

dist

Update nginx.conf (#13066 )

2020-03-08 16:04:25 +01:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

log

Initial commit

2016-02-20 22:53:20 +01:00

nanobox

Resync Nanobox files with the 2.9.0 release (#11083 )

2019-06-14 14:52:31 +02:00

public

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +01:00

spec

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

streaming

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-25 10:04:41 +01:00

vendor

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.buildpacks

Add ffmpeg buildpack for scalingo (#8500 )

2018-08-29 01:21:23 +02:00

.codeclimate.yml

Update ESLint and RuboCop in Code Climate (#12534 )

2019-12-02 18:25:43 +01:00

.dockerignore

Add .bundle to .dockerignore (#7895 )

2018-06-26 20:33:29 +02:00

.editorconfig

Add final newline to locale files (#2890 )

2017-05-07 19:55:47 +02:00

.env.nanobox

Fix sample SAML_ACS_URL, SAML_ISSUER (#12669 )

2019-12-23 18:12:22 +01:00

.env.production.sample

Add environment variable to specify extra data hosts

2020-02-06 12:15:15 +01:00

.env.test

Bump webpacker from 4.0.7 to 4.2.0 (#12416 )

2019-11-20 17:56:11 +01:00

.env.vagrant

fix vagrant connection error (#12180 )

2019-10-24 22:47:24 +02:00

.eslintignore

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

.eslintrc.js

Refactor icons in web UI to use Icon component (#9951 )

2019-02-01 00:14:05 +01:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

Use eslint cache (#12668 )

2019-12-23 07:27:55 +01:00

.gitmodules

Rename themes -> flavours ? ?

2017-12-03 23:26:40 -08:00

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

Upgrade .nvmrc to Node.js 12 (#12906 )

2020-01-21 12:42:13 +01:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop.yml

Update ESLint and RuboCop in Code Climate (#12534 )

2019-12-02 18:25:43 +01:00

.ruby-version

Use Ruby 2.6.5 (#12049 )

2019-10-02 04:54:32 +02:00

.sass-lint.yml

Fix sass-lint config (#10982 )

2019-06-06 18:51:46 +02:00

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.yarnclean

Replace from scss-lint to sass-lint (#10958 )

2019-06-04 17:23:18 +02:00

app.json

Remove deprecated config from Heroku and Scalingo (#11925 )

2019-09-23 12:11:59 +02:00

Aptfile

Adjust Aptfile for Heroku-18 stack (#8588 )

2018-09-09 02:10:58 +02:00

AUTHORS.md

Update AUTHORS.md (#12096 )

2019-10-07 04:36:32 +02:00

babel.config.js

Remove unnecessary dependencies (#12533 )

2019-12-02 13:38:53 +01:00

boxfile.yml

Correct the Nanobox deploy hooks for order and context (#12663 )

2019-12-22 08:55:27 +01:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CHANGELOG.md

Bump version to 3.1.2 (#13162 )

2020-02-27 12:34:07 +01:00

CODE_OF_CONDUCT.md

Change e-mail contact for CoC enforcement

2019-06-06 17:42:07 +02:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +01:00

crowdin.yml

Update Crowdin configuration file

2019-09-14 11:40:13 +02:00

docker-compose.yml

Add healthcheck endpoint for web (#11770 )

2019-09-07 02:47:51 +02:00

Dockerfile

[Security] Bump Node.js from 12.14.0 to 12.16.1 in Docker (#13235 )

2020-03-10 12:00:55 +01:00

Gemfile

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

Gemfile.lock

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

LICENSE

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

postcss.config.js

Increase files checked by ESLint (#9705 )

2019-01-04 11:28:38 +01:00

priv-config

TOR federation (#7875 )

2018-06-26 20:34:12 +02:00

Procfile

Bind servers to 0.0.0.0 in Procfile (#11378 )

2019-07-22 06:16:30 +02:00

Procfile.dev

Fix Procfile on OS X (#6748 )

2018-03-12 03:50:40 +01:00

Rakefile

Initial commit

2016-02-20 22:53:20 +01:00

README.md

Decommission support for Ruby 2.4 (#13287 )

2020-03-21 03:10:24 +01:00

scalingo.json

Remove deprecated config from Heroku and Scalingo (#11925 )

2019-09-23 12:11:59 +02:00

Vagrantfile

Merge branch 'master' into glitch-soc/merge-upstream

2020-02-03 09:22:58 +01:00

yarn.lock

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-02 20:32:00 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 40.4%

JavaScript 39.5%

SCSS 15.9%

Haml 3.9%

HTML 0.1%