From 95cb310e2713206ce651c10929abcfac2da1ffb5 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 26 Feb 2014 16:16:37 +0100 Subject: [PATCH] Avoid using 'patch' as a local variable name --- config/software/gitlab-rails.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index b5c4c2e..10b0899 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -57,10 +57,10 @@ build do # database at this point so that is a problem. This bug is fixed in # acts-as-taggable-on 3.0.0 by # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e - patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" + aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" # To make this idempotent, we apply the patch (in case this is a first run) or # we revert and re-apply the patch (if this is a second or later run). - command "git apply #{patch} || (git apply -R #{patch} && git apply #{patch})", + command "git apply #{aato_patch} || (git apply -R #{aato_patch} && git apply #{aato_patch})", :cwd => "#{install_dir}/embedded/service/gem/ruby/1.9.1/gems/acts-as-taggable-on-2.4.1" rake "assets:precompile", :env => {"RAILS_ENV" => "production"} # Tear down now that the assets:precompile is done. -- libgit2 0.21.2