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

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

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md

2015-06-12 11:16:28 +02:00

..

gitlab

An in_namespace scope is already present

2015-06-09 13:42:01 +02: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

Merge branch 'brakeman-level'

2015-05-12 13:21:11 +03:00

cache.rake

Patch rake cache:clear for large amounts of keys

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

dev.rake

Add a rake task to automatically restart foreman when changes occur

2015-04-27 21:32:41 +02:00

jasmine.rake

Update jasmine:ci task to use teaspoon

2015-05-28 18:22:33 -04: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