Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

* Change references to tootsuite/mastodon to mastodon/mastodon

* Remove obsolete test fixture

* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG

And a few other places

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-# CODEOWNERS for tootsuite/mastodon
+# CODEOWNERS for mastodon/mastodon
 
 # Translators
 # To add translator, copy these lines, replace `fr` with appropriate language code and replace `@żelipapą` with user's GitHub nickname preceded by `@` sign or e-mail address.

AUTHORS.md

@@ -1,7 +1,7 @@
 Authors
 =======
 
-Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
+Mastodon is available on [GitHub](https://github.com/mastodon/mastodon)
 and provided thanks to the work of the following contributors:
 
 * [Gargron](https://github.com/Gargron)
@@ -719,7 +719,7 @@ and provided thanks to the work of the following contributors:
 * [西小倉宏信](mailto:nishiko@mindia.jp)
 * [雨宮美羽](mailto:k737566@gmail.com)
 
-This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/mastodon/mastodon/graphs/contributors) instead.
 
 ## Translators
 

CONTRIBUTING.md

@@ -14,7 +14,7 @@ If your contributions are accepted into Mastodon, you can request to be paid thr
 
 ## Bug reports
 
-Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
+Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/mastodon/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
 
 ## Translations
 
@@ -44,4 +44,4 @@ It is not always possible to phrase every change in such a manner, but it is des
 
 ## Documentation
 
-The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to tootsuite/documentation](https://github.com/tootsuite/documentation).
+The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/documentation](https://github.com/mastodon/documentation).

README.md

@@ -1,14 +1,14 @@
 ![Mastodon](https://i.imgur.com/NhZc40l.png)
 ========
 
-[![GitHub release](https://img.shields.io/github/release/tootsuite/mastodon.svg)][releases]
-[![Build Status](https://img.shields.io/circleci/project/github/tootsuite/mastodon.svg)][circleci]
+[![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
+[![Build Status](https://img.shields.io/circleci/project/github/mastodon/mastodon.svg)][circleci]
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/tootsuite/mastodon.svg)][code_climate]
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]
 [![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker]
 
-[releases]: https://github.com/tootsuite/mastodon/releases
-[circleci]: https://circleci.com/gh/tootsuite/mastodon
+[releases]: https://github.com/mastodon/mastodon/releases
+[circleci]: https://circleci.com/gh/mastodon/mastodon
 [code_climate]: https://codeclimate.com/github/tootsuite/mastodon
 [crowdin]: https://crowdin.com/project/mastodon
 [docker]: https://hub.docker.com/r/tootsuite/mastodon/

app.json

@@ -1,8 +1,8 @@
 {
   "name": "Mastodon",
   "description": "A GNU Social-compatible microblogging server",
-  "repository": "https://github.com/tootsuite/mastodon",
-  "logo": "https://github.com/tootsuite.png",
+  "repository": "https://github.com/mastodon/mastodon",
+  "logo": "https://github.com/mastodon.png",
   "env": {
     "HEROKU": {
       "description": "Leave this as true",

app/javascript/mastodon/components/intersection_observer_article.js

@@ -93,7 +93,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 }));
   }
 

config/deploy.rb

@@ -2,7 +2,7 @@
 
 lock '3.16.0'
 
-set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
+set :repo_url, ENV.fetch('REPO', 'https://github.com/mastodon/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')
 
 set :application, 'mastodon'

db/migrate/20200508212852_reset_unique_jobs_locks.rb

@@ -3,7 +3,7 @@ class ResetUniqueJobsLocks < ActiveRecord::Migration[5.2]
 
   def up
     # We do this to clean up unique job digests that were not properly
-    # disposed of prior to https://github.com/tootsuite/mastodon/pull/13361
+    # disposed of prior to https://github.com/mastodon/mastodon/pull/13361
 
     until SidekiqUniqueJobs::Digests.new.delete_by_pattern('*').nil?; end
   end

lib/mastodon/version.rb

@@ -33,7 +33,7 @@ module Mastodon
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY', 'tootsuite/mastodon')
+      ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
     end
 
     def source_base_url

lib/tasks/repo.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-REPOSITORY_NAME = 'tootsuite/mastodon'
+REPOSITORY_NAME = 'mastodon/mastodon'
 
 namespace :repo do
   desc 'Generate the AUTHORS.md file'
@@ -34,7 +34,7 @@ namespace :repo do
 
     file << <<~FOOTER
 
-      This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+      This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/mastodon/mastodon/graphs/contributors) instead.
     FOOTER
   end
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@tootsuite/mastodon",
+  "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
   "engines": {
     "node": ">=12"
@@ -18,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/tootsuite/mastodon.git"
+    "url": "https://github.com/mastodon/mastodon.git"
   },
   "browserslist": [
     "last 2 versions",

scalingo.json

@@ -1,8 +1,8 @@
 {
   "name": "Mastodon",
   "description": "A GNU Social-compatible microblogging server",
-  "repository": "https://github.com/tootsuite/mastodon",
-  "logo": "https://github.com/tootsuite.png",
+  "repository": "https://github.com/mastodon/mastodon",
+  "logo": "https://github.com/mastodon.png",
   "env": {
     "LOCAL_DOMAIN": {
       "description": "The domain that your Mastodon instance will run on (this can be appname.scalingo.io or a custom domain)",

spec/fixtures/xml/mastodon.atom

@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia">
-  <id>http://kickass.zone/users/localhost.atom</id>
-  <title>::1</title>
-  <updated>2016-10-10T13:29:56Z</updated>
-  <logo>http://kickass.zone/system/accounts/avatars/000/000/001/medium/eris.png</logo>
-  <author>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-    <uri>http://kickass.zone/users/localhost</uri>
-    <name>localhost</name>
-    <email>localhost@kickass.zone</email>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost"/>
-    <link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/001/large/eris.png"/>
-    <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/001/medium/eris.png"/>
-    <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/001/small/eris.png"/>
-    <poco:preferredUsername>localhost</poco:preferredUsername>
-    <poco:displayName>::1</poco:displayName>
-  </author>
-  <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost"/>
-  <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost.atom"/>
-  <link rel="hub" href="https://pubsubhubbub.superfeedr.com"/>
-  <link rel="salmon" href="http://kickass.zone/api/salmon/1"/>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=7:objectType=Follow</id>
-    <published>2016-10-10T13:29:56Z</published>
-    <updated>2016-10-10T13:29:56Z</updated>
-    <title>localhost started following kat@mastodon.social</title>
-    <content type="html">localhost started following kat@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/follow</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/12.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/12"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-      <uri>https://mastodon.social/users/kat</uri>
-      <name>kat</name>
-      <email>kat@mastodon.social</email>
-      <summary>#trans #queer</summary>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/kat"/>
-      <link rel="avatar" type="image/jpeg" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/016/large/kat-20150403T124737-b2mbt44.jpg"/>
-      <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/016/medium/kat-20150403T124737-b2mbt44.jpg"/>
-      <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/016/small/kat-20150403T124737-b2mbt44.jpg"/>
-      <poco:preferredUsername>kat</poco:preferredUsername>
-      <poco:displayName>Kat</poco:displayName>
-      <poco:note>#trans #queer</poco:note>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=3:objectType=Favourite</id>
-    <published>2016-10-10T13:29:26Z</published>
-    <updated>2016-10-10T13:29:26Z</updated>
-    <title>localhost favourited a status by kat@mastodon.social</title>
-    <content type="html">localhost favourited a status by kat@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/favorite</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/11.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/11"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <thr:in-reply-to ref="tag:mastodon.social,2016-10-10:objectId=22833:objectType=Status" href="https://mastodon.social/users/kat/updates/16543" type="text/html"/>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
-      <id>tag:mastodon.social,2016-10-10:objectId=22833:objectType=Status</id>
-      <title>@localhost  oooh more mastodons 	&#x2764;</title>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/kat/updates/16543"/>
-      <content type="html">&lt;p&gt;&lt;a href="http://kickass.zone/users/localhost"&gt;@localhost&lt;/a&gt;  oooh more mastodons 	&#x2764;&lt;/p&gt;</content>
-      <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-      <published>2016-10-10T13:23:35Z</published>
-      <updated>2016-10-10T13:23:35Z</updated>
-      <author>
-        <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-        <uri>https://mastodon.social/users/kat</uri>
-        <name>kat</name>
-        <email>kat@mastodon.social</email>
-        <summary>#trans #queer</summary>
-        <link rel="alternate" type="text/html" href="https://mastodon.social/users/kat"/>
-        <link rel="avatar" type="image/jpeg" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/016/large/kat-20150403T124737-b2mbt44.jpg"/>
-        <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/016/medium/kat-20150403T124737-b2mbt44.jpg"/>
-        <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/016/small/kat-20150403T124737-b2mbt44.jpg"/>
-        <poco:preferredUsername>kat</poco:preferredUsername>
-        <poco:displayName>Kat</poco:displayName>
-        <poco:note>#trans #queer</poco:note>
-      </author>
-      <link rel="mentioned" href="http://kickass.zone/users/localhost"/>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=2:objectType=Favourite</id>
-    <published>2016-10-10T13:13:15Z</published>
-    <updated>2016-10-10T13:13:15Z</updated>
-    <title>localhost favourited a status by Gargron@mastodon.social</title>
-    <content type="html">localhost favourited a status by Gargron@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/favorite</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/10.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/10"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <thr:in-reply-to ref="tag:mastodon.social,2016-10-10:objectId=22825:objectType=Status" href="https://mastodon.social/users/Gargron/updates/16538" type="text/html"/>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-      <id>tag:mastodon.social,2016-10-10:objectId=22825:objectType=Status</id>
-      <title>Deployed some fixes</title>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron/updates/16538"/>
-      <content type="html">&lt;p&gt;Deployed some fixes&lt;/p&gt;</content>
-      <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-      <published>2016-10-10T13:10:37Z</published>
-      <updated>2016-10-10T13:10:37Z</updated>
-      <author>
-        <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-        <uri>https://mastodon.social/users/Gargron</uri>
-        <name>Gargron</name>
-        <email>Gargron@mastodon.social</email>
-        <summary>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</summary>
-        <link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
-        <link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
-        <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
-        <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
-        <poco:preferredUsername>Gargron</poco:preferredUsername>
-        <poco:displayName>Eugen</poco:displayName>
-        <poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</poco:note>
-      </author>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=17:objectType=Status</id>
-    <published>2016-10-10T00:41:31Z</published>
-    <updated>2016-10-10T00:41:31Z</updated>
-    <title>Social media needs MOAR cats! http://kickass.zone/media/3</title>
-    <content type="html">&lt;p&gt;Social media needs MOAR cats! &lt;a rel="nofollow noopener noreferrer" href="http://kickass.zone/media/3"&gt;http://kickass.zone/media/3&lt;/a&gt;&lt;/p&gt;</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/9.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/9"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-    <link rel="enclosure" href="http://kickass.zone/system/media_attachments/files/000/000/003/original/gizmo.jpg?1476060065" type="image/jpeg" length="108841"/>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=14:objectType=Status</id>
-    <published>2016-10-10T00:38:39Z</published>
-    <updated>2016-10-10T00:38:39Z</updated>
-    <title>http://kickass.zone/media/2</title>
-    <content type="html">&lt;p&gt;&lt;a rel="nofollow noopener noreferrer" href="http://kickass.zone/media/2"&gt;http://kickass.zone/media/2&lt;/a&gt;&lt;/p&gt;</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/8.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/8"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-    <link rel="enclosure" href="http://kickass.zone/system/media_attachments/files/000/000/002/original/morpheus_linux.jpg?1476059910" type="image/jpeg" length="191816"/>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=12:objectType=Status</id>
-    <published>2016-10-10T00:37:49Z</published>
-    <updated>2016-10-10T00:37:49Z</updated>
-    <title/>
-    <activity:verb>http://activitystrea.ms/schema/1.0/delete</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/7.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/7"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=4:objectType=Follow</id>
-    <published>2016-10-10T00:23:07Z</published>
-    <updated>2016-10-10T00:23:07Z</updated>
-    <title>localhost started following bignimbus@mastodon.social</title>
-    <content type="html">localhost started following bignimbus@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/follow</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/6.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/6"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-      <uri>https://mastodon.social/users/bignimbus</uri>
-      <name>bignimbus</name>
-      <email>bignimbus@mastodon.social</email>
-      <summary>jdauriemma.com</summary>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/bignimbus"/>
-      <link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/004/large/jeff_avatar.png"/>
-      <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/004/medium/jeff_avatar.png"/>
-      <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/004/small/jeff_avatar.png"/>
-      <poco:preferredUsername>bignimbus</poco:preferredUsername>
-      <poco:displayName>Jeff Auriemma</poco:displayName>
-      <poco:note>jdauriemma.com</poco:note>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=2:objectType=Follow</id>
-    <published>2016-10-10T00:14:18Z</published>
-    <updated>2016-10-10T00:14:18Z</updated>
-    <title>localhost started following Gargron@mastodon.social</title>
-    <content type="html">localhost started following Gargron@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/follow</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/5.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/5"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-      <uri>https://mastodon.social/users/Gargron</uri>
-      <name>Gargron</name>
-      <email>Gargron@mastodon.social</email>
-      <summary>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</summary>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/Gargron"/>
-      <link rel="avatar" type="image/png" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/003/large/4375_eugencommish.png"/>
-      <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/003/medium/4375_eugencommish.png"/>
-      <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/003/small/4375_eugencommish.png"/>
-      <poco:preferredUsername>Gargron</poco:preferredUsername>
-      <poco:displayName>Eugen</poco:displayName>
-      <poco:note>Developer of Mastodon, a GNU social alternative: https://github.com/tootsuite/mastodon</poco:note>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=1:objectType=Follow</id>
-    <published>2016-10-10T00:09:09Z</published>
-    <updated>2016-10-10T00:09:09Z</updated>
-    <title>localhost started following abc@mastodon.social</title>
-    <content type="html">localhost started following abc@mastodon.social</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/follow</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/4.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/4"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-    <activity:object>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-      <uri>https://mastodon.social/users/abc</uri>
-      <name>abc</name>
-      <email>abc@mastodon.social</email>
-      <link rel="alternate" type="text/html" href="https://mastodon.social/users/abc"/>
-      <link rel="avatar" type="image/jpeg" media:width="300" media:height="300" href="http://kickass.zone/system/accounts/avatars/000/000/002/large/cbm64_80x80.jpg"/>
-      <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="http://kickass.zone/system/accounts/avatars/000/000/002/medium/cbm64_80x80.jpg"/>
-      <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="http://kickass.zone/system/accounts/avatars/000/000/002/small/cbm64_80x80.jpg"/>
-      <poco:preferredUsername>abc</poco:preferredUsername>
-      <poco:displayName>abc</poco:displayName>
-    </activity:object>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=3:objectType=Status</id>
-    <published>2016-10-10T00:02:47Z</published>
-    <updated>2016-10-10T00:02:47Z</updated>
-    <title/>
-    <activity:verb>http://activitystrea.ms/schema/1.0/delete</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/3.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/3"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=2:objectType=Status</id>
-    <published>2016-10-10T00:02:18Z</published>
-    <updated>2016-10-10T00:02:18Z</updated>
-    <title>Yes, that was the obligatory first post. :)</title>
-    <content type="html">&lt;p&gt;Yes, that was the obligatory first post. :)&lt;/p&gt;</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/2.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/2"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
-    <thr:in-reply-to ref="tag:kickass.zone,2016-10-10:objectId=1:objectType=Status" href="http://kickass.zone/users/localhost/updates/1" type="text/html"/>
-  </entry>
-  <entry>
-    <id>tag:kickass.zone,2016-10-10:objectId=1:objectType=Status</id>
-    <published>2016-10-10T00:01:56Z</published>
-    <updated>2016-10-10T00:01:56Z</updated>
-    <title>Hello, world!</title>
-    <content type="html">&lt;p&gt;Hello, world!&lt;/p&gt;</content>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <link rel="self" type="application/atom+xml" href="http://kickass.zone/users/localhost/updates/1.atom"/>
-    <link rel="alternate" type="text/html" href="http://kickass.zone/users/localhost/updates/1"/>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-  </entry>
-</feed>

spec/presenters/instance_presenter_spec.rb

@@ -91,8 +91,8 @@ describe InstancePresenter do
   end
 
   describe '#source_url' do
-    it 'returns "https://github.com/tootsuite/mastodon"' do
-      expect(instance_presenter.source_url).to eq('https://github.com/tootsuite/mastodon')
+    it 'returns "https://github.com/mastodon/mastodon"' do
+      expect(instance_presenter.source_url).to eq('https://github.com/mastodon/mastodon')
     end
   end
 

spec/views/about/show.html.haml_spec.rb

@@ -17,7 +17,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
       site_short_description: 'something',
       site_description: 'something',
       version_number: '1.0',
-      source_url: 'https://github.com/tootsuite/mastodon',
+      source_url: 'https://github.com/mastodon/mastodon',
       open_registrations: false,
       thumbnail: nil,
       hero: nil,