Timm Drevensek ea82bcd396 Merge branch 'master' into request/relative_submodules ...

Conflicts:
	CHANGELOG

2014-03-26 20:07:11 +01:00

..

assets

Reduce comments font size for events feed

2014-03-26 11:13:06 +02:00

controllers

Merge branch 'improve_at_mentions' into 'master'

2014-03-26 07:49:18 +00:00

finders

Fix deprecation warning output

2014-03-24 15:00:01 +02:00

helpers

Merge branch 'master' into request/relative_submodules

2014-03-26 20:07:11 +01:00

mailers

Fix the merge notification email not being sent

2014-03-24 15:11:35 +01:00

models

Changed the notification sender username to GitLab in Slack Notifier

2014-03-26 10:58:51 +01:00

observers

Fix MR observer

2014-03-25 15:16:12 +02:00

services

Use EventCreateService for notes, merge requests

2014-03-25 15:08:25 +02:00

uploaders

Expire event cache on avatar creation/removal

2013-12-11 09:30:22 -06:00

views

Include commits.

2014-03-25 18:53:09 +01:00

workers

Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout

2014-03-14 12:00:21 +02:00