archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove trailing whitespace in patch for assets:compile

Browse Source 
to suppress warning on build like below:

    Applying patch /etc/docker-gitlab/build/patches/0004-fix-raketask-gitlab-assets-compile.patch for gitlab-foss...
    <stdin>:15: trailing whitespace.
           removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
    warning: 1 line adds whitespace errors.
This commit is contained in:
Kazunori Kimura 2024-01-26 15:42:54 +09:00
parent 3e5f76f99e
commit bebcc05073
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
View File

@ -12,7 +12,7 @@ index b8a6e7018767..5096d81ea63f 100644
+ # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually
+ removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js')
+ if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
+ end
+ FileUtils.rm_rf(removal_targets, secure: true)