Commit Graph

32 Commits (7b4130ec9c58ba5a14247d28dde32241d925e7d0)

Author SHA1 Message Date
Claire 81d24609e5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
F aa12b82246 Note that CircleCI auth may be required to run PR pipelines (#20371)
See #20284
2022-11-11 02:54:02 +01:00
Jeremy Kescher f00756b79e Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Claire 0495e0642e 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.
2021-07-13 17:57:15 +02:00
Claire ab4c1478b6 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
2021-07-13 15:46:20 +02:00
Claire 42cdc6b071 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
Eugen Rochko 8abef3b162 Add pull request title recommendations to CONTRIBUTING.md (#16247) 2021-05-16 23:09:21 +02:00
Claire 9493606b11 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.
2021-01-26 14:01:30 +01:00
Joe b4b3bccdfc Fix link to documentation repo (#15620) 2021-01-24 09:14:35 +01:00
Thibaut Girka a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
sclaire-1 10ddf1ba9c Edit CONTRIBUTING.md (#12401)
Edited to improve clarity, concision, and assertiveness
2019-11-17 12:25:10 +01:00
Thibaut Girka e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
Scott Sweeny 8a06ed9058 Fix crowdin badge display in CONTRIBUTING.md (#12273)
* Fix crowdin badge display in CONTRIBUTING.md

The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string.

* Make Crowdin badge a link to the Mastodon project
2019-11-04 13:01:37 +01:00
Thibaut Girka 4356f98a37 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-16 21:09:19 +02:00
Yusuke Nakamura 288d081853 Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094)
Restore and change from ee8d64ff
2019-06-16 18:36:47 +02:00
Thibaut Girka fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Yusuke Nakamura bf0766358b Remove 'Weblate' from CONTRIBUTING.md (#10778)
The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)
2019-05-18 14:40:55 +02:00
Thibaut Girka 3be4189998 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
Eugen Rochko 3b5b6d19f5 Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
Eugen Rochko ee8d64ff53 Update CONTRIBUTING.md (#9014)
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
2018-10-19 16:41:25 +02:00
David Yip ecdfcbf266 Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	CONTRIBUTING.md
2018-05-04 12:16:12 -05:00
Marcin Mikołajczak e38c51da92 Improve “how to translate” (#7358) 2018-05-04 18:37:37 +02:00
Yamagishi Kazutoshi 00df2b623f Add translate guide to CONTRIBUTING.md (#7355) 2018-05-04 18:01:12 +02:00
Gô Shoemake 50b74eeb08 Added link to docs website 2017-07-14 09:42:50 -07:00
kibigo! 6574cab679 Updated readme and contrib docs 2017-07-12 23:55:55 -07:00
Matt Jankowski 98b6c5c0d4 README tidy up (#2026)
* Remove docker guide and put it in docs repo

* Move tasks to docs repo

* Move requirements to contributing doc

* Move advice about tagged releases to docs repo

* Move local domain and host config to docs repo

* Link to related tech
2017-04-17 21:28:31 +02:00
Matt Jankowski 55986b4876 Rubocop instructions (#1973)
* Rubocop link for Sublime Text

* Fix rubocop links

* Link to gh issues page from contributing doc
2017-04-17 10:35:42 +02:00
Shel R 3a8a999331 Request documentation (#1616)
This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.
2017-04-12 18:27:33 +02:00
Neville Park 9575c18707 Corrected spelling mistake 2017-04-02 13:01:55 -04:00
Eugen Rochko 81d044fa2e Add link to contribution guidelines to README 2017-03-19 04:05:19 +01:00
Eugen Rochko ee833a532e Added contribution guidelines 2017-03-19 03:52:21 +01:00