Monorepo for Tangled tangled.org
856
fork

Configure Feed

Select the types of activity you want to include in your feed.

appview,knotserver: 1.14 deploy prep #349

open opened by oyster.cafe targeting master from lt/repo-rename-by-rkey
Labels

None yet.

assignee

None yet.

Participants 1
AT URI
at://did:plc:3fwecdnvtcscjnrx2p4n7alz/sh.tangled.repo.pull/3mlbm4tw3bj22
+7 -7
Interdiff #1 #2
+7 -7
appview/db/db.go
··· 1875 1875 }) 1876 1876 conn.ExecContext(ctx, "pragma foreign_keys = on;") 1877 1877 1878 - orm.RunMigration(conn, logger, "migrate-knots-to-repo-did-rename", func(tx *sql.Tx) error { 1879 - _, err := tx.Exec(` 1880 - update registrations set needs_upgrade = 1; 1881 - `) 1882 - return err 1883 - }) 1884 - 1885 1878 return &DB{ 1886 1879 db, 1887 1880 logger, ··· 1926 1919 }) 1927 1920 conn.ExecContext(ctx, "pragma foreign_keys = on;") 1928 1921 1922 + orm.RunMigration(conn, logger, "migrate-knots-to-repo-did-rename", func(tx *sql.Tx) error { 1923 + _, err := tx.Exec(` 1924 + update registrations set needs_upgrade = 1; 1925 + `) 1926 + return err 1927 + }) 1928 + 1929 1929 return &DB{ 1930 1930 db, 1931 1931 logger,
appview/pages/templates/repo/needsUpgrade.html

This file has not been changed.

appview/pages/templates/repo/settings/general.html

This file has not been changed.

docs/DOCS.md

This patch was likely rebased, as context lines do not match.

knotserver/xrpc/version.go

This file has not been changed.

nix/pkgs/knot-unwrapped.nix

This file has not been changed.

History

3 rounds 0 comments
sign up or login to add to the discussion
1 commit
expand
appview,knotserver: 1.14 deploy prep
merge conflicts detected
expand
  • api/tangled/cbor_gen.go:866
  • api/tangled/feedstar.go:5
  • api/tangled/gitrefUpdate.go:29
  • api/tangled/repocollaborator.go:19
  • api/tangled/repoissue.go:22
  • api/tangled/repopull.go:39
  • api/tangled/tangledrepo.go:24
  • cmd/cborgen/cborgen.go:17
  • knotserver/xrpc/merge.go:118
  • lexicons/feed/star.json:10
  • lexicons/git/refUpdate.json:11
  • lexicons/issue/issue.json:9
  • lexicons/pulls/pull.json:65
  • lexicons/repo/collaborator.json:11
  • lexicons/repo/repo.json:6
expand 0 comments
1 commit
expand
appview,knotserver: 1.14 deploy prep
expand 0 comments
1 commit
expand
appview,knotserver: 1.14 deploy prep
expand 0 comments