diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-12-11 14:17:11 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-12-11 14:17:11 +0100 |
| commit | 9b9c62202c205e453de9fcaade9a5f598df4ba50 (patch) | |
| tree | 393a4223ce2b712fcd4b00c976b9954a8a510ec1 /doc/development/ee_features.md | |
| parent | de7901ff59b9a4070b1355ecc2098b33e3674de9 (diff) | |
| parent | 95daf62bef31f28525cd044716d4b336decdd97a (diff) | |
| download | gitlab-ce-9b9c62202c205e453de9fcaade9a5f598df4ba50.tar.gz | |
Merge branch 'master' into qa/gb/selenium-handle-domain-sessions
* master: (93 commits)
Diffstat (limited to 'doc/development/ee_features.md')
| -rw-r--r-- | doc/development/ee_features.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 932a44f65e4..1af839a27e1 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -1,4 +1,4 @@ -# Guidelines for implementing Enterprise Edition feature +# Guidelines for implementing Enterprise Edition features - **Write the code and the tests.**: As with any code, EE features should have good test coverage to prevent regressions. @@ -380,3 +380,9 @@ to avoid conflicts during CE to EE merge. } } ``` + +## gitlab-svgs + +Conflicts in `app/assets/images/icons.json` or `app/assets/images/icons.svg` can +be resolved simply by regenerating those assets with +[`yarn run svg`](https://gitlab.com/gitlab-org/gitlab-svgs). |