diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-07-11 11:05:02 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-11 15:45:14 +0100 |
| commit | 881ec08ff9192780ed9208de237116b4d265eac7 (patch) | |
| tree | 2ebdb7455c1147f76fb4a8db7732efaf40a940dc | |
| parent | 5c3a80896829a6889ee05eaa2ae160fe254f0eca (diff) | |
| download | gitlab-ce-881ec08ff9192780ed9208de237116b4d265eac7.tar.gz | |
Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'
Disabled prepared statements in test
See merge request !12773
| -rw-r--r-- | config/database.yml.mysql | 1 | ||||
| -rw-r--r-- | config/database.yml.postgresql | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/database.yml.mysql b/config/database.yml.mysql index db1b712d3bc..eb71d3f5fe1 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -42,3 +42,4 @@ test: &test password: # host: localhost # socket: /tmp/mysql.sock + prepared_statements: false diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql index c517a4c0cb8..4b30982fe82 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -46,3 +46,4 @@ test: &test username: postgres password: # host: localhost + prepared_statements: false |