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

..

admin

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

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

dashboard

Revert help link tests removal

2015-04-15 12:13:49 +03:00

explore

Fix spinach tests

2014-12-24 14:34:37 +02:00

profile

Move Profile groups tests to Dashboard group tests

2015-03-08 20:52:22 -07:00

project

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

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

snippets

Fix raw view for public snippets

2014-10-29 16:11:28 +02:00

steps

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

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

support

Don't use capybara-screenshot in CI environments

2015-04-25 21:33:17 -04:00

group_hooks.feature

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

groups_management.feature

Add feature spec for group membership locking.

2014-12-15 10:44:34 +01:00

groups.feature

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

2015-04-15 19:22:57 +03:00

invites.feature

Add spinach tests around accepting and declining invitations.

2015-04-14 18:04:29 +02:00

search.feature

Fixes the search test that fails whenever faker uses a name with Bar in it. Limit check to being within the search results div.

2014-12-08 16:44:06 -08:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00