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

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

admin

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

2015-01-21 17:05:31 -08:00

dashboard

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

explore

Fix spinach tests

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

profile

Remove password strength indicator

2015-01-15 14:10:13 +01:00

project

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

2015-02-04 18:19:22 -08: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-into-ee

2015-02-04 18:19:22 -08:00

support

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00

groups_management.feature

Add feature spec for group membership locking.

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

groups.feature

Disable ldap after test

2014-12-11 17:24:10 +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

Add admin notification unsubscribe feature

2014-08-22 10:45:45 +02:00