- 26 May, 2017 1 commit
-
-
Douwe Maan authored
-
- 23 May, 2017 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 12 May, 2017 1 commit
-
-
Douwe Maan authored
-
- 09 May, 2017 1 commit
-
-
Douwe Maan authored
-
- 05 May, 2017 1 commit
-
-
Kushal Pandya authored
-
- 03 May, 2017 1 commit
-
-
Douwe Maan authored
-
- 02 May, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 08 Apr, 2017 6 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 05 Apr, 2017 4 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 28 Mar, 2017 1 commit
-
- 13 Mar, 2017 5 commits
-
-
Bob Van Landuyt authored
merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
-
Bob Van Landuyt authored
-
Bob Van Landuyt authored
-
Bob Van Landuyt authored
And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
-
Bob Van Landuyt authored
Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
-
- 08 Mar, 2017 1 commit
-
-
Phil Hughes authored
-
- 09 Feb, 2017 2 commits
-
-
Phil Hughes authored
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
-
Filipa Lacerda authored
-
- 24 Jan, 2017 2 commits
-
-
Kushal Pandya authored
-
Nur Rony authored
-
- 31 Dec, 2016 1 commit
-
-
Kushal Pandya authored
-
- 28 Nov, 2016 1 commit
-
-
Sean McGivern authored
-
- 25 Nov, 2016 2 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.
-
- 23 Nov, 2016 1 commit
-
-
Nur Rony authored
-
- 17 Nov, 2016 1 commit
-
-
Nur Rony authored
adds dicussion icon and color change in system note links adds discussion icons and sticky note icon for other system notes for now fixes scss lint error adds faded commit lists hides first paragraph in commit list box css tweak for commit list system notes adds commit-list toggle functionality, css tweaks and css classnames more readable small css fix in header. makes links bold in system note renames class no-shade to hide-shade adds entry for this merge request in changelog removes commented line removes the avatar-icon from discussion header minor css tweaks to make the commit list alignment with header text uses monospaced font to make the commit list lined up with all removes icon from system note and align bullet list resolves scss lint warings adds helper function to extract system note message from first p tag adds helper functions to check commit list count and haml cleanup adds changelog entry under 8.14 adds changelog entry with changelog cli removes helper and regex and makes commit list li count using JS makes link in system note normal brakeman build failure resolved fixing rspec test based on new design for discussion shows system note in lowercase removes extra spaces from comments adds code commenting for functions adds semi-colon in some lines fixes rspec given when merge build success removes commented codes rewrite changelog yml file moves isMetaKey to common utils file fixes some indentation issues removes unnecessary variables and resolves some discussions replaces jQuery parent function with siblings fixes scss issues and variable spelling mistake uses constant rather using hardcoded number for visible li count in long commit list makes system note header all lowercase uses color variables and adjust gradient a little some minor changes for adding css classes renames functions name for readability changes changelog title minor scss newline changes makes system note less intrusive to a conversation
-
- 27 Sep, 2016 1 commit
-
-
Luke Bennett authored
-
- 26 Sep, 2016 1 commit
-
-
Luke Bennett authored
-
- 22 Sep, 2016 1 commit
-
-
Bryce Johnson authored
-
- 21 Sep, 2016 1 commit
-
-
Phil Hughes authored
This fixes an issue that would stop the resolve buttons working when GitLab is installed with a relative URL Closes #21704
-
- 20 Sep, 2016 1 commit
-
-
Phil Hughes authored
Closes #22354
-