Commit 72b1af3a authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch '28618-fix-circular-dependency' into 'master'

Resolve "Circular dependency detected" (duplicate)

Closes #28618

See merge request !10113
parents a08c707c 2d46a572
...@@ -3,16 +3,16 @@ namespace :gitlab do ...@@ -3,16 +3,16 @@ namespace :gitlab do
desc 'GitLab | Assets | Compile all frontend assets' desc 'GitLab | Assets | Compile all frontend assets'
task compile: [ task compile: [
'yarn:check', 'yarn:check',
'assets:precompile', 'rake:assets:precompile',
'webpack:compile', 'webpack:compile',
'gitlab:assets:fix_urls' 'fix_urls'
] ]
desc 'GitLab | Assets | Clean up old compiled frontend assets' desc 'GitLab | Assets | Clean up old compiled frontend assets'
task clean: ['assets:clean'] task clean: ['rake:assets:clean']
desc 'GitLab | Assets | Remove all compiled frontend assets' desc 'GitLab | Assets | Remove all compiled frontend assets'
task purge: ['assets:clobber'] task purge: ['rake:assets:clobber']
desc 'GitLab | Assets | Uninstall frontend dependencies' desc 'GitLab | Assets | Uninstall frontend dependencies'
task purge_modules: ['yarn:clobber'] task purge_modules: ['yarn:clobber']
......
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