about summary refs log tree commit diff
path: root/spec/views/about
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-07-13 17:57:15 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-07-13 17:57:15 +0200
commitfc500a606225b56c3da7eaebf2bfb94e9cc97d2f (patch)
tree224cbc337acea85bd7a358fb4985f0362432cf38 /spec/views/about
parent82bc8e764798b74f475763136117592526d905fa (diff)
parent31593d14269bd5f21151d70eec1031aa30ee0937 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
Diffstat (limited to 'spec/views/about')
-rw-r--r--spec/views/about/show.html.haml_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 26b131977..d608bbf5d 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -19,7 +19,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,