Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb

2015-01-21 17:05:31 -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

2015-01-21 17:05:31 -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

2015-01-21 17:05:31 -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

Save search options when switch between filter

2014-08-27 11:55:42 +03: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