summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Expand)AuthorAgeFilesLines
* Move EE differences in CE diff files into CEPhil Hughes2019-03-013-8/+13
* CE port of noteable-discussion-ee-differencesPhil Hughes2019-02-282-1/+14
* Merge branch 'qa-fix-import-github-repo-spec-2' into 'master'Ramya Authappan2019-02-271-1/+1
|\
| * Update GitHub Import testSanad Liaquat2019-02-251-1/+1
* | Add support for toggling discussion filter from notes sectionKushal Pandya2019-02-264-2/+83
* | Extract ResolveWithIssueButton from NoteableDiscussion componentWinnie Hellmann2019-02-252-10/+43
|/
* CE backport of design-management-issue-tabPhil Hughes2019-02-201-0/+7
* Remove noteId prop from ReplyButton componentWinnie Hellmann2019-02-185-31/+33
* Cancelling reply reverts comment to initial stateConstance Okoghenun2019-02-184-0/+16
* Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-151-7/+11
* Merge branch '55206-discussion-text-alignment' into 'master'Annabel Dunstone Gray2019-02-151-24/+26
|\
| * Correctly align resolved discussion textMark Florian2019-02-121-24/+26
* | Add fix for suggested changes syntax highlightingAnnabel Dunstone Gray2019-02-141-0/+1
* | Fix polling for replies to individual notesHeinrich Lee Yu2019-02-146-24/+49
* | Merge branch '55209-tool-tip-hides-menu-item' into 'master'Phil Hughes2019-02-121-0/+6
|\ \ | |/ |/|
| * Hide More Actions tooltip when the menu opens55209-tool-tip-hides-menu-itemSimon Knox2019-02-121-0/+6
* | Refactor draft_note_spec.js to Vue test utils (CE backport)Winnie Hellmann2019-02-081-0/+1
* | Changed default tooltip position to be top, instead of bottomtooltips-to-topDimitrie Hoekstra2019-02-062-7/+4
|/
* Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-068-2/+97
* Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-055-26/+1
|\
| * Remove Redcarpet markdown engineJan Provaznik2019-02-045-26/+1
* | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-052-8/+20
|/
* refactor(NoteableDiscussion): Extracted ResolveDiscussionButton fromMartin Hobert2019-01-282-10/+36
* Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into 'ma...Phil Hughes2019-01-282-10/+34
|\
| * refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its own...Martin Hobert2019-01-282-10/+34
* | Adjusts suggestions unable to be appliedOswaldo Ferreira2019-01-251-5/+6
* | Merge branch '53950-commit-comments-displayed-on-a-merge-request' into 'master'56221-spec-features-projects-clusters-gcp_spec-rb-appears-to-be-making-real-google-api-requestsMike Greiling2019-01-242-7/+37
|\ \
| * | Updated i18n format for note header commit linkConstance Okoghenun2019-01-241-11/+4
| * | Updated i18n for discussion note commit SHAConstance Okoghenun2019-01-231-6/+18
| * | Added i18n to discussion note commit SHAConstance Okoghenun2019-01-221-2/+3
| * | Refactored implementation of discussion note headerConstance Okoghenun2019-01-181-23/+10
| * | Display "commented" only for commit discussions on merge requestsConstance Okoghenun2019-01-172-2/+39
| |/
* | Trim first char of diff line text on diff discussionsDouwe Maan2019-01-224-9/+15
* | Merge branch 'fix-note-i18n' into 'master'Phil Hughes2019-01-211-1/+2
|\ \ | |/ |/|
| * Fix a string externalisation for i18nKatrin Leinweber2019-01-121-1/+2
* | Upgrade prettier and reformat files as necessaryMike Greiling2019-01-145-17/+17
|/
* Remove unused button classes `btn-create` and `comment-btn`George Tsiolis2019-01-101-2/+2
* Discussion filters - ensured note links resolves to the right noteConstance Okoghenun2019-01-101-2/+21
* Fixes doubles tooltips on note awardsPhil Hughes2019-01-091-4/+6
* Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'Phil Hughes2019-01-071-2/+5
|\
| * Added handleKeySubmit method to match EE8535-add-mr-comment-on-ctrl-enterNatalia Tepluhina2019-01-071-2/+5
* | Removed discard comment buttonConstance Okoghenun2019-01-071-9/+0
|/
* Collapsible Comments Test for IssuesRamya Authappan2019-01-032-3/+7
* Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-022-2/+19
* Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-212-39/+7
* Merge branch 'winh-merge-request-commit-context' into 'master'Kushal Pandya2018-12-211-19/+20
|\
| * MR commits display commit ID for discussionsFatih Acet2018-12-211-19/+20
* | Display "commented" only for commit discussions on merge requestsWinnie Hellmann2018-12-192-7/+39
|/
* Add message saying who resolved nondiff discussionsbigelow2018-12-172-11/+22
* Display reply field if resolved discussion has no repliesWinnie Hellmann2018-12-141-1/+1
View Lorry Controller Status