]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4aa860b 65db262)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 2 Mar 2021 11:06:58 +0000 (12:06 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 2 Mar 2021 11:06:58 +0000 (12:06 +0100)
commitd8fdbb054e30f6e8e505bce63e5f150bf117cd8e
tree0a671ee6c8a7644e6613dd87798f661f4703e8fetree | snapshot
parent4aa860b65bd796b09dc0ceffa1fdd7de31060a34commit | diff
parent65db2625508c220fd3c0a1f37cdd2e13b6e02987commit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/lib/formatter.rb diff1 | diff2 | blob | history
app/validators/status_length_validator.rb diff1 | diff2 | blob | history
app/views/about/more.html.haml diff1 | diff2 | blob | history
config/routes.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
spec/lib/formatter_spec.rb diff1 | diff2 | blob | history
spec/validators/status_length_validator_spec.rb diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon