summaryrefslogtreecommitdiff
path: root/scripts/utils.sh
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 15:06:24 +0000
commit88542a5e9613c8442a982e65ad5cf13eb33bc541 (patch)
tree11a65d86e623b443b8a2976cc93cff360e2da8a2 /scripts/utils.sh
parentb570d73ecd31e2ca9cf8c2f1adb056edf2869477 (diff)
downloadgitlab-ce-88542a5e9613c8442a982e65ad5cf13eb33bc541.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/utils.sh')
-rw-r--r--scripts/utils.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/utils.sh b/scripts/utils.sh
index f0f08e2e1c5..83b7173e140 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -14,11 +14,7 @@ function retry() {
}
function setup_db_user_only() {
- if [ "$GITLAB_DATABASE" = "postgresql" ]; then
- source scripts/create_postgres_user.sh
- else
- source scripts/create_mysql_user.sh
- fi
+ source scripts/create_postgres_user.sh
}
function setup_db() {
@@ -26,10 +22,6 @@ function setup_db() {
bundle exec rake db:drop db:create db:schema:load db:migrate
- if [ "$GITLAB_DATABASE" = "mysql" ]; then
- bundle exec rake add_limits_mysql
- fi
-
bundle exec rake gitlab:db:setup_ee
}