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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

gitlab

Add active users to gitlab:check

2015-03-10 12:03:04 -07:00

migrate

Migrate LDAP users as well

2014-10-16 10:45:46 +02:00

.gitkeep

init commit

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

brakeman.rake

Add brakeman rake task and improve code security

2015-03-02 18:11:50 -08: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