Download as
Browse Code »

Commit a3945744438447eb2ec9bea943f7efb2b695753a

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

Sync from project_dir, not from .

Showing 4 changed files with 4 additions and 4 deletions   Show diff stats
config/software/gitlab-cookbooks.rb
  Diff comments   View file @a394574
@@ -24,5 +24,5 @@ source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root) @@ -24,5 +24,5 @@ source :path => File.expand_path("files/gitlab-cookbooks", Config.project_root)
24 24
25 build do 25 build do
26 command "mkdir -p #{install_dir}/embedded/cookbooks" 26 command "mkdir -p #{install_dir}/embedded/cookbooks"
27 - sync ".", "#{install_dir}/embedded/cookbooks/" 27 + sync project_dir, "#{install_dir}/embedded/cookbooks/"
28 end 28 end
config/software/gitlab-ctl.rb
  Diff comments   View file @a394574
@@ -64,5 +64,5 @@ done @@ -64,5 +64,5 @@ done
64 command "chmod 755 #{install_dir}/bin/gitlab-ctl" 64 command "chmod 755 #{install_dir}/bin/gitlab-ctl"
65 65
66 # additional omnibus-ctl commands 66 # additional omnibus-ctl commands
67 - sync ".", "#{install_dir}/embedded/service/omnibus-ctl/" 67 + sync project_dir, "#{install_dir}/embedded/service/omnibus-ctl/"
68 end 68 end
config/software/gitlab-rails.rb
  Diff comments   View file @a394574
@@ -87,7 +87,7 @@ build do @@ -87,7 +87,7 @@ build do
87 command "cp db/schema.rb db/schema.rb.bundled" 87 command "cp db/schema.rb db/schema.rb.bundled"
88 88
89 command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" 89 command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
90 - sync ".", "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore} 90 + sync project_dir, "#{install_dir}/embedded/service/gitlab-rails/", exclude: %w{.git .gitignore}
91 91
92 # Create a wrapper for the rake tasks of the Rails app 92 # Create a wrapper for the rake tasks of the Rails app
93 erb :dest => "#{install_dir}/bin/gitlab-rake", 93 erb :dest => "#{install_dir}/bin/gitlab-rake",
config/software/gitlab-shell.rb
  Diff comments   View file @a394574
@@ -25,7 +25,7 @@ source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git" @@ -25,7 +25,7 @@ source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
25 25
26 build do 26 build do
27 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell" 27 command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
28 - sync ".", "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore} 28 + sync project_dir, "#{install_dir}/embedded/service/gitlab-shell/", exclude: %{.git .gitignore}
29 block do 29 block do
30 env_shebang = "#!/usr/bin/env ruby" 30 env_shebang = "#!/usr/bin/env ruby"
31 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script| 31 `grep -r -l '^#{env_shebang}' #{project_dir}`.split("\n").each do |ruby_script|