diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-23 15:11:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-23 15:11:20 +0000 |
| commit | 273ee970db58a0488d7b1de5ad7c62bfd21572e4 (patch) | |
| tree | d8865c447cd60713575a022d6ef2760dc1bf1795 /scripts | |
| parent | 026ed016d068a58b2e09422135b5b78bd11f2a2b (diff) | |
| download | gitlab-ce-273ee970db58a0488d7b1de5ad7c62bfd21572e4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup/find-jh-branch.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/setup/find-jh-branch.rb b/scripts/setup/find-jh-branch.rb index 9c23b72e51d..812e1c210f4 100755 --- a/scripts/setup/find-jh-branch.rb +++ b/scripts/setup/find-jh-branch.rb @@ -73,6 +73,10 @@ class FindJhBranch ENV['CI_DEFAULT_BRANCH'] end + def merge_request_project_id + ENV['CI_MERGE_REQUEST_PROJECT_ID'] + end + def merge_request_id ENV['CI_MERGE_REQUEST_IID'] end @@ -81,12 +85,8 @@ class FindJhBranch "#{ref_name}-jh" end - def project_id - API::DEFAULT_OPTIONS[:project] - end - def merge_request - @merge_request ||= gitlab.merge_request(project_id, merge_request_id) + @merge_request ||= gitlab.merge_request(merge_request_project_id, merge_request_id) end def gitlab |