]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5893019 166cc5b)
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 26 Jan 2022 21:32:21 +0000 (22:32 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 26 Jan 2022 21:32:21 +0000 (22:32 +0100)
commitad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a
tree70af45c80f67391c46c55425c64b33da9467fedbtree | snapshot
parent58930199379305e718d57b48488cc752b452e72acommit | diff
parent166cc5b89d60f8e2e1f748df86ff8a9003a4876ecommit | diff
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/helpers/application_helper.rb diff1 | diff2 | blob | history
app/services/fan_out_on_write_service.rb diff1 | diff2 | blob | history
config/environments/production.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon