Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork ...

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +03:00

..

environments

Disable threadsafety

2013-07-08 18:24:02 +03:00

initializers

Default allow username or email login to false

2013-07-18 09:33:12 -04:00

locales

update devise gem

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

application.rb

Replace old hashes with new 1.9 ruby hashes (rebase)

2013-05-05 18:01:10 +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

cattr_accessor is not threadsafe!

2013-06-11 18:15:18 +03:00

database.yml.postgresql

cattr_accessor is not threadsafe!

2013-06-11 18:15:18 +03:00

environment.rb

Use similar interface to access gitolite

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

gitlab.yml.example

Allow the ldap logins with email or username

2013-07-18 09:33:12 -04:00

puma.rb.example

Merge branch 'master' into 6-0-dev

2013-07-08 09:50:10 +03:00

resque.yml.example

Allow connection to Redis via unix socket

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

routes.rb

Merge branch 'master' into karlhungus-mr-on-fork

2013-08-08 12:22:09 +03:00

unicorn.rb.example

Fix unicorn init and config

2013-07-08 19:28:59 +03:00