Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
1 file
+ 14
14
Compare changes
  • Side-by-side
  • Inline
+ 18
11
@@ -86,7 +86,7 @@ Then select 'Internet Site' and press enter to confirm the hostname.
@@ -86,7 +86,7 @@ Then select 'Internet Site' and press enter to confirm the hostname.
Remove the old Ruby 1.8 if present
Remove the old Ruby 1.8 if present
sudo apt-get remove -y ruby1.8
sudo apt-get remove ruby1.8
Download Ruby and compile it:
Download Ruby and compile it:
@@ -111,7 +111,7 @@ Create a `git` user for Gitlab:
@@ -111,7 +111,7 @@ Create a `git` user for Gitlab:
# 4. GitLab shell
# 4. GitLab shell
GitLab Shell is a ssh access and repository management software developed specially for GitLab.
GitLab Shell is an ssh access and repository management software developed specially for GitLab.
# Go to home directory
# Go to home directory
cd /home/git
cd /home/git
@@ -122,7 +122,7 @@ GitLab Shell is a ssh access and repository management software developed specia
@@ -122,7 +122,7 @@ GitLab Shell is a ssh access and repository management software developed specia
cd gitlab-shell
cd gitlab-shell
# switch to right version
# switch to right version
sudo -u git -H git checkout v1.7.0
sudo -u git -H git checkout v1.7.1
sudo -u git -H cp config.yml.example config.yml
sudo -u git -H cp config.yml.example config.yml
@@ -153,10 +153,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
@@ -153,10 +153,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
cd /home/git/gitlab
cd /home/git/gitlab
# Checkout to stable release
# Checkout to stable release
sudo -u git -H git checkout 6-0-stable
sudo -u git -H git checkout 6-1-stable
**Note:**
**Note:**
You can change `6-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
You can change `6-1-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
## Configure it
## Configure it
@@ -195,6 +195,13 @@ You can change `6-0-stable` to `master` if you want the *bleeding edge* version,
@@ -195,6 +195,13 @@ You can change `6-0-stable` to `master` if you want the *bleeding edge* version,
# Ex. change amount of workers to 3 for 2GB RAM server
# Ex. change amount of workers to 3 for 2GB RAM server
sudo -u git -H editor config/unicorn.rb
sudo -u git -H editor config/unicorn.rb
 
# Copy the example Rack attack config
 
sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
 
 
# Enable rack attack middleware
 
# Find and uncomment the line 'config.middleware.use Rack::Attack'
 
sudo -u git -H editor config/application.rb
 
# Configure Git global settings for git user, useful when editing via web
# Configure Git global settings for git user, useful when editing via web
# Edit user.email according to what is set in gitlab.yml
# Edit user.email according to what is set in gitlab.yml
sudo -u git -H git config --global user.name "GitLab"
sudo -u git -H git config --global user.name "GitLab"
@@ -209,18 +216,18 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
@@ -209,18 +216,18 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
# Mysql
# Mysql
sudo -u git cp config/database.yml.mysql config/database.yml
sudo -u git cp config/database.yml.mysql config/database.yml
or
# PostgreSQL
sudo -u git cp config/database.yml.postgresql config/database.yml
# Make sure to update username/password in config/database.yml.
# Make sure to update username/password in config/database.yml.
# You only need to adapt the production settings (first part).
# You only need to adapt the production settings (first part).
# If you followed the database guide then please do as follows:
# If you followed the database guide then please do as follows:
# Change 'root' to 'gitlab'
# Change 'secure password' with the value you have given to $password
# Change 'secure password' with the value you have given to $password
# You can keep the double quotes around the password
# You can keep the double quotes around the password
sudo -u git -H editor config/database.yml
sudo -u git -H editor config/database.yml
 
 
or
 
 
# PostgreSQL
 
sudo -u git cp config/database.yml.postgresql config/database.yml
 
# Make config/database.yml readable to git only
# Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml
sudo -u git -H chmod o-rwx config/database.yml
Loading