Differential D6824
wip: add forge now Authored by ardumont on Dec 13 2021, 10:05 AM. Tags None Subscribers None
Details
(Not ready for review, opened for the sake of transparency) This bootstraps the add forge now ui both user and moderation view. What's missing:
(- plug with scheduler tooling so the view is actually scheduling the new forge to list) Related to T3733 tests failing
Diff Detail
Event TimelineComment Actions Build is green Patch application report for D6824 (id=24746)Rebasing onto 61647a4bfd... First, rewinding head to replay your work on top of it... Applying: add-forge-now: Add model objects Applying: add-forge-now: Bootstrap views both for listing and moderation Using index info to reconstruct a base tree... M swh/web/misc/urls.py M swh/web/templates/layout.html Falling back to patching base and 3-way merge... Auto-merging swh/web/templates/layout.html Auto-merging swh/web/misc/urls.py CONFLICT (content): Merge conflict in swh/web/misc/urls.py Patch failed at 0002 add-forge-now: Bootstrap views both for listing and moderation Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Rebase failed (ret=1)! Could not rebase; Attempt merge onto 61647a4bfd... Already up to date. Changes applied before testcommit 9e1fb7fb7c293b80abde23752877be744f8bb68b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 26 16:15:12 2021 +0100
wip: forge_add/index.js: Simplify code
commit 16fc8b7e5063c0215666d91183429763961d2d95
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 26 16:14:28 2021 +0100
wip: forge_add: Add missing api part to actually add "add forge request"
commit 2dc41882ab9dc80c2f7b4575d170fc3bc32828f1
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 19 14:46:52 2021 +0100
add-forge-now: Interconnect save code now and add forge now views
Related to T3733
commit 0de6f979dcd55005ac1b95bd2b2d03dce3397286
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 19 14:46:00 2021 +0100
add-forge-now: Improve supported listing types
Related to T3733
commit 960741128720660eb278f969eff7d64f6e1d58c8
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 19 14:11:52 2021 +0100
add-forge-now: Bootstrap views both for listing and moderation
The code started out of the save code now view and got adapted to manipulate the new
forge model objects.
This is not complete nor tested yet.
Related to T3733
commit b4a9b3ad9e7147d069c6bff8642854d45e0a10ff
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date: Fri Nov 19 14:10:10 2021 +0100
add-forge-now: Add model objects
This bootstraps models and typing objects which will be used by the new functionality.
This also installs the necessary db migration script to install the changes in the db.
Related to T3733See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1266/ for more details. |