<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views/notify/note_commit_email.html.haml, branch scripts-differences</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Better notification emails for notes and (diff) discussions</title>
<updated>2017-04-05T16:44:14+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-03-16T00:14:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3'/>
<id>f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add keyword arguments to truncated_diff method</title>
<updated>2016-11-25T15:23:49+00:00</updated>
<author>
<name>hhoopes</name>
<email>heidih@gmail.com</email>
</author>
<published>2016-08-31T16:18:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a761c59a6bfc4d66649910d01e4c8412bb0b40ec'/>
<id>a761c59a6bfc4d66649910d01e4c8412bb0b40ec</id>
<content type='text'>
* 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
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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
</pre>
</div>
</content>
</entry>
<entry>
<title>Change diff highlight/truncate for reusability</title>
<updated>2016-11-25T15:23:49+00:00</updated>
<author>
<name>hhoopes</name>
<email>heidih@gmail.com</email>
</author>
<published>2016-08-25T16:38:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f928dba99b0550cefa7534d7fd5bd1ea16609274'/>
<id>f928dba99b0550cefa7534d7fd5bd1ea16609274</id>
<content type='text'>
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 `&gt;`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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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 `&gt;`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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Add new template to handle both commit &amp; mr notes</title>
<updated>2016-11-25T15:23:49+00:00</updated>
<author>
<name>hhoopes</name>
<email>heidih@gmail.com</email>
</author>
<published>2016-08-23T05:36:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=24070bac45134c915c13d3e94723a44f59ab4e3a'/>
<id>24070bac45134c915c13d3e94723a44f59ab4e3a</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove custom link to target in notification emails</title>
<updated>2014-03-03T15:58:44+00:00</updated>
<author>
<name>Pierre de La Morinerie</name>
<email>pierre@capitainetrain.com</email>
</author>
<published>2014-02-18T10:46:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=edd6028bdb1f0e8ba6744540e9d3f324ab40126d'/>
<id>edd6028bdb1f0e8ba6744540e9d3f324ab40126d</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>restyle and cleanup emails</title>
<updated>2013-03-12T08:46:04+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2013-03-12T08:46:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b1e425511fd9f79da5289f1651bb8e9397b384f5'/>
<id>b1e425511fd9f79da5289f1651bb8e9397b384f5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fully embrace Ruby 1.9 hash syntax</title>
<updated>2012-08-10T22:25:15+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2012-08-10T22:07:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=775418918782d5284000ed0bfea364458c748567'/>
<id>775418918782d5284000ed0bfea364458c748567</id>
<content type='text'>
Didn't bother with files in db/, config/, or features/
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Didn't bother with files in db/, config/, or features/
</pre>
</div>
</content>
</entry>
<entry>
<title>Update notifications mails and notify specs for GFM</title>
<updated>2012-08-06T03:08:22+00:00</updated>
<author>
<name>Riyad Preukschas</name>
<email>riyad@informatik.uni-bremen.de</email>
</author>
<published>2012-08-06T03:08:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5443021a0e16887d14189f4203aea7f9282a1853'/>
<id>5443021a0e16887d14189f4203aea7f9282a1853</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix bug in mailer</title>
<updated>2012-05-17T06:30:24+00:00</updated>
<author>
<name>RickXing</name>
<email>oreofish@gmail.com</email>
</author>
<published>2012-05-17T06:30:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4c503be0f1cb1e092b243308ed83941638ac49c3'/>
<id>4c503be0f1cb1e092b243308ed83941638ac49c3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Make Notify#note_commit_email resque friendly</title>
<updated>2012-05-16T02:37:34+00:00</updated>
<author>
<name>Robb Kidd</name>
<email>robb@thekidds.org</email>
</author>
<published>2012-05-15T23:20:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0a9a2c2a0b75ba617611382b6335bf2b7fc68b9f'/>
<id>0a9a2c2a0b75ba617611382b6335bf2b7fc68b9f</id>
<content type='text'>
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
</pre>
</div>
</content>
</entry>
</feed>
