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

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

Conflicts:
	features/steps/project/project.rb

2015-06-12 14:01:20 +02:00

..

admin

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

2015-06-12 14:01:20 +02:00

dashboard

Call page.all instead of all in feature steps

2015-06-12 05:12:42 -04:00

explore

Call page.all instead of all in feature steps

2015-06-12 05:12:42 -04:00

profile

Change within to page.within in feature steps

2015-06-12 05:12:42 -04:00

project

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

2015-06-12 14:01:20 +02:00

shared

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

2015-06-12 14:01:20 +02:00

snippets

Change within to page.within in feature steps

2015-06-12 05:12:42 -04:00

group_hooks.rb

Fix spinach tests and some specs after merge CE into EE

2015-06-05 15:24:36 +02:00

groups_management.rb

Fix tests for EE after CE merge

2015-06-12 13:49:15 +02:00

groups.rb

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

2015-06-12 14:01:20 +02:00

invites.rb

Add spinach tests around accepting and declining invitations.

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

search.rb

Change within to page.within in feature steps

2015-06-12 05:12:42 -04:00

snippet_search.rb

Update all should-style syntax to expect in features

2015-06-12 05:12:09 -04:00

user.rb

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

2015-06-12 14:01:20 +02:00