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

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

2015-03-02 16:10:12 -08:00

..

admin

Add help text feature

2015-02-26 18:52:35 -08:00

dashboard

Fix specs.

2015-02-13 14:43:31 +01: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-to-ee

2015-03-02 16:10:12 -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-to-ee

2015-03-02 16:10:12 -08:00

support

Fixed tests for spinach

2015-02-12 19:48:42 +01: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