delta/gitlab/gitlab-ce.git/app/views/notify, branch ide-gitattributes

Notify only when unmergeable due to conflict

2018-06-20T15:27:17+00:00

There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec

Remove EE-specific code from new MR email

2018-06-18T11:22:05+00:00

Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master'

2018-06-01T09:49:38+00:00

Resolve "Unmergeable merge request notification text interpolation"

Closes #46840

See merge request gitlab-org/gitlab-ce!19160

Fix merge request unmergeable notification email plural interpolation

2018-05-31T14:13:20+00:00

Merge branch 'master' into bootstrap4

2018-05-24T21:48:54+00:00

Merge branch 'mr-conflict-notification' into 'master'

2018-05-24T08:49:54+00:00

MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042

Plural reason(s)

2018-05-18T01:50:01+00:00

Merge branch 'master' into bootstrap4

2018-05-17T13:58:36+00:00

Resolve "Opening Project with invite but without accepting leads to 404 error page"

2018-05-17T09:19:47+00:00

Notify with email when merge request became unmergeable

2018-05-17T00:54:51+00:00

Display MR unmergeable reasons