diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-21 14:40:35 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-21 23:35:19 +0800 |
| commit | 37a004f4d9772301b063bcff6d9fd70f63b9f447 (patch) | |
| tree | e9b125147ba6d6034d5d6a26e6fd787638dbd9d9 | |
| parent | 6be1afbb9f74d00ef2dbc84e05823d5b8e4ca007 (diff) | |
| download | gitlab-ce-37a004f4d9772301b063bcff6d9fd70f63b9f447.tar.gz | |
Merge branch '28618-fix-circular-dependency' into 'master'
Resolve "Circular dependency detected" (duplicate)
Closes #28618
See merge request !10113
| -rw-r--r-- | lib/tasks/gitlab/assets.rake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake index 098f9851b45..003d57adbbd 100644 --- a/lib/tasks/gitlab/assets.rake +++ b/lib/tasks/gitlab/assets.rake @@ -3,16 +3,16 @@ namespace :gitlab do desc 'GitLab | Assets | Compile all frontend assets' task compile: [ 'yarn:check', - 'assets:precompile', + 'rake:assets:precompile', 'webpack:compile', - 'gitlab:assets:fix_urls' + 'fix_urls' ] 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' - task purge: ['assets:clobber'] + task purge: ['rake:assets:clobber'] desc 'GitLab | Assets | Uninstall frontend dependencies' task purge_modules: ['yarn:clobber'] |