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

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

gitlab

Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'

2015-06-04 14:46:24 +00: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