Release 15.2.2 for JH

Steps

• Run git pull so that we can see the tag v15.2.2-ee.
• Merge v15.2.2-ee into 15-2-stable-jh
  • git checkout 15-2-stable-jh
  • git merge v15.2.2-ee
    • A conflict will happen in VERSION, set it to 15.2.2-jh and commit the change.
• Update the jh/Gemfile.lock file:
  • bundle config set --local gemfile jh/Gemfile (if you didn't point Gemfile to jh/Gemfile before)
  • cp Gemfile.lock jh/ && bundle install
    • If this step generates changes to the jh/Gemfile.lock file, commit the changes with the commit message Update jh/Gemfile.lock.
• Tag v15.2.2-jh
  • git checkout 15-2-stable-jh
  • git tag -a v15.2.2-jh -m "Version v15.2.2-jh"
• Review JH changes between v15.2.2-ee..v15.2.2-jh and v15.2.1-ee..v15.2.1-jh which should only contains the version change, the above JH and upstream commit changes and the jh/Gemfile.lock changes (if any).
  • git fetch --tags --all （if your local tag is not latest code）
  • git diff v15.2.1-ee..v15.2.1-jh > jh_diff.1
  • git diff v15.2.2-ee..v15.2.2-jh > jh_diff.2
  • diff jh_diff.1 jh_diff.2:

    2c2
    < index 6c3b09479f5..3f8e17e801b 100644
    ---
    > index 092677253bd..02805bd0854 100644
    6c6
    < -15.2.1-ee
    ---
    > -15.2.2-ee
    8c8
    < +15.2.1-jh
    ---
    > +15.2.2-jh
    776c776
    < index 00000000000..577ffb650dd
    ---
    > index 00000000000..d17e341ef79
    1678c1678
    < +    oj (3.13.16)
    ---
    > +    oj (3.13.19)

• Push the branch 15-2-stable-jh and the tag v15.2.2-jh.
  • git checkout 15-2-stable-jh
  • git push
  • git push origin v15.2.2-jh
  • v15.2.2-jh can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v15.2.2-jh
• Monitor the pipeline of v15.2.2-jh and make sure it can pass.