WIP: Update bcrypt to 3.1.15
Bcrypt 3.1.11 has a bug that can cause an unhashed error. see https://stackoverflow.com/questions/50213071/why-does-bcrypt-no-longer-accept-hashes
Bcrypt 3.1.11 has a bug that can cause an unhashed error. see https://stackoverflow.com/questions/50213071/why-does-bcrypt-no-longer-accept-hashes
Step 1. Fetch and check out the branch for this merge request
git fetch https://lab.nexedi.com/Daetalus/gitlab-ce.git v9.5.10-nxd git checkout -b Daetalus/gitlab-ce-v9.5.10-nxd FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/v9.5.10-nxd git merge --no-ff Daetalus/gitlab-ce-v9.5.10-nxd
Step 4. Push the result of the merge to GitLab
git push origin v9.5.10-nxd
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.