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

..

active_tab.feature

Upcase missing feature names

2014-10-07 23:28:38 +02:00

appearance.feature

Custom header logo

2014-12-29 13:42:15 -06:00

applications.feature

Spinach for admin applications

2015-01-19 11:18:00 -08:00

broadcast_messages.feature

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

emails.feature

Fix admine email spec.

2015-01-09 16:19:23 +01:00

groups.feature

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

logs.feature

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

projects.feature

Fix project trasnfer for admin area

2014-06-19 13:20:42 +03:00

settings.feature

Add tests to home page url redirect

2015-01-16 16:09:20 -08:00

users.feature

Add feature spec for user ssh keys on admin page.

2014-12-29 18:40:25 +01:00