Commit c8db6641a79656c3cd2dec0946d65d8353d5a390
1 parent
d2b5320f
Exists in
master
and in
13 other branches
Move mysql-client dependency to gitlab-rails
Showing
2 changed files
with
3 additions
and
1 deletions
Show diff stats
config/projects/gitlab.rb
@@ -30,7 +30,6 @@ dependency "preparation" | @@ -30,7 +30,6 @@ dependency "preparation" | ||
30 | 30 | ||
31 | dependency "git" | 31 | dependency "git" |
32 | dependency "postgresql" | 32 | dependency "postgresql" |
33 | -dependency "mysql-client" if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") | ||
34 | dependency "redis" | 33 | dependency "redis" |
35 | dependency "nginx" | 34 | dependency "nginx" |
36 | dependency "gitlab-shell" | 35 | dependency "gitlab-shell" |
config/software/gitlab-rails.rb
@@ -19,6 +19,8 @@ | @@ -19,6 +19,8 @@ | ||
19 | name "gitlab-rails" | 19 | name "gitlab-rails" |
20 | default_version "master" | 20 | default_version "master" |
21 | 21 | ||
22 | +EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") | ||
23 | + | ||
22 | dependency "ruby" | 24 | dependency "ruby" |
23 | dependency "bundler" | 25 | dependency "bundler" |
24 | dependency "libxml2" | 26 | dependency "libxml2" |
@@ -27,6 +29,7 @@ dependency "curl" | @@ -27,6 +29,7 @@ dependency "curl" | ||
27 | dependency "rsync" | 29 | dependency "rsync" |
28 | dependency "libicu" | 30 | dependency "libicu" |
29 | dependency "postgresql" | 31 | dependency "postgresql" |
32 | +dependency "mysql-client" if EE | ||
30 | 33 | ||
31 | source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" | 34 | source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" |
32 | 35 |