Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' ...

Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb

2014-05-21 13:10:37 +02:00

..

appearances

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

background_jobs

Fix BackgroundJobs page

2014-03-13 10:39:41 +02:00

broadcast_messages

Fix unclear text in broadcast message view.

2014-04-25 15:31:30 -05:00

dashboard

Add monthly active users to the admin dashboard.

2014-04-15 10:23:37 +02:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

hooks

Improve alignment of labels in .well-list items

2014-03-28 13:22:43 +01:00

logs

scss: rename file_content to file-content etc

2013-07-13 09:52:47 +03:00

projects

Add sort dropdown for admin projects page

2014-05-02 17:02:57 +03:00

users

Fix admin user errors ui

2014-05-20 16:21:30 +03:00