Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02:00

..

gitlab

Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task

2014-11-12 13:40:36 +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