Dmitriy Zaporozhets 2bb4ea8542 Merge branch 'notes-count-without-system' into 'master' ...

Don't include system notes in issue/MR comment count.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163.

See merge request !430

2015-03-24 00:10:25 +00:00

..

assets

Merge branch 'improve-diff-header' into 'master'

2015-03-24 00:09:40 +00:00

controllers

Merge branch 'userpage-activity-scroll'

2015-03-23 09:45:40 -07:00

finders

Merge pull request #8092 from cirosantilli/factor-finder-perms

2015-03-02 15:24:59 -08:00

helpers

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-03-23 09:44:20 -07:00

mailers

Don't use required keyword arguments to maintain support for Ruby 2.0.

2015-03-23 21:20:48 +01:00

models

Merge branch 'notes-count-without-system' into 'master'

2015-03-24 00:10:25 +00:00

services

Extend push_tag event to include tag message and last commit

2015-03-21 11:25:27 +01:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'notes-count-without-system' into 'master'

2015-03-24 00:10:25 +00:00

workers

Merge branch 'emailsonpush-create-delete' into 'master'

2015-03-23 16:48:27 +00:00