| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
potentially pushing one
|
|
|
|
|
|
Also simplify the CSS a bit and bring it closer to upstream.
|
|
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
Upstream changed the fields returned by /api/v1/instance by adding a
`configuration` field holding a lot of useful information making our
`max_toot_chars` and `poll_limits` fields obsolete.
Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
MAX_CHARS which is defined differently in glitch-soc.
Ported upstream changes.
|
|
|
|
List various values like file size limits and supported mime types
|
|
Port 1381e0e1d9f27bd108d8b9349896f10ffe996cb2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/accounts/_header.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/directories/index.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
|
|
Remove "active within last two weeks" exception for sign in token requirement
Change admin reset password to lock access until the password is reset
|
|
3.4.1 dropped account_stats.lock_version, but in a way breaking the usual
upgrade path by requiring services to be reloaded after the post-migrations.
Indeed, `self.locking_column = nil` was not enough for Rails to ignore the
`lock_version` column when preparing statements on application load, resulting
in some ActiveRecord queries (typically those involving
`includes(:account_stat)`) erroring out with:
ActiveRecord::StatementInvalid (PG::UndefinedColumn: ERROR: column account_stats.lock_version does not exist
|
|
Fixes #16435
|
|
* Change link footer and onboarding model to point to our personal Git
repository and direct folks to email us for collaboration
* Remove now-unnecessary .github folder and add it to .gitignore [I am
not actually sure if this will prevent us from getting those files
again in the future.]
* Restore English locale to upstream version and move our changes into
the en-cafe custom locale.
* Remove most of the README for clarity.
After GitHub's contract with ICE came to light, we moved our personal
projects away from the site. With Copilot now effectively laundering
code under free licenses through machine learning by claiming that
training a model is "fair use" even when it directly quotes the input,
it's clear now that making the effort to move our Mastodon fork off of
GitHub is worth the effort. But even if the model *never* recited
anyone's source, we consider it to be clearly unethical to use open
source code in this way without a permissive license or written
consent from the authors of any non-trivial contributions. Whether or
not the law agrees, this is clearly a derivative work in the colloquial
sense of the term.
We needed to build our own CI/CD solution in the next week and a half
anyway because Docker Hub is removing automatic builds from the free
tier.
We're under no illusions that moving to our personal Git host will
actually stop anyone from doing whatever they want with what we post
publicly on the Internet. But we're both sending a message and
learning how to build our own infrastructure, which will hopefully be
helpful to us in the future.
You can read more about GitHub's ICE deals here:
https://www.zdnet.com/article/microsoft-github-ceo-why-we-defend-ice-deal-in-the-face-of-employee-anger/
You can read about GitHub Copilot quoting source code, and the steps
they've taken to reduce its frequency, here:
https://docs.github.com/en/github/copilot/research-recitation
|
|
|
|
|
|
* Fix anonymous access to outbox not being cached by the reverse proxy
Up until now, anonymous access to outbox was marked as public, but with a
0 duration for caching, which means remote proxies would only serve from cache
when the server was completely overwhelmed.
Changed that cache duration to one minute, so that repeated anonymous access
to one account's outbox can be appropriately cached.
Also added `Signature` to the `Vary` header in case a page is requested, so
that authenticated fetches are never served from cache (which only contains
public toots).
* Remove Vary: Accept header from webfinger controller
Indeed, we have stopped returning xrd, and only ever return jrd, so the
Accept request header does not matter anymore.
* Cache negative webfinger hits for 3 minutes
|
|
|
|
block (#16455)
|
|
Port 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Removed upstream, while we had a checkbox telling people to check if the
issue was present upstream. Removed the file as well.
|
|
|
|
|
|
(#16387)
|
|
* Fix WebUI crash when a toot with a playing video gets deleted
* Fix pop-up player not closing the moment a status is deleted
|
|
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
|
|
to boost
Port tootsuite#16387 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
* Fix newlines in account notes added by the move handler
* Make MoveWorker more robust
|
|
Also adds timestamp in HTML itself to not rely on javascript
|
|
|
|
Port SCSS changes from d174d12c831989bf1d5d3ca54d4f26d28c2c8925 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
network (#16418)
* Add tests
* Fix serialization of followers/following counts when user hides their network
Fixes #16382
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
Port 8428faa0859d86c97950084658498a2c25e26f15 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
glitch-specific one (redcarpet).
Ported upstream change.
|
|
Fixes #15472
If the Tesseract worker fails at any point, re-try with cache settings that
overwrite the cache. It is difficult to catch more precise errors as those
are pretty opaque and do not occur when loading lang data but when trying to
detect text.
|
|
their actor key suddenly changes"
This reverts commit a43c1d3f56c128c992f34b8e2b968de14e02ac48.
|
|
Conflicts:
yarn.lock: caniuse-lite has been outdated in upstream for
awhile, and we fixed it a few weeks ago in our fork
|
|
Port f6088922c06f3da02e9051b39f3a7111f19298dd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port be8079f63783691dd9fdec3f79b744a5bfdb2b0f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port abd7b4636a4bda2454f1d30e7f87843d0c06dcbe to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
