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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -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 into ce-to-ee

2015-03-11 18:41:41 -07:00

applications

Use shorter map() syntax

2015-02-15 20:50:53 -07:00

background_jobs

Use Gitlab.config instead of Settings everywhere

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

broadcast_messages

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02: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-11 18:41:41 -07:00

hooks

Replace ui-box title with panel-heading

2014-05-29 18:43:21 +03: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

Small UI improvements after css refactoring

2015-03-07 10:35:17 -08:00

services

Merge branch 'emails-on-push'

2015-03-08 16:49:11 -07:00

users

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

2015-03-11 18:41:41 -07:00