Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Password and login changes #3866

Merged
merged 5 commits into from
Sep 20, 2023
Merged

Password and login changes #3866

merged 5 commits into from
Sep 20, 2023

Conversation

laurentj
Copy link
Collaborator

@laurentj laurentj commented Sep 5, 2023

Funded by 3liz

@laurentj laurentj self-assigned this Sep 5, 2023
@github-actions github-actions bot added this to the 3.7.0 milestone Sep 5, 2023
@laurentj
Copy link
Collaborator Author

laurentj commented Sep 5, 2023

This branch could be merged when jCommunity 1.4.0-beta.1 will be released.

It allows to use email as login.
The increase of the field into the database is made by
the jcommunity module 1.4.0-beta.1.
It is not needed since we are using jCommunity
@laurentj laurentj marked this pull request as ready for review September 20, 2023 10:47
@laurentj laurentj merged commit 546b884 into 3liz:master Sep 20, 2023
10 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 52d913b49... Logins: increase the field to 255 characters
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
[backport-3866-to-release_3_6 ad29637ef] Passwords: increase minimum length to 12 characters
 Author: Laurent Jouanneau <dev@ljouanneau.com>
 Date: Tue Sep 5 16:11:00 2023 +0200
 2 files changed, 2 insertions(+), 2 deletions(-)
Auto-merging lizmap/composer.json
CONFLICT (content): Merge conflict in lizmap/composer.json
Auto-merging lizmap/modules/lizmap/daos/user.dao.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-3866-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3bf668f1701e699a4da43da69779f91541581349,52d913b4986f4f64ac3a2163e439b03af5f005f6,25a024d6fc2956536acd841878efea70481db3a2,3816ac1442ac3c6cbadb9c61985705e3c04ecd8d,30d6851c38f6b3001050f62c17a08a72dbee034c
# Push it to GitHub
git push --set-upstream origin backport-3866-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

Then, create a pull request where the base branch is release_3_6 and the compare/head branch is backport-3866-to-release_3_6.

@laurentj
Copy link
Collaborator Author

backport done.

@Gustry
Copy link
Member

Gustry commented Sep 27, 2023

Minor but the proposed password doesn't match new requirements :

image

Do you want a ticket ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants