diff --git a/.env.production.sample b/.env.production.sample index 98fa676129..3c4a81ba12 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -17,7 +17,7 @@ LOCAL_DOMAIN=example.com # Use this only if you need to run mastodon on a different domain than the one used for federation. -# You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md +# You can read more about this option on https://docs.joinmastodon.org/admin/config/#web-domain # DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING. # WEB_DOMAIN=mastodon.example.com @@ -247,7 +247,7 @@ SMTP_FROM_ADDRESS=notifications@example.com # --------------- # Various ways to customize Mastodon's behavior # --------------- - + # Maximum allowed character count MAX_TOOT_CHARS=500 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6411c3d6fe..e8fb938a94 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ See the guidelines below. - - - -You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `tootsuite/mastodon`, reproduced below. +You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `mastodon/mastodon`, reproduced below.
diff --git a/app/javascript/flavours/glitch/components/intersection_observer_article.js b/app/javascript/flavours/glitch/components/intersection_observer_article.js index 88f29892e8..bfab0a25bf 100644 --- a/app/javascript/flavours/glitch/components/intersection_observer_article.js +++ b/app/javascript/flavours/glitch/components/intersection_observer_article.js @@ -94,7 +94,7 @@ export default class IntersectionObserverArticle extends React.Component { // When the browser gets a chance, test if we're still not intersecting, // and if so, set our isHidden to true to trigger an unrender. The point of // this is to save DOM nodes and avoid using up too much memory. - // See: https://github.com/tootsuite/mastodon/issues/2900 + // See: https://github.com/mastodon/mastodon/issues/2900 this.setState((prevState) => ({ isHidden: !prevState.isIntersecting })); } diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index da6d621087..7482073e19 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -43,7 +43,7 @@ class LinkFooter extends React.PureComponent { e.stopPropagation(); this.props.onLogout(); - + return false; } @@ -69,7 +69,7 @@ class LinkFooter extends React.PureComponent { values={{ github: {repository} (v{version}), glitchsoc: glitch-soc, - Mastodon: Mastodon }} + Mastodon: Mastodon }} /> diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js index 81a58e0085..7a7840987d 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js @@ -149,7 +149,7 @@ const PageSix = ({ admin, domain }) => { domain, fork: fork, glitchsoc: Glitchsoc, - Mastodon: Mastodon, + Mastodon: Mastodon, github: GitHub, }} /> diff --git a/chart/values.yaml b/chart/values.yaml index 4b18a9dfa5..48554412f9 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -24,7 +24,7 @@ mastodon: removeMedia: enabled: true schedule: "0 0 * * 0" - # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43 + # available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71 locale: en local_domain: mastodon.local # Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation @@ -261,7 +261,7 @@ externalAuth: # search: "., -" # replace: _ -# https://github.com/tootsuite/mastodon/blob/master/Dockerfile#L88 +# https://github.com/mastodon/mastodon/blob/main/Dockerfile#L75 # # if you manually change the UID/GID environment variables, ensure these values # match: diff --git a/db/migrate/20170918125918_ids_to_bigints.rb b/db/migrate/20170918125918_ids_to_bigints.rb index bcb2e9eca5..bf875e4e59 100644 --- a/db/migrate/20170918125918_ids_to_bigints.rb +++ b/db/migrate/20170918125918_ids_to_bigints.rb @@ -80,7 +80,7 @@ class IdsToBigints < ActiveRecord::Migration[5.1] say 'This migration has some sections that can be safely interrupted' say 'and restarted later, and will tell you when those are occurring.' say '' - say 'For more information, see https://github.com/tootsuite/mastodon/pull/5088' + say 'For more information, see https://github.com/mastodon/mastodon/pull/5088' 10.downto(1) do |i| say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true