diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
| commit | 639bca436297e65f16499c5b76a9e5ffb2b798c8 (patch) | |
| tree | 832636f41824529da2796dedc7888effd42940c9 /lib/tasks | |
| parent | bdcb81be95b3287e14cf23b2f1d0849b24077360 (diff) | |
| parent | 4b43126d08972c201551fbd1fe42e85847d5e03f (diff) | |
| download | gitlab-ce-639bca436297e65f16499c5b76a9e5ffb2b798c8.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/git.rake | 8 | ||||
| -rw-r--r-- | lib/tasks/gitlab/update_templates.rake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/tasks/gitlab/git.rake b/lib/tasks/gitlab/git.rake index f9834a4dae8..a67c1fe1f27 100644 --- a/lib/tasks/gitlab/git.rake +++ b/lib/tasks/gitlab/git.rake @@ -3,7 +3,7 @@ namespace :gitlab do desc "GitLab | Git | Repack" task repack: :environment do - failures = perform_git_cmd(%W(git repack -a --quiet), "Repacking repo") + failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} repack -a --quiet), "Repacking repo") if failures.empty? puts "Done".color(:green) else @@ -13,17 +13,17 @@ namespace :gitlab do desc "GitLab | Git | Run garbage collection on all repos" task gc: :environment do - failures = perform_git_cmd(%W(git gc --auto --quiet), "Garbage Collecting") + failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} gc --auto --quiet), "Garbage Collecting") if failures.empty? puts "Done".color(:green) else output_failures(failures) end end - + desc "GitLab | Git | Prune all repos" task prune: :environment do - failures = perform_git_cmd(%W(git prune), "Git Prune") + failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} prune), "Git Prune") if failures.empty? puts "Done".color(:green) else diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake index 4f76dad7286..b77a5bb62d1 100644 --- a/lib/tasks/gitlab/update_templates.rake +++ b/lib/tasks/gitlab/update_templates.rake @@ -44,7 +44,7 @@ namespace :gitlab do ), Template.new( "https://gitlab.com/gitlab-org/gitlab-ci-yml.git", - /(\.{1,2}|LICENSE|Pages|\.gitlab-ci.yml)\z/ + /(\.{1,2}|LICENSE|Pages|autodeploy|\.gitlab-ci.yml)\z/ ) ] |