Commit Graph

12 Commits

Author SHA1 Message Date
GitLab Bot 3774672ae1 Add latest changes from gitlab-org/gitlab@master 2021-12-20 21:10:56 +00:00
GitLab Bot 110225407f Add latest changes from gitlab-org/gitlab@master 2021-08-19 12:08:53 +00:00
GitLab Bot ec3483bd18 Add latest changes from gitlab-org/gitlab@master 2021-07-26 09:09:00 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot 023e050d82 Add latest changes from gitlab-org/gitlab@master 2021-05-05 12:10:33 +00:00
GitLab Bot a5605d87fb Add latest changes from gitlab-org/gitlab@master 2021-04-13 18:11:28 +00:00
GitLab Bot 0121231095 Add latest changes from gitlab-org/gitlab@master 2021-01-26 12:09:27 +00:00
Winnie Hellmann 75353242e2 Replace prepend_entity with prepend_if_ee
(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)
2019-08-27 15:11:15 +00:00
Yorick Peterse 6aa215aaea
Support X_if_ee methods for QA tests
For the QA tests to use the new injection methods, we must require the
initializer and ensure that the "constantize" method is available.
2019-08-19 09:43:37 +02:00
Mark Lapierre 8ff68917b8 Revert "Merge branch 'backport-fix-remaining-prepend-lines' into 'master'"
This reverts merge request !31379
2019-08-05 04:02:08 +00:00
Yorick Peterse 27194e0852
Support X_if_ee methods for QA tests
For the QA tests to use the new injection methods, we must require the
initializer and ensure that the "constantize" method is available.
2019-08-01 16:10:05 +02:00
Yorick Peterse 916183a7fd
Add methods for injecting EE modules
This adds the methods prepend_if_ee, extend_if_ee, and include_if_ee
that can be used to inject EE specific modules in EE.

These methods are exposed as an initializer that is loaded as soon as
possible. For tests that use fast_spec_helper.rb we must load this
initializer manually, as the Rails environment is not loaded. This is
not the most pretty setup, but unfortunately there is no alternative
that we can use.
2019-07-30 14:52:54 +02:00