Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master ...

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

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb

2014-12-05 13:28:32 +02:00

..

gitlab

Add rake task for google schema whitelisting.

2014-12-04 15:22:10 +01: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