Skip to content

G
gitlab-ce
Commit 2fbc6e0b authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Make 'gitlab:assets:compile_webpack_if_needed' aware of JH context 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 31994428
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
lib/tasks/gitlab/assets.rake
View file @ 2fbc6e0b
...@@ -7,6 +7,7 @@ module Tasks ...@@ -7,6 +7,7 @@ module Tasks
module Assets module Assets
FOSS_ASSET_FOLDERS = %w[app/assets fixtures/emojis vendor/assets/javascripts].freeze FOSS_ASSET_FOLDERS = %w[app/assets fixtures/emojis vendor/assets/javascripts].freeze
EE_ASSET_FOLDERS = %w[ee/app/assets].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_PATTERNS = %w[*.js config/**/*.js].freeze
JS_ASSET_FILES = %w[package.json yarn.lock].freeze JS_ASSET_FILES = %w[package.json yarn.lock].freeze
MASTER_MD5_HASH_FILE = 'master-assets-hash.txt' MASTER_MD5_HASH_FILE = 'master-assets-hash.txt'
...@@ -28,6 +29,7 @@ module Tasks ...@@ -28,6 +29,7 @@ module Tasks
def self.assets_impacting_webpack_compilation def self.assets_impacting_webpack_compilation
assets_folders = FOSS_ASSET_FOLDERS assets_folders = FOSS_ASSET_FOLDERS
assets_folders += EE_ASSET_FOLDERS if ::Gitlab.ee? 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 = Dir.glob(JS_ASSET_PATTERNS)
asset_files += JS_ASSET_FILES asset_files += JS_ASSET_FILES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7