summaryrefslogtreecommitdiff
path: root/pld.patch
diff options
context:
space:
mode:
authorElan Ruusamäe2017-11-23 20:58:40 (GMT)
committerElan Ruusamäe2017-11-24 22:45:51 (GMT)
commitfe0de9260b7e80cac11dc4db928f3bf272176f2a (patch)
tree6df755066527a8ebb9df0cf12fc5505f4e787b85 /pld.patch
parent43c8ba810b960d859e99e49877546151e2294808 (diff)
downloadgitlab-ce-fe0de9260b7e80cac11dc4db928f3bf272176f2a.zip
gitlab-ce-fe0de9260b7e80cac11dc4db928f3bf272176f2a.tar.gz
up to 10.2.1
Diffstat (limited to 'pld.patch')
-rw-r--r--pld.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/pld.patch b/pld.patch
index 8a1c616..ec6277b 100644
--- a/pld.patch
+++ b/pld.patch
@@ -84,8 +84,8 @@
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
---- gitlab-ce-9.2.0/config/database.yml.mysql~ 2017-05-22 20:39:58.000000000 +0300
-+++ gitlab-ce-9.2.0/config/database.yml.mysql 2017-05-22 20:40:45.379599276 +0300
+--- gitlab-ce-10.2.1/config/database.yml.mysql~ 2017-11-23 00:10:31.000000000 +0200
++++ gitlab-ce-10.2.1/config/database.yml.mysql 2017-11-24 21:39:43.813359449 +0200
@@ -8,8 +8,8 @@
reconnect: false
database: gitlabhq_production
@@ -94,7 +94,7 @@
- password: "secure password"
+ username: mysql
+ password: ~
- # host: localhost
+ host: localhost
# socket: /tmp/mysql.sock
--- gitlab-ce-10.1.2/bin/background_jobs~ 2017-11-08 11:49:53.000000000 +0200