Use PROJECT_ID instead of PROJECT_PATH in Gitlab urls #1478
+4
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I have the same patch ready for danger-js, if this one is acceptable. |
manicmaniac
approved these changes
Feb 2, 2024
| @@ -11,7 +11,7 @@ | |||
| ## master | |||
|
|
|||
| <!-- Your comment below here --> | |||
| * Add keyword arguments to MessageAggregator.aggregate for Ruby 3.X compatibility - [@dirtyhabits97](https://github.com/dirtyhabits97) [#1466](https://github.com/danger/danger/pull/1466) | |||
| * Use PROJECT_ID instead of PROJECT_PATH in Gitlab urls. This fixes a bug where Danger would not work with Gitlab self-hosted instances. - [@simonfelding](https://github.com/simonfelding) [#1478](https://github.com/danger/danger/pull/1478) | |||
There was a problem hiding this comment.
Please do not delete the old one, just append a new entry.
| @@ -42,7 +42,7 @@ def self.determine_pull_or_merge_request_id(env) | |||
| return env["CI_EXTERNAL_PULL_REQUEST_IID"] if env["CI_EXTERNAL_PULL_REQUEST_IID"] | |||
| return 0 unless env["CI_COMMIT_SHA"] | |||
|
|
|||
| project_path = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"] | |||
| project_path = env["CI_MERGE_REQUEST_PROJECT_ID"] || env["CI_PROJECT_ID"] | |||
There was a problem hiding this comment.
I think the variable project_path should be renamed as well.
manicmaniac
requested changes
Feb 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a bug where danger would not work with (some?) self-hosted instances.
Before this patch, I got a 404 from our self-hosted Gitlab CE API. Now it works as expected.
It also fixes issues like #968 because the problem is deriving a valid URL for the project. Since PROJECT_ID is unique on a gitlab instance, you can always just use that instead of the PROJECT_PATH.
I tested this and it works. I'm not sure how to run tests in ruby locally, so CI will probably fail.