diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/database.yml.mysql | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 2 | ||||
| -rw-r--r-- | doc/install/databases.md | 6 |
6 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index bb85d20985d..acb37e80532 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 6.4.0 - Fixed another 500 error with submodules - UI: More compact issues page - Minimal password length increased to 8 symbols + - Side-by-side diff view (Steven Thonus) - Internal projects (Jason Hollingsworth) v 6.3.0 diff --git a/config/application.rb b/config/application.rb index 0dd632d04bb..c46ff289cf8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,7 +70,7 @@ module Gitlab config.assets.version = '1.0' # Uncomment and customize the last line to run in a non-root path - # WARNING: We recommend creating a FQDN to host GitLab in a root path. + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab diff --git a/config/database.yml.mysql b/config/database.yml.mysql index e7a9227e41e..55ac088bc1d 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -7,7 +7,7 @@ production: reconnect: false database: gitlabhq_production pool: 10 - username: gitlab + username: git password: "secure password" # host: localhost # socket: /tmp/mysql.sock diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0688fafafe2..f37381519b3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -20,7 +20,7 @@ production: &base https: false # Uncomment and customize the last line to run in a non-root path - # We recommend creating a FQDN to host GitLab in a root path. + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 445de22be08..70dc0cb842a 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -9,7 +9,7 @@ # documentation. # Uncomment and customize the last line to run in a non-root path -# We recommend creating a FQDN to host GitLab in a root path. +# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab diff --git a/doc/install/databases.md b/doc/install/databases.md index be7bc0aad2e..6016e97ede5 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -25,19 +25,19 @@ GitLab supports the following databases: # Create a user for GitLab # do not type the 'mysql>', this is part of the prompt # change $password in the command below to a real password you pick - mysql> CREATE USER 'gitlab'@'localhost' IDENTIFIED BY '$password'; + mysql> CREATE USER 'git'@'localhost' IDENTIFIED BY '$password'; # Create the GitLab production database mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; # Grant the GitLab user necessary permissions on the table. - mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'gitlab'@'localhost'; + mysql> GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'git'@'localhost'; # Quit the database session mysql> \q # Try connecting to the new database with the new user - sudo -u git -H mysql -u gitlab -p -D gitlabhq_production + sudo -u git -H mysql -u git -p -D gitlabhq_production # Type the password you replaced $password with earlier |