summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Expand)AuthorAgeFilesLines
* Updated variable name to forceExpandedPhil Hughes2018-12-041-2/+2
* Fixed multiple diff line discussions not expandingPhil Hughes2018-12-041-2/+4
* Fix collapsing discussion repliesWinnie Hellmann2018-12-041-11/+4
* Merge branch 'winh-timeline-entry-component' into 'master'Kushal Pandya2018-11-303-307/+303
|\
| * Replace existing uses of timeline-entry with timeline entry componentWinnie Hellmann2018-11-293-307/+303
* | Merge branch 'draft-design-improvements-backport' into 'master'Filipa Lacerda2018-11-292-8/+12
|\ \ | |/ |/|
| * Backport of draft-design-improvements changesPhil Hughes2018-11-292-8/+12
* | Display commit ID for commit diff discussion on merge requestWinnie Hellmann2018-11-291-19/+34
|/
* Improve discussion rendering performancePhil Hughes2018-11-2713-276/+221
* Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussionFatih Acet2018-11-222-3/+12
* Prettify all the thingsMike Greiling2018-11-2018-375/+155
* Use @gitlab npm namespaceClement Ho2018-11-162-2/+2
* Made diff & note data consistentPhil Hughes2018-11-144-44/+43
* Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-125-22/+21
|\
| * Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvementPhil Hughes2018-11-091-8/+11
| * Init task list when creating new note & discussionPhil Hughes2018-11-091-0/+1
| * Fix TaskList init on update & pollPhil Hughes2018-11-092-11/+5
| * Improve initial rendering of discussion notesPhil Hughes2018-11-094-12/+13
* | Fix alignment of diff comment buttons53768-diff-comment-action-btnsAnnabel Dunstone Gray2018-11-091-3/+3
|/
* Stop multiple discussion requestsnotes-multiple-discussion-fetchesPhil Hughes2018-11-081-0/+6
* Discussions redesignFatih Acet2018-11-088-147/+260
* Copy changes for abuse clarityJeremy Watson2018-11-071-3/+3
* Remove gitlab-ui loading icon from globalClement Ho2018-11-071-0/+2
* Merge branch 'mr-image-commenting' into 'master'Filipa Lacerda2018-11-073-11/+44
|\
| * Re-implemented image commenting on diffsPhil Hughes2018-11-053-11/+44
* | Add 'only history' option to notes filterFelipe Artur2018-11-059-6/+37
* | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-053-4/+4
|\ \ | |/ |/|
| * QA Selectors for Batch Comment E2E Automationat.ramya2018-10-303-4/+4
* | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-012-2/+2
|\ \
| * | Fix typos in comments and specsGeorge Tsiolis2018-11-012-2/+2
* | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-312-4/+12
|/ /
* | Adding tests for filtering activities/comments in issuesRamya Authappan2018-10-301-4/+3
* | Update gitlab-ui to 1.9.0Clement Ho2018-10-291-3/+3
|/
* Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4Mike Greiling2018-10-2612-28/+160
|\
| * Impove diff discussion datamr-diff-dataPhil Hughes2018-10-242-16/+0
| * Resolve "Filter discussion (tab) by comments or activity in issues and merge ...Oswaldo Ferreira2018-10-2311-12/+160
* | Prettify performance_bar notes and profile modulesMike Greiling2018-10-173-25/+8
|/
* Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
|\
| * Backport EE fixes to CE checking resolvabilityAndré Luís2018-10-111-1/+13
* | Fix broken file name navigation on MRsJacques Erasmus2018-10-111-0/+1
|/
* Resolve "Merge request buttons spacing incorrect"Jacques Erasmus2018-10-081-1/+1
* Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-067-30/+93
* Adding qa-selectors for e2e testsRamya Authappan2018-10-051-4/+11
* Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-041-2/+2
|\
| * Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-2/+2
* | Merge branch '_acet-fix-diff-file-header' into 'master'Mike Greiling2018-10-031-94/+0
|\ \
| * | Fix showing diff file header for renamed filesFatih Acet2018-10-031-94/+0
* | | Merge branch '_acet-fix-placeholder-note' into 'master'Phil Hughes2018-10-031-1/+2
|\ \ \ | |/ /
| * | Fix placeholder note renderingFatih Acet2018-10-031-1/+2
| |/
* | Highlight current user in comments and system notesWinnie Hellmann2018-10-021-0/+4
|/