Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-files

* master: (69 commits)
  Calculating repository checksums executed by Gitaly
  Resolve "Expand API: Render an arbitrary Markdown document"
  Update EE > CE downgrade service removal steps
  Make stores export a createStore() which can be used in tests
  Simplify pattern lexeme fabrication and matcher
  Simplify untrusted regexp factory method
  Fix api_json.log not always reporting the right HTTP status code
  Move group lists css from framework/lists.scss to pages/groups.scss
  Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"
  Add Keyboard shortcuts for "Kubernetes" and "Environments"
  Move API group deletion to Sidekiq
  fix typos. add a reference to deliverable and stretch for design artifact
  fix / assigne username wrapping problem has been fixed
  Memoize Gitlab::Database.version
  Conditionally add Gitaly deprecation warnings based on ENV variable
  Bring CE-EE parity to app/services/milestones/base_service.rb
  Bring CE-EE parity to app/services/lfs/unlock_file_service.rb
  Fixes 500 error on /estimate BIG_VALUE
  Fix: Use case in-sensitive ordering by name for groups
  Fix group lists visual
  ...

1 files changed, 18 insertions, 0 deletions

diff --git a/scripts/utils.sh b/scripts/utils.sh
index 6faa701f0ce..2d2ba115563 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -12,3 +12,21 @@ retry() {
     done
     return 1
 }
+
+setup_db_user_only() {
+    if [ "$GITLAB_DATABASE" = "postgresql" ]; then
+        . scripts/create_postgres_user.sh
+    else
+        . scripts/create_mysql_user.sh
+    fi
+}
+
+setup_db() {
+    setup_db_user_only
+
+    bundle exec rake db:drop db:create db:schema:load db:migrate
+
+    if [ "$GITLAB_DATABASE" = "mysql" ]; then
+        bundle exec rake add_limits_mysql
+    fi
+}