diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-11-29 04:11:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-11-29 04:11:15 +0000 |
commit | b0bde100f2480d77a72bdbd777fb0ef2b8ff4024 (patch) | |
tree | 1ffe6fda6d12f3f33a02c65cb9c6443563b7190f /doc/development | |
parent | 3bf34face4cacf07ca973705c261369b1f596626 (diff) | |
parent | 87665170eccfc423fc3f7fe2cadd208d808a6847 (diff) | |
download | gitlab-ce-b0bde100f2480d77a72bdbd777fb0ef2b8ff4024.tar.gz |
Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' into 'master'
Add diff hunks to notification emails
Add diff hunks to notification emails. Continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5855 - thanks @hoopes!
This also fixes an issue where the + / - prefixes were missing from diffs in emails.
Screenshots (from my browser) of the HTML emails, along with text screenshots :stuck_out_tongue:
![image](/uploads/cb31400becf5149d40c8bb98a655aa93/image.png)
```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1023
> Finished
This is a comment at the top of a match section.
```
![image](/uploads/704dd3845797530697a27f5c1953c053/image.png)
```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1022
> Finished
> %span.badge.js-running-count= @all_builds.finished.count(:id)
>
> - %li{class: ('active' if @scope == 'all')}
> - = link_to admin_builds_path(scope: :all) do
> - All
> - %span.badge.js-totalbuilds-count= @all_builds.count(:id)
> -
> .gray-content-block
> #{(@scope || 'running').capitalize} builds
>
This is a comment at the bottom of a match section.
```
![image](/uploads/4063f3d9738aea8ebf3c0e690d0eddee/image.png)
```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1024
> = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
>
> %ul.center-top-menu
> - %li{class: ('active' if @scope.nil?)}
> + %li{class: ('active' if @scope == 'all')}
> = link_to admin_builds_path do
> + All
This is a comment with some deleted and added lines above it.
```
Closes #21027, closes #24340.
See merge request !7660
Diffstat (limited to 'doc/development')
0 files changed, 0 insertions, 0 deletions