Skip to content

Add approval MR rule to all_models.yml

mo khan requested to merge 14708-refresh-license-approval-new-blacklist-item into master

What does this MR do?

This MR follows the guidance specified in the output of ./scripts/ee-specific-lines-check.

モ ./scripts/ee-specific-lines-check
=> Running `git --version`

git version 2.21.0

=> Running `git remote add canonical-ee https://gitlab.com/gitlab-org/gitlab-ee.git`
=> Running `git remote add canonical-ce https://gitlab.com/gitlab-org/gitlab-ce.git`
=> Running `git fetch canonical-ee master --quiet --depth=9999`
=> Running `git fetch canonical-ce master --quiet --depth=9999`
remote: warning: ignoring extra bitmap file: /var/opt/gitlab/git-data/repositories/@pools/4e/07/4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce.git/objects/pack/pack-7807f035b7a29e88c61df14a79e2b844eebcbc5c.pack
=> Running `git ls-remote https://gitlab.com/gitlab-org/gitlab-ce.git "*14708-refresh-license-approval-new-blacklist-item*"`

⚠️ We did not find a branch that would match the current '14708-refresh-license-approval-new-blacklist-item' branch in the https://gitlab.com/gitlab-org/gitlab-ce.git repository. We will fetch 'master' instead.
ℹ️ If you have a CE branch for the current branch, make sure that its name includes '14708-refresh-license-approval-new-blacklist-item'.

=> Running `git fetch canonical-ce master --quiet --depth=9999`
remote: warning: ignoring extra bitmap file: /var/opt/gitlab/git-data/repositories/@pools/4e/07/4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce.git/objects/pack/pack-7807f035b7a29e88c61df14a79e2b844eebcbc5c.pack
=> Running `git rev-parse HEAD`
=> Running `git merge-base canonical-ce/master canonical-ce/master`
=> Running `git merge-base canonical-ee/master HEAD`
=> Running `git merge-base canonical-ce/master 54e87c01a01904441e8b29d73da745189ef285a4`
=> Running `git merge-base --is-ancestor 89409a1925d65d4a62b523b5a7c0650287250cb5 89409a1925d65d4a62b523b5a7c0650287250cb5 && echo y`

CE is ahead of EE, finding backward CE head


No CE branch found, using merge base directly

=> Running `git diff 89409a1925d65d4a62b523b5a7c0650287250cb5..74144736ad6b05c35b05964d207656880c998f74 --numstat -- . ':!ee' ':!qa/qa/ee' ':!qa/qa/ee.rb' ':!qa/qa/specs/features/ee'`
=> Running `git diff 89409a1925d65d4a62b523b5a7c0650287250cb5..54e87c01a01904441e8b29d73da745189ef285a4 --numstat -- . ':!ee' ':!qa/qa/ee' ':!qa/qa/ee.rb' ':!qa/qa/specs/features/ee'`

* 💥 spec/lib/gitlab/import_export/all_models.yml has 1 updated lines that differ between EE and CE! 💥

ℹ️ Make sure all lines in shared files have been updated in your backport merge request and the branch name includes 14708-refresh-license-approval-new-blacklist-item.
ℹ️ Consider using an EE module to add the features you want.
ℹ️ See this for detail: https://docs.gitlab.com/ee/development/ee_features.html#ee-features-based-on-ce-features

=> Running `git remote remove canonical-ee`
=> Running `git remote remove canonical-ce`
=> Running `git remote remove target-ce`
fatal: No such remote: 'target-ce'

ℹ️ For more information on why, see https://gitlab.com/gitlab-org/gitlab-ee/issues/2952

The change in this MR is related to the change made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/16070

Does this MR meet the acceptance criteria?

Conformity

Performance and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by mo khan

Merge request reports