Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md

2014-02-11 10:15:13 +02:00

..

environments

GitLab app is not threadsafe so better disable allow_concurrency for production env

2013-12-10 12:11:28 +02:00

initializers

Change Devise.confirm_within to Devise.allow_unconfirmed_access_for

2014-02-03 21:20:36 -05:00

locales

update devise gem

2013-02-28 21:06:16 +02:00

application.rb

Fixed the I18n deprecation warning

2014-01-09 13:17:02 +01:00

aws.yml.example

Init aws support for file storage

2013-05-01 12:41:37 +03:00

boot.rb

init commit

2011-10-09 00:36:38 +03:00

database.yml.mysql

Change the mysql user to git from gitlab.

2013-11-29 16:46:38 +01:00

database.yml.postgresql

Use peer-based authentication for PostgreSQL

2013-10-02 08:07:36 +02:00

environment.rb

Use similar interface to access gitolite

2012-08-29 00:04:06 +03:00

gitlab.yml.example

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

resque.yml.example

Allow connection to Redis via unix socket

2013-03-06 22:06:12 +01:00

routes.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

unicorn.rb.example

Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

2013-12-09 13:22:22 +00:00