Commit Graph

13 Commits

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 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
Eugen Rochko 4988ebba4e
Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
Eugen Rochko 91945aa78a
Create stale.yml (#12207) 2019-10-25 11:47:40 +02:00
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
Yamagishi Kazutoshi 369eb63321 Add sponsor button to GitHub web UI (#10814)
- https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
2019-05-23 15:00:54 +02: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
Yamagishi Kazutoshi 1486fd64cc Move files for GitHub to .github directory (#5989) 2017-12-12 15:10:12 +01:00