Douwe MaanandYorick Peterse d0d3ae0f70 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' ...

# Conflicts:
#	app/services/system_note_service.rb

2016-05-21 12:33:55 -05:00

..

assets

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

controllers

Merge branch 'issue_9013' into 'master'

2016-05-21 12:27:57 -05:00

finders

Merge branch 'create-todo-on-failing-build' into 'master'

2016-05-19 21:18:22 +00:00

helpers

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

mailers

Syntax-highlight diffs in push emails

2016-05-17 13:23:17 +01:00

models

Merge branch 'issue-17537-fix' into 'master'

2016-05-21 12:28:34 -05:00

services

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

workers

Merge branch '17464-backport-email-syntax-highlighting' into 'master'

2016-05-19 21:12:53 +00:00