Commit 9bbbc61d authored by Marin Jankovski's avatar Marin Jankovski

Prepare for 0.7.1.

parent 192e19ad
......@@ -26,7 +26,7 @@ GRAPH
mysql-chef_gem (>= 0.0.0)
postgresql (>= 1.0.0)
xfs (>= 0.0.0)
gitlab (0.7.0)
gitlab (0.7.1)
apt (>= 0.0.0)
database (>= 0.0.0)
magic_shell (>= 0.0.0)
......
......@@ -3,7 +3,7 @@ GitLab Cookbook
Chef cookbook with recipes to install GitLab and its dependencies:
* GitLab: 7.0
* GitLab: 7.0.1
* GitLab Shell: 1.9.6
* Ruby: 2.1.2
* Redis: 2.6.13
......
......@@ -54,7 +54,7 @@ if node['gitlab']['env'] == "development"
default['gitlab']['shell_revision'] = "master"
else
default['gitlab']['environments'] = %w{production}
default['gitlab']['revision'] = "7-0-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['revision'] = "7-1-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['url'] = "http://localhost:80/"
default['gitlab']['port'] = "80"
default['gitlab']['ssh_port'] = "22"
......
......@@ -15,7 +15,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-0-stable',
revision: '7-1-stable',
user: 'git',
group: 'git'
)
......@@ -49,7 +49,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-0-stable',
revision: '7-1-stable',
user: 'git',
group: 'git'
)
......@@ -69,7 +69,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-0-stable',
revision: '7-1-stable',
user: 'git',
group: 'git'
)
......@@ -103,7 +103,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-0-stable',
revision: '7-1-stable',
user: 'git',
group: 'git'
)
......
......@@ -35,9 +35,6 @@ production: &base
# Email address used in the "From" field in mails sent by GitLab
email_from: <%= @email_from %>
# Email address of your support contact (default: same as email_from)
support_email: <%= @support_email %>
## User settings
default_projects_limit: <%= @projects_limit %>
# default_can_create_group: false # default: true
......
......@@ -34,6 +34,20 @@ listen "<%= @app_root %>/tmp/sockets/gitlab.socket", :backlog => 64
listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)
#
# NOTICE: git push over http depends on this value.
# If you want be able to push huge amount of data to git repository over http
# you will have to increase this value too.
#
# Example of output if you try to push 1GB repo to GitLab over http.
# -> git push http://gitlab.... master
#
# error: RPC failed; result=18, HTTP code = 200
# fatal: The remote end hung up unexpectedly
# fatal: The remote end hung up unexpectedly
#
# For more information see http://stackoverflow.com/a/21682112/752049
#
timeout <%= @unicorn_timeout %>
# feel free to point this anywhere accessible on the filesystem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment