mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	48f0f3ffee	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.	5 years ago
Yamagishi Kazutoshi	8eb97e8ca2	Apply label automatically when issue creation from template (#15154 )	5 years ago
Yamagishi Kazutoshi	da10c5c707	Exclude dependency updates other than direct dependencies (#14944 )	5 years ago
Thibaut Girka	9c3b9d5ab9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.	6 years ago
Eugen Rochko	fa183a51ab	Add GitHub Sponsors	6 years ago
Thibaut Girka	34d92e0233	Disable dependabot	6 years ago
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	6 years ago
Shlee	ef15aa43c7	Update dependabot.yml (Fix #13939 ) (#13990 ) * Update dependabot.yml * Update dependabot.yml	6 years ago
Shlee	a415f44fd1	Update Dependabot config (#13939 ) * Delete config.yml * Create dependabot.yml	6 years ago
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	6 years ago
Yamagishi Kazutoshi	6c60ccee8a	Add config for issue template (#12306 )	6 years ago
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	6 years ago
Eugen Rochko	4988ebba4e	Change stale bot to only touch pull requests over 120 days old (#12217 )	6 years ago
Eugen Rochko	91945aa78a	Create stale.yml (#12207 )	6 years ago
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`.	7 years ago
Yamagishi Kazutoshi	369eb63321	Add sponsor button to GitHub web UI (#10814 ) - https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository	7 years ago
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.	7 years ago
Eugen Rochko	85334d1362	Fix feature request issue template	7 years ago
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	7 years ago
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.	8 years ago
Yamagishi Kazutoshi	40097f438b	Multiple Issue templates (#7402 ) * Multiple Issue templates * Update bug_report.md	8 years ago
Yamagishi Kazutoshi	1486fd64cc	Move files for GitHub to .github directory (#5989 )	8 years ago

22 Commits (62051072297afaa6d1dc48e42df28d59cdcbc540)