delta/gitlab/gitlab-ce.git/app/views/notify, branch koding-setting-api

Improve performance of MR show page

2016-08-19T00:08:59+00:00

Merge branch 'master' into diff-line-comment-vuejs

2016-08-18T21:43:26+00:00

# Conflicts:
#	db/schema.rb

Merge branch 'outlook-email-spacing' into 'master'

2016-08-18T18:15:24+00:00


Fix email line-height in Outlook

On Outlook.com:

![image](/uploads/4bfa8daacce39a640428dff6eec0c098/image.png)

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19060.

See merge request !5843

Merge branch 'master' into diff-line-comment-vuejs

2016-08-18T15:21:40+00:00

Fix email line-height in Outlook

2016-08-17T14:55:34+00:00

Outlook seems to handle `white-space: pre` weirdly, so just use `pre`
elements (but only for emails!).

Include the reason for emailing in the new_mention emails

2016-08-16T13:12:05+00:00

Add notifications for new user mentions in merge requests

2016-08-15T13:47:16+00:00

Merge branch 'master' into diff-line-comment-vuejs

2016-08-12T22:23:19+00:00

Send notification emails when users are newly mentioned in issue edits

2016-08-12T21:54:32+00:00

Add description to text/plain emails

2016-08-04T12:29:47+00:00

Added to
* new_issue_email
* new_merge_request_email