Fix MR widget with external CI services/integrations
What does this MR do?
EE MR, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2922
- Fix MR widget throwing errors with external CI services/integrations
- Fix up some logic where it would allow merge when "Only allow merge requests to be merged if the pipeline succeeds" was set
External integration/service
GitLab CI pipeline
Should be no change...
Are there points in the code the reviewer needs to double check?
- Link to external builds, https://gitlab.com/gitlab-org/gitlab-ce/issues/37305
- Added "The pipeline for this merge request has not succeeded yet." state for
running
,pending
, etc otherwise it would say "The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure"
Use the MockCI service/integration
Checkout the MockCI service for easy testing of states.
Get the TeamCity service/integration running
- Download TeamCity
- Run it,
/Users/eric/Downloads/TeamCity/bin/runAll.sh start
- Visit and follow guided steps, http://localhost:8111
- Create a TeamCity admin account, http://localhost:8111/setupAdmin.html
- Create a project/repo on your local GDK. I just copied over the
gitter-ios-app
xcode project - Follow the steps here using the repo you just created, https://confluence.jetbrains.com/display/TCD9/Configure+and+Run+Your+First+Build
- Add the TeamCity integration to your GitLab project, Settings -> Integrations -> JetBrains TeamCity CI (make sure to check the "Active" checkbox)
Teamcity url: http://localhost:8111/ Build type: TeamCityIntegrationTest_SomeBuildConfig (you can grab this from the "General Settings" of the TeamCity project) Username/Password: Use the TeamCity admin account you created above
- When you are done, you can stop it with
/Users/eric/Downloads/TeamCity/bin/runAll.sh stop
Why was this MR needed?
- MR widget is broken with external services/integrations.
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Tests added for this feature/bug - Review
-
Has been reviewed by UX -
Has been reviewed by Frontend
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Squashed related commits together
What are the relevant issue numbers?
Closes #33287 (closed)
Edited by username-removed-892863