diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 03:08:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 03:08:12 +0300 |
| commit | 6df03518361a3c3ba3c8f0ba9ba9af34a6de1ead (patch) | |
| tree | 3adf4b0d3b96b60dcf455cde7551550b927a53f1 /qa/Dockerfile | |
| parent | 9a4d2a38dc79330beb9f8ffb44d88a1b8f699d75 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 58612423103..cf992f19fdc 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -47,6 +47,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co # The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS) COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/ COPY ./config/bundler_setup.rb /home/gitlab/config/ +COPY ./config/feature_flags /home/gitlab/config/feature_flags COPY ./lib/gitlab_edition.rb /home/gitlab/lib/ COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/ COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ |