Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md

2015-06-08 18:24:34 +02:00

..

environments

Merge pull request #8349 from divineforest/cleanup-assets-compress

2015-03-02 15:23:57 -08:00

initializers

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

2015-06-08 18:24:34 +02:00

locales

Improve OAuth application flash messages.

2015-05-13 09:41:56 +02:00

application.rb

Add otp_attempt to filtered parameters

2015-05-09 17:32:49 -04: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

set the collation to utf8_general_ci

2014-08-13 14:45:23 +01:00

database.yml.postgresql

Remove 'socket' example PostgreSQL parameter

2014-07-01 18:27:50 +02:00

environment.rb

Use similar interface to access gitolite

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

gitlab.teatro.yml

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

gitlab.yml.example

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

2015-06-08 18:24:34 +02:00

newrelic.yml

Add dormant New Relic gem

2014-09-16 17:31:20 +02:00

resque.yml.example

Use sockets to connect to Redis

2014-09-12 14:59:58 +02:00

routes.rb

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

2015-06-05 11:40:36 +02:00

unicorn.rb.example

Revert "Increase timeout for Git-over-HTTP requests."

2015-03-19 18:29:20 -07:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00