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

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

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb

2015-04-27 11:53:31 +03:00

..

gitlab

fix redis 3.0.0

2015-04-25 21:46:10 +08:00

migrate

fix LDAP migrator to new_syntax

2015-03-26 15:39:58 +02:00

.gitkeep

init commit

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

brakeman.rake

Dont exit from brakeman rake task

2015-03-19 08:37:21 -07:00

cache.rake

Patch rake cache:clear for large amounts of keys

2014-06-20 13:58:57 +02:00

dev.rake

Improve developer seeds

2014-03-15 11:39:35 +02:00

rubocop.rake

Dont load rubocop in prod env

2015-02-03 19:25:57 -08:00

setup.rake

Add rake setup alias for gitlab:setup

2014-04-24 19:53:00 +02:00

sidekiq.rake

Move from script to bin directory.

2014-05-27 17:14:41 +02:00

spec.rake

Fix syntax error

2014-05-27 08:12:03 +03:00

spinach.rake

Fix semaphore spinach tags

2015-01-29 23:28:38 -08:00

test.rake

Add brakeman and jasmine

2015-03-02 18:22:37 -08:00