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.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

appearance.rb

Custom header logo

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

applications.rb

Spinach for admin applications

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

broadcast_messages.rb

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

email.rb

Fix admine email spec.

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

groups.rb

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

logs.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

projects.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

settings.rb

Add tests to home page url redirect

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

users.rb

Add feature spec for user ssh keys on admin page.

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