Skip to content

G
gitlab-ce
Commit 9cde4f91 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in scripts/prepare_build.sh 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 5ae6ca4c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
scripts/prepare_build.sh
View file @ 9cde4f91
...@@ -27,12 +27,9 @@ fi ...@@ -27,12 +27,9 @@ fi
cp config/database.yml.$GITLAB_DATABASE config/database.yml cp config/database.yml.$GITLAB_DATABASE config/database.yml
<<<<<<< HEAD
# EE-only # EE-only
cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml
=======
>>>>>>> ce-com/master
# Set user to a non-superuser to ensure we test permissions # Set user to a non-superuser to ensure we test permissions
sed -i 's/username: root/username: gitlab/g' config/database.yml sed -i 's/username: root/username: gitlab/g' config/database.yml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7