added 1 commit <ul><li>54c6441c - Add a unit test for the password view</li></ul> [Compare with previous version](/klub-dev-ens/Ernesto/-/merge_requests/11/diffs?diff_id=2110&start_sha=cc60394dd0b0f31a4e0ec0e80d37db0f6651af75)

mpepin commented

2020-09-12 15:04:02 +02:00

(Migrated from git.eleves.ens.fr)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

mpepin commented

2020-09-12 19:08:58 +02:00

(Migrated from git.eleves.ens.fr)

added 7 commits

54c6441c...7a7979c9 - 4 commits from branch master
7c281f92 - Prevent the 'change passwd' view from crashing
e17b033a - Minor fixes on the 'change passwd' template
56c31e26 - Add a unit test for the password view

Compare with previous version

added 7 commits <ul><li>54c6441c...7a7979c9 - 4 commits from branch <code>master</code></li><li>7c281f92 - Prevent the 'change passwd' view from crashing</li><li>e17b033a - Minor fixes on the 'change passwd' template</li><li>56c31e26 - Add a unit test for the password view</li></ul> [Compare with previous version](/klub-dev-ens/Ernesto/-/merge_requests/11/diffs?diff_id=2113&start_sha=54c6441c7757c5d4454b2101771a39c3a66840c1)

This pull request has changes conflicting with the target branch.

gestion/views.py

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin kerl/change_pwd:kerl/change_pwd

git checkout kerl/change_pwd

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master

git merge --no-ff kerl/change_pwd

git checkout kerl/change_pwd

git rebase master

git checkout master

git merge --ff-only kerl/change_pwd

git checkout kerl/change_pwd

git rebase master

git checkout master

git merge --no-ff kerl/change_pwd

git checkout master

git merge --squash kerl/change_pwd