Download as
Browse Code »

Commit 6825af924a130a7e64d1b31ab050a91050526d2a

Authored by Jacob Vosmaer
1 parent 86a8c3b8
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Use Config.project_root 

The Omnibus.project_root method has been deprecated.
Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
config/projects/gitlab.rb
  Diff comments   View file @6825af9
@@ -35,7 +35,7 @@ dependency "git" @@ -35,7 +35,7 @@ dependency "git"
35 dependency "redis" 35 dependency "redis"
36 dependency "nginx" 36 dependency "nginx"
37 dependency "chef-gem" 37 dependency "chef-gem"
38 -if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") || system("#{Omnibus.project_root}/support/is_gitlab_com.sh") 38 +if system("#{Config.project_root}/support/is_gitlab_ee.sh") || system("#{Config.project_root}/support/is_gitlab_com.sh")
39 dependency "remote-syslog" 39 dependency "remote-syslog"
40 end 40 end
41 dependency "runit" 41 dependency "runit"
config/software/gitlab-cookbooks.rb
  Diff comments   View file @6825af9
@@ -22,7 +22,7 @@ dependency "rsync" @@ -22,7 +22,7 @@ dependency "rsync"
22 22
23 always_build true 23 always_build true
24 24
25 -source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root) 25 +source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
26 26
27 build do 27 build do
28 command "mkdir -p #{install_dir}/embedded/cookbooks" 28 command "mkdir -p #{install_dir}/embedded/cookbooks"
config/software/gitlab-ctl.rb
  Diff comments   View file @6825af9
@@ -21,7 +21,7 @@ name "gitlab-ctl" @@ -21,7 +21,7 @@ name "gitlab-ctl"
21 dependency "rsync" 21 dependency "rsync"
22 dependency "omnibus-ctl" 22 dependency "omnibus-ctl"
23 23
24 -source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root) 24 +source :path => File.expand_path("files/gitlab-ctl-commands", Config.project_root)
25 25
26 build do 26 build do
27 block do 27 block do
config/software/gitlab-rails.rb
  Diff comments   View file @6825af9
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 name "gitlab-rails" 19 name "gitlab-rails"
20 default_version "70ed6ef2a6894042c9bbd92f273542bca2a2374f" # 7.0.0.rc1 20 default_version "70ed6ef2a6894042c9bbd92f273542bca2a2374f" # 7.0.0.rc1
21 21
22 -EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") 22 +EE = system("#{Config.project_root}/support/is_gitlab_ee.sh")
23 23
24 dependency "ruby" 24 dependency "ruby"
25 dependency "bundler" 25 dependency "bundler"
@@ -62,7 +62,7 @@ build do @@ -62,7 +62,7 @@ build do
62 # database at this point so that is a problem. This bug is fixed in 62 # database at this point so that is a problem. This bug is fixed in
63 # acts-as-taggable-on 3.0.0 by 63 # acts-as-taggable-on 3.0.0 by
64 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e 64 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e
65 - aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" 65 + aato_patch = "#{Config.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
66 66
67 # To make this idempotent, we apply the patch (in case this is a first run) or 67 # To make this idempotent, we apply the patch (in case this is a first run) or
68 # we revert and re-apply the patch (if this is a second or later run). 68 # we revert and re-apply the patch (if this is a second or later run).