Release 13.12.4 for JH

Steps

• Run git pull so that we can see the tag v13.12.4-ee.
• Merge v13.12.4-ee into 13-12-stable-jh
  • git checkout 13-12-stable-jh
  • git merge v13.12.4-ee
    • A conflict might happen in VERSION. Set it to 13.12.4-jh
• Tag v13.12.4-jh
  • git checkout 13-12-stable-jh
  • git tag -a v13.12.4-jh -m "Version v13.12.4-jh"
• Review JH changes between v13.12.4-ee..v13.12.4-jh should be the same as v13.12.0-ee..v13.12.0-jh (other than the version change), because there's no changes from JH side. Here the exception is doc/install/installation.md and lib/support/init.d/gitlab, see https://gitlab.com/gitlab-jh/gitlab/-/issues/58#note_584690541 for why these two files are here.
  • git diff v13.12.0-ee..v13.12.0-jh > jh_diff.0
  • git diff v13.12.4-ee..v13.12.4-jh > jh_diff.4
  • diff jh_diff.0 jh_diff.4:

    2c2
    < index fc81a28e14b..47fe18f0a0e 100644
    ---
    > index a30db9b1d47..5a7c47b3836 100644
    6c6
    < -13.12.0-ee
    ---
    > -13.12.4-ee
    8,22c8
    < +13.12.0-jh
    < \ No newline at end of file
    < diff --git a/doc/install/installation.md b/doc/install/installation.md
    < index 3af3d2bfe7a..d6f8c9cedd3 100644
    < --- a/doc/install/installation.md
    < +++ b/doc/install/installation.md
    < @@ -688,7 +688,7 @@ gitlab_path=/home/git/gitlab
    <  gitaly_path=/home/git/gitaly
    <  
    <  sudo -u git -H sh -c "$gitlab_path/bin/daemon_with_pidfile $gitlab_path/tmp/pids/gitaly.pid \
    < -  $gitaly_path/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 &"
    < +  $gitaly_path/_build/bin/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 &"
    <  ```
    <  
    <  ### Initialize Database and Activate Advanced Features
    ---
    > +13.12.4-jh
    410,422d395
    < diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
    < index 4fe7f0cf480..9bf8fe28120 100755
    < --- a/lib/support/init.d/gitlab
    < +++ b/lib/support/init.d/gitlab
    < @@ -341,7 +341,7 @@ start_gitlab() {
    <        echo "Gitaly is already running with pid $gapid, not restarting"
    <      else
    <        $app_root/bin/daemon_with_pidfile $gitaly_pid_path \
    < -        $gitaly_dir/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 &
    < +        $gitaly_dir/_build/bin/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 &
    <      fi
    <    fi
    <  

• Push the branch 13-12-stable-jh and the tag v13.12.4-jh
  • git checkout 13-12-stable-jh
  • git push
  • git push origin v13.12.4-jh

assigned to @qianzhangxa

By Qian Zhang on 2021-06-14T22:46:29 (imported from GitLab)

marked the checklist item Run git pull so that we can see the tag v13.12.3-ee. as completed

By Qian Zhang on 2021-06-14T22:46:59 (imported from GitLab)

marked the checklist item Merge v13.12.4-ee into 13-12-stable-jh as completed

By Qian Zhang on 2021-06-14T22:48:27 (imported from GitLab)

marked the checklist item Tag v13.12.4-jh as completed

By Qian Zhang on 2021-06-14T22:49:03 (imported from GitLab)

changed the description

By Qian Zhang on 2021-06-14T22:53:00 (imported from GitLab)

changed the description

By Qian Zhang on 2021-06-14T22:53:41 (imported from GitLab)

marked the checklist item Review JH changes between v13.12.4-ee..v13.12.4-jh should be the same as v13.12.0-ee..v13.12.0-jh (other than the version change), because there's no changes from JH side. Here the exception is doc/install/installation.md and lib/support/init.d/gitlab, see https://gitlab.com/gitlab-jh/gitlab/-/issues/58#note_584690541 for why these two files are here. as completed

By Qian Zhang on 2021-06-14T22:53:45 (imported from GitLab)

marked the checklist item Push the branch 13-12-stable-jh and the tag v13.12.4-jh as completed

By Qian Zhang on 2021-06-15T00:44:17 (imported from GitLab)

changed the description

By Qian Zhang on 2021-06-22T00:56:19 (imported from GitLab)