OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
11,346 Commits
137 Branches
269 Tags
1,018 MiB
Commit Graph

7 Commits (85933bc9ff5869e69403315a30c3027d59c7e60d)

Author SHA1 Message Date
Thibaut Girka ff67385cfb 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
Yamagishi Kazutoshi 6c60ccee8a Add config for issue template (#12306) 2019-11-13 22:51:49 +01:00
Thibaut Girka dcded13a99 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 85334d1362
Fix feature request issue template 2018-10-16 03:02:01 +02:00
Eugen Rochko 528ba4861d
Update issue templates (#8989) 
* Update issue templates

* Update bug_report.md

* Update feature_request.md

* Update support.md

* Update feature_request.md
 2018-10-16 03:01:07 +02:00
Thibaut Girka ea3c0ce321 Adapt github issue template to glitch-soc 
We don't have releases, so it don't make sense to mention.
On the other hand, a lot of our code is from upstream, so encourage people to
check whether it is a bug in glitch-soc or upstream.
 2018-08-19 16:56:42 +02:00
Yamagishi Kazutoshi 40097f438b Multiple Issue templates (#7402) 
* Multiple Issue templates

* Update bug_report.md
 2018-05-08 13:35:33 +02:00