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

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

2015-03-25 09:16:09 -07:00

..

appearances

Improve GitLab EE appearance

2015-03-03 22:04:25 -08:00

application_settings

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

2015-03-18 10:33:31 -07:00

applications

Refactor buttons

2015-03-14 00:29:32 -07:00

background_jobs

Use Gitlab.config instead of Settings everywhere

2014-10-15 23:01:31 +02:00

broadcast_messages

Update help texts and default value setting

2015-03-24 12:27:26 -04:00

dashboard

Show total user count on dashboard page

2015-03-08 20:45:03 -07:00

emails

Create the admin email select box which queries through both projects and groups.

2015-01-09 13:13:10 +01:00

groups

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

2015-03-16 21:25:00 -07:00

hooks

Refactor buttons

2015-03-14 00:29:32 -07:00

keys

Share the key table between admin and profile resources.

2014-12-30 11:01:30 +01:00

logs

Dry admin logs.

2014-10-06 00:14:46 +02:00

projects

Move project members index from /team to /project_members

2015-03-15 13:51:11 +01:00

services

Include missing events and fix save functionality in admin service template settings form

2015-03-23 05:51:38 -07:00

users

Fix appeareance UI

2015-03-18 19:26:15 -07:00