Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
G
gitlab-ce
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • nexedi
  • gitlab-ce
  • Merge Requests
  • !6

Closed
Opened Jan 30, 2023 by Boxiang Sun@Daetalus
  • Report abuse
Report abuse

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

@jerome @alain.takoudjou

Edited Jan 30, 2023 by Boxiang Sun

Check out, review, and merge locally

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.

  • Discussion 5
  • Commits 1
  • Changes 1
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/gitlab-ce!6
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7