summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Bump GitLab UI version and change the file imports to a single point of entry...jivl-bump-gitlab-uiJose Vargas2018-09-261-1/+1
* Add gitlab-ui skeleton loadingClement Ho2018-09-251-3/+3
* Merge branch 'upgrade-eslint' into 'master'Marin Jankovski2018-09-245-7/+7
|\
| * Resolve eslint-plugin-vue errorsMike Greiling2018-09-205-7/+7
* | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-2/+2
* | Use returned discussion from APIPhil Hughes2018-09-212-18/+7
* | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-09-201-1/+4
|\ \ | |/ |/|
| * Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
* | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-191-1/+1
|\ \
| * | Updated LegacyDiffNote logicPhil Hughes2018-09-171-2/+1
| * | Moved legacy diff note check into util methodPhil Hughes2018-09-171-5/+2
| * | Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-171-1/+5
| |/
* | Unite green buttons under one css classDmitriy Zaporozhets2018-09-192-2/+2
|/
* Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda2018-09-171-3/+14
|\
| * Use MR widget event_hub to dispatch update eventPhil Hughes2018-09-131-1/+2
| * Fixed MR widget unresolved discussions statePhil Hughes2018-09-121-3/+13
* | Create specs for diffs/components/app and update modules to export factory fu...Paul Slaughter2018-09-142-12/+4
* | Merge branch 'mr-fixed-expanded-state-not-working' into 'master'Mike Greiling2018-09-131-6/+1
|\ \ | |/ |/|
| * Fixed resolved discussions not toggling expandedPhil Hughes2018-09-131-6/+1
* | Use gitlab-ui loading iconClement Ho2018-09-112-9/+3
|/
* Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-077-60/+84
|\
| * Cosmetic changes to let setupTim Zallmann2018-09-071-0/+1
| * Adapted so utils + actions don't include any mutations and mutations are alwa...Tim Zallmann2018-09-072-4/+7
| * Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-072-2/+2
| * Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-071-1/+0
| * Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-072-7/+8
| * Fixed Resolving, Loading more and Line BugsTim Zallmann2018-09-072-9/+3
| * Delete Discussions fixTim Zallmann2018-09-072-4/+14
| * Fix for Getter + LintingTim Zallmann2018-09-071-3/+2
| * Adding new threads to MR pageTim Zallmann2018-09-073-46/+58
| * Loading Discussions later on DiffsTim Zallmann2018-09-071-1/+6
* | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-074-11/+22
|/
* Remove extra spaces from MR discussion notesTakuya Noguchi2018-09-051-4/+3
* Allows author to vote on their own issueChantal Rollison2018-08-241-18/+6
* Merge branch '49854-recover-mr-regression-fixes-safe' into 'master'Tim Zallmann2018-08-076-61/+173
|\
| * Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'mast...André Luís2018-08-014-40/+141
| * Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-013-21/+32
* | Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-011-0/+3
|\ \ | |/ |/|
| * Show the status of a user in interactionsBob Van Landuyt2018-07-301-0/+3
View Lorry Controller Status