Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb

2015-01-21 17:05:31 -08:00

..

gitlab

Merge branch 'master' into 'master'

2015-01-20 05:03:22 +00: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

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

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

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

test.rake

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00