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

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

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb

2015-04-27 11:53:31 +03:00

..

active_tab.feature

Upcase missing feature names

2014-10-07 23:28:38 +02:00

appearance.feature

Custom header logo

2014-12-29 13:42:15 -06:00

applications.feature

Spinach for admin applications

2015-01-19 11:18:00 -08:00

broadcast_messages.feature

Splitted the Spinach tests to prevent time-outs

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

deploy_keys.feature

Add admin deploy keys tests.

2015-04-03 12:51:01 +02:00

emails.feature

Fix admine email spec.

2015-01-09 16:19:23 +01:00

git_hooks.feature

git hook sample: tests

2015-03-26 13:38:26 +02:00

groups.feature

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

logs.feature

Splitted the Spinach tests to prevent time-outs

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

projects.feature

Fix project trasnfer for admin area

2014-06-19 13:20:42 +03:00

settings.feature

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

2015-04-27 11:53:31 +03:00

users.feature

Add feature spec for user ssh keys on admin page.

2014-12-29 18:40:25 +01:00