Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b0ba7c72
Commit
b0ba7c72
authored
Jul 29, 2019
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Override icons.svg asset path with sprockets asset
parent
7d68ac70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
app/assets/javascripts/lib/utils/icons_path.js
app/assets/javascripts/lib/utils/icons_path.js
+3
-0
config/webpack.config.js
config/webpack.config.js
+6
-0
No files found.
app/assets/javascripts/lib/utils/icons_path.js
0 → 100644
View file @
b0ba7c72
// any import of '@gitlab/svgs/dist/icons.svg' will be overridden with this
// to avoid asset duplication between sprockets and webpack
export
default
gon
&&
gon
.
sprite_icons
;
config/webpack.config.js
View file @
b0ba7c72
...
@@ -89,6 +89,12 @@ const alias = {
...
@@ -89,6 +89,12 @@ const alias = {
// the following resolves files which are different between CE and EE
// the following resolves files which are different between CE and EE
ee_else_ce
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
ee_else_ce
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
// override loader path for icons.svg so we do not duplicate this asset
'
@gitlab/svgs/dist/icons.svg
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts/lib/utils/icons_path.js
'
,
),
};
};
if
(
IS_EE
)
{
if
(
IS_EE
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment