summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
View Lorry Controller Status