Extract EE specific files/lines for .
We have the following files containing EE specific code. We should move them to ee/
Note: Updated 2019-08-27.
-
.gitattributes
- This is due to the
VERSION=ours
line, which can be removed after the merge.
- This is due to the
-
.gitlab-ci.yml
-
.gitlab/ci/rails.gitlab-ci.yml
-
.gitlab/ci/test-metadata.gitlab-ci.yml
-
.gitlab/issue_templates/Feature proposal.md
-
.license_encryption_key.pub
- Should we just always include this? It's fine for it to be unused.
-
.rubocop.yml
=> https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32287 / https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15693 -
CHANGELOG-EE.md
-
CHANGELOG.md
- We should always be using the CE version, but it's unclear why they differ to begin with. Possibly due to https://gitlab.com/gitlab-org/release-tools/issues/169.
-
CONTRIBUTING.md
- Might be legal ramifications here?
-
Gemfile
=> https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/16080 -
Gemfile.lock
=> https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/16080 -
PHILOSOPHY.md
=> https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32287 / https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15693 -
README.md
=> https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32287 / https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15693 -
crowdin.yml
- Doesn't need to exist in CE, it can just exist in the final merged codebase.
Edited by Robert Speicher