- 29 Mar, 2017 1 commit
-
-
Clement Ho authored
-
- 17 Mar, 2017 1 commit
-
-
Kamil Trzciński authored
-
- 22 Feb, 2017 1 commit
-
-
Alexis Reigel authored
-
- 03 Feb, 2017 1 commit
-
-
Filipa Lacerda authored
Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
-
- 25 Jan, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 24 Jan, 2017 2 commits
-
-
Kushal Pandya authored
-
Kushal Pandya authored
-
- 18 Jan, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 31 Dec, 2016 4 commits
-
-
Kushal Pandya authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
- 06 Dec, 2016 1 commit
-
-
Kamil Trzcinski authored
-
- 28 Nov, 2016 2 commits
-
-
Sean McGivern authored
-
Sean McGivern authored
-
- 25 Nov, 2016 4 commits
-
-
hhoopes authored
* 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
-
hhoopes authored
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.
-
hhoopes authored
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.
-
hhoopes authored
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).
-
- 22 Nov, 2016 2 commits
-
- 21 Nov, 2016 3 commits
-
-
Lin Jen-Shin authored
Fixes #24677
- 15 Nov, 2016 1 commit
-
-
Yar authored
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
-
- 07 Nov, 2016 1 commit
-
-
tauriedavis authored
-
- 19 Oct, 2016 1 commit
-
-
Stan Hu authored
Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5258614 Closes #23498
-
- 18 Oct, 2016 1 commit
-
-
Stan Hu authored
Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5246591 Closes #23498
-
- 13 Oct, 2016 3 commits
-
-
Lin Jen-Shin authored
-
Mike Greiling authored
-
- 12 Oct, 2016 3 commits
-
-
Mike Greiling authored
-
- 08 Oct, 2016 2 commits
-
-
Mike Greiling authored
-
Mike Greiling authored
-
- 07 Oct, 2016 1 commit
-
-
Mike Greiling authored
-
- 06 Oct, 2016 3 commits
-
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-