gitlab-org--gitlab-foss/app/views/projects/diffs
Douwe Maan b0bde100f2 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 😛

![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
2016-11-29 04:11:15 +00:00
..
_content.html.haml Fix Error 500 when creating a merge request that contains an image that was deleted and added 2016-11-14 15:57:01 +01:00
_diffs.html.haml Unify anchor link format for MR diff files !7298 2016-11-15 20:51:21 +03:00
_file.html.haml Merge branch 'jej-22869' into 'security' 2016-11-28 21:25:18 -03:00
_file_header.html.haml Add width to caret to rid ourselves of the shift 2016-11-04 18:04:26 +06:00
_image.html.haml Represent DiffRefs as proper class instead of tuple array 2016-07-06 18:50:58 -04:00
_line.html.haml Don't use diff_line_content for emails 2016-11-28 19:40:48 +00:00
_parallel_view.html.haml Fix horizontal padding for highlight blocks 2016-10-25 16:06:10 -05:00
_stats.html.haml Unify anchor link format for MR diff files !7298 2016-11-15 20:51:21 +03:00
_text_file.html.haml Fix expansion of discussions in diff 2016-08-18 20:49:25 -05:00
_warning.html.haml Bump gitlab_git to speedup DiffCollection iterations 2016-07-29 13:22:22 +02:00