Download as
Browse Code »

Commit 95cb310e2713206ce651c10929abcfac2da1ffb5

Authored by Jacob Vosmaer
1 parent 4bd6f027
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Avoid using 'patch' as a local variable name 

The omnibus-ruby DSL has a method named 'patch'. This makes it a bad
idea to define a variable named 'patch' in a software definition that
uses the DSL.
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
config/software/gitlab-rails.rb
  Diff comments   View file @95cb310
@@ -57,10 +57,10 @@ build do @@ -57,10 +57,10 @@ build do
57 # database at this point so that is a problem. This bug is fixed in 57 # database at this point so that is a problem. This bug is fixed in
58 # acts-as-taggable-on 3.0.0 by 58 # acts-as-taggable-on 3.0.0 by
59 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e 59 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e
60 - patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" 60 + aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
61 # To make this idempotent, we apply the patch (in case this is a first run) or 61 # To make this idempotent, we apply the patch (in case this is a first run) or
62 # we revert and re-apply the patch (if this is a second or later run). 62 # we revert and re-apply the patch (if this is a second or later run).
63 - command "git apply #{patch} || (git apply -R #{patch} && git apply #{patch})", 63 + command "git apply #{aato_patch} || (git apply -R #{aato_patch} && git apply #{aato_patch})",
64 :cwd => "#{install_dir}/embedded/service/gem/ruby/1.9.1/gems/acts-as-taggable-on-2.4.1" 64 :cwd => "#{install_dir}/embedded/service/gem/ruby/1.9.1/gems/acts-as-taggable-on-2.4.1"
65 rake "assets:precompile", :env => {"RAILS_ENV" => "production"} 65 rake "assets:precompile", :env => {"RAILS_ENV" => "production"}
66 # Tear down now that the assets:precompile is done. 66 # Tear down now that the assets:precompile is done.