From c8db6641a79656c3cd2dec0946d65d8353d5a390 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 17 Mar 2014 18:02:12 +0100 Subject: [PATCH] Move mysql-client dependency to gitlab-rails --- config/projects/gitlab.rb | 1 - config/software/gitlab-rails.rb | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/projects/gitlab.rb b/config/projects/gitlab.rb index 4efce96..f6f4766 100644 --- a/config/projects/gitlab.rb +++ b/config/projects/gitlab.rb @@ -30,7 +30,6 @@ dependency "preparation" dependency "git" dependency "postgresql" -dependency "mysql-client" if system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") dependency "redis" dependency "nginx" dependency "gitlab-shell" diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index d2c5337..5b34885 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -19,6 +19,8 @@ name "gitlab-rails" default_version "master" +EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh") + dependency "ruby" dependency "bundler" dependency "libxml2" @@ -27,6 +29,7 @@ dependency "curl" dependency "rsync" dependency "libicu" dependency "postgresql" +dependency "mysql-client" if EE source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" -- libgit2 0.21.2