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
2fbc6e0b
Commit
2fbc6e0b
authored
Sep 21, 2021
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make 'gitlab:assets:compile_webpack_if_needed' aware of JH context
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
31994428
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
lib/tasks/gitlab/assets.rake
lib/tasks/gitlab/assets.rake
+2
-0
No files found.
lib/tasks/gitlab/assets.rake
View file @
2fbc6e0b
...
...
@@ -7,6 +7,7 @@ module Tasks
module
Assets
FOSS_ASSET_FOLDERS
=
%w[app/assets fixtures/emojis vendor/assets/javascripts]
.
freeze
EE_ASSET_FOLDERS
=
%w[ee/app/assets]
.
freeze
JH_ASSET_FOLDERS
=
%w[jh/app/assets]
.
freeze
JS_ASSET_PATTERNS
=
%w[*.js config/**/*.js]
.
freeze
JS_ASSET_FILES
=
%w[package.json yarn.lock]
.
freeze
MASTER_MD5_HASH_FILE
=
'master-assets-hash.txt'
...
...
@@ -28,6 +29,7 @@ module Tasks
def
self
.
assets_impacting_webpack_compilation
assets_folders
=
FOSS_ASSET_FOLDERS
assets_folders
+=
EE_ASSET_FOLDERS
if
::
Gitlab
.
ee?
assets_folders
+=
JH_ASSET_FOLDERS
if
::
Gitlab
.
jh?
asset_files
=
Dir
.
glob
(
JS_ASSET_PATTERNS
)
asset_files
+=
JS_ASSET_FILES
...
...
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