Commit graph

23 commits

Author SHA1 Message Date
Douwe Maan
f6f6aaf593
Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
hhoopes
a761c59a6b Add keyword arguments to truncated_diff method
* Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text)
* Tweaked templates for consistency and format appropriateness
2016-11-25 15:23:49 +00:00
hhoopes
f928dba99b Change diff highlight/truncate for reusability
Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`.

Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff lines.
2016-11-25 15:23:49 +00:00
hhoopes
24070bac45 Add new template to handle both commit & mr notes
Currently comments on commits and merge requests do not require merge request- or commit-specific information, but can use the same template. Rather than change the method which calls the template, I opted to keep the templates separate and create a new template to highlight their identicality, while preserving the option to distinguish them from each other in the future.

Also removed some of the inconsistencies between text and html email versions.

Still needed is a text-only version of git diffs and testing.
2016-11-25 15:23:49 +00:00
hhoopes
38ed96e9b1 Add diff hunks to notification emails on MR
Added diff hunks to notification emails of messages on merge requests. This
provides code context to the note. Uses existing template for formatting
a diff for email (from repository push notifications).
2016-11-25 15:23:49 +00:00
Douwe Maan
c5555c8a84 Don't fail when a LegacyDiffNote didn't store the right diff 2016-07-15 17:32:49 -05:00
Douwe Maan
375193455a Style diff and blob file headers the same way 2016-07-06 18:50:59 -04:00
Douwe Maan
7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan
99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Pierre de La Morinerie
ad278c4e74 Make the merge request notification emails more readable
Emphasize the meaningful informations, and remove the less needed ones:

* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie
306744bbb0 Simplify the default layout of notification emails
* Less margin: the content appears as the text of the message.

* Streamlined footer: everything on one line, with a small separator.

* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie
edd6028bdb Remove custom link to target in notification emails
Every email has a different way of showing a link to the discussion on
the website. We don't need this anymore, as we now have a standard
"View in GitLab" link in the footer of every email.
2014-03-03 16:58:44 +01:00
James Newton
850b4af0ff have email views use iid 2013-08-29 21:26:32 -05:00
Izaak Alpert
3d7194f011 Merge Request on forked projects
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets
b1e425511f restyle and cleanup emails 2013-03-12 10:46:04 +02:00
Dmitriy Zaporozhets
ffe064a2c1 Bit of cleanup and improving mailer 2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets
cf3f22cc99 Corrent link for MR diff note in email 2012-12-31 19:06:49 +02:00
Robert Speicher
7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Riyad Preukschas
5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Robb Kidd
bb22360d1a Make Notify#note_merge_request_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
gitlabhq
d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets
41d439401d enable markdown for email notification 2012-02-13 20:40:39 +02:00
Valery Sizov
6a0defc3ca notification for note for merge request 2011-12-18 16:29:58 +02:00