delta/gitlab/gitlab-ce.git/app/views/notify, branch patch-9 gitlab.com: gitlab-org/gitlab-ce.git Introduce `Ci::Stage`, right now this is artificial object that is build dynamically. 2016-12-06T13:13:21+00:00 Kamil Trzcinski ayufan@ayufan.eu 2016-12-05T13:17:42+00:00 d865aedafc2282f898b4bd2fdfd3660c47203c37 






Use assigned variables better
2016-11-28T19:40:48+00:00

Sean McGivern
sean@gitlab.com

2016-11-23T16:25:37+00:00

87665170eccfc423fc3f7fe2cadd208d808a6847












Tidy up text emails
2016-11-28T19:40:48+00:00

Sean McGivern
sean@gitlab.com

2016-11-17T22:22:39+00:00

854fbbfb07b84394cc952d0ae20b7f29957e6555












Add keyword arguments to truncated_diff method
2016-11-25T15:23:49+00:00

hhoopes
heidih@gmail.com

2016-08-31T16:18:26+00:00

a761c59a6bfc4d66649910d01e4c8412bb0b40ec

* 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





* 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







Change diff highlight/truncate for reusability
2016-11-25T15:23:49+00:00

hhoopes
heidih@gmail.com

2016-08-25T16:38:07+00:00

f928dba99b0550cefa7534d7fd5bd1ea16609274

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.





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.







Add new template to handle both commit & mr notes
2016-11-25T15:23:49+00:00

hhoopes
heidih@gmail.com

2016-08-23T05:36:30+00:00

24070bac45134c915c13d3e94723a44f59ab4e3a

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.





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.







Add diff hunks to notification emails on MR
2016-11-25T15:23:49+00:00

hhoopes
heidih@gmail.com

2016-08-17T22:27:01+00:00

38ed96e9b1a47dca5aa2590fa9b0ade908337435

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).





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).







Move partials to links directory, feedback:
2016-11-22T05:44:25+00:00

Lin Jen-Shin
godfat@godfat.org

2016-11-22T05:44:25+00:00

7ec8cc121a9db954a3a0b5c8ebfc05cb471823db

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971





https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971







Use local instead of instance variable in partial
2016-11-22T05:35:05+00:00

Lin Jen-Shin
godfat@godfat.org

2016-11-22T05:35:05+00:00

a2fb636153669f06083903b473fbe8efc8fe3455

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762989





Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762989







Use partials instead of simple switch case:
2016-11-21T17:12:19+00:00

Lin Jen-Shin
godfat@godfat.org

2016-11-21T17:12:19+00:00

438f0915e7fbd60e6cc597656e9b25284c52f7de

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745137





Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745137