diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-14 12:32:12 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-14 12:32:12 +0300 |
| commit | 58bd04ab75d99fa9be0d9568c442704d400e8b1d (patch) | |
| tree | 053ab0e042f25ef7abe05941a93f917e6300b246 | |
| parent | 126e7301a802973a17e0bb8046c3299305231cff (diff) | |
| parent | 8fdd459c20fbd5010ff014450cef5d2d86bd4886 (diff) | |
Merge branch 'limit_ee_conflicts-gitlab-svgs' into 'master'
Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution.
See merge request gitlab-org/gitlab-ce!15361
| -rw-r--r-- | doc/development/limit_ee_conflicts.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/development/limit_ee_conflicts.md b/doc/development/limit_ee_conflicts.md index 899be9eae4b..ba82babb38a 100644 --- a/doc/development/limit_ee_conflicts.md +++ b/doc/development/limit_ee_conflicts.md @@ -336,6 +336,12 @@ Blocks of code that are EE-specific should be moved to partials as much as possible to avoid conflicts with big chunks of HAML code that that are not fun to resolve when you add the indentation in the equation. +### Assets + +#### 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). + --- [Return to Development documentation](README.md) |