Jan-Willem van der Meer 471054e1f5 Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master ...

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb

2014-10-15 08:19:13 +02:00

..

environments

Configure Redis cache for all environments

2014-08-26 13:44:39 +02:00

initializers

Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master

2014-10-15 08:19:13 +02:00

locales

Update to accomodate devise deprecations and backward incompatible changes.

2014-07-10 13:56:35 +02:00

application.rb

Remove I18n.enforce_available_locales deprecation message

2014-10-01 12:56:23 +03: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

teatro setup

2014-06-17 11:21:49 +03:00

gitlab.yml.example

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03: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 ee-7-4

2014-10-03 16:18:40 +03:00

unicorn.rb.example

Increase unicorn timeout to 60 seconds

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

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

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