summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix a string externalisation for i18nKatrin Leinweber2019-01-121-1/+2
| |
* | Upgrade prettier and reformat files as necessaryMike Greiling2019-01-145-17/+17
|/ | | | | | Upgrades prettier to 1.15.3 Runs `yarn prettier-save-all` against the codebase Most changes are due to https://github.com/prettier/prettier/pull/5519
* 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
| | | | | | | | Reverts the note awards tooltips to use our own tooltip directive. Using the Bootstrap Vue tooltip inteferes with the Bootstrap JS tooltips which gets init'd in another JS file. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55483
* Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'Phil Hughes2019-01-071-2/+5
|\ | | | | | | | | Resolve "Ctrl+Enter immediately adds MR comment" See merge request gitlab-org/gitlab-ce!24053
| * 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
|/ | | | | Removed the button and associated tests form notes on Issues and Merge request page.
* 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
| | | | | | | Discussion filters will be hidden on Commits, Pipelines, and Changes tabs on merge requests page. This does not affect its behavior on issues page
* Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-212-39/+7
| | | This reverts merge request !23622
* Merge branch 'winh-merge-request-commit-context' into 'master'Kushal Pandya2018-12-211-19/+20
|\ | | | | | | | | | | | | Display commit ID for discussions made on merge request commits Closes #53953 See merge request gitlab-org/gitlab-ce!23837
| * MR commits display commit ID for discussionsFatih Acet2018-12-211-19/+20
| | | | | | | | | | | | Fixes a bug where merge request comments made in the context of a specific commit no longer specify which commit they were created on
* | Display "commented" only for commit discussions on merge requestsWinnie Hellmann2018-12-192-7/+39
|/ | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion
* Add message saying who resolved nondiff discussionsbigelow2018-12-172-11/+22
| | | | | - Add resolution text to notes in MR Discussions - Use slots to do so
* Display reply field if resolved discussion has no repliesWinnie Hellmann2018-12-141-1/+1
|
* Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-1310-2/+150
|
* Merge branch 'fixed-note-awards-js' into 'master'Filipa Lacerda2018-12-121-1/+1
|\ | | | | | | | | | | | | Fixed emoji awards not being added to notes Closes #55141 See merge request gitlab-org/gitlab-ce!23720
| * Fixed emoji awards not being added to notesPhil Hughes2018-12-111-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
* | Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master'Fatih Acet2018-12-111-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Remove boxes around code comments Closes #54030 and #54058 See merge request gitlab-org/gitlab-ce!23092
| * | Remove boxes around code commentsAnnabel Dunstone Gray2018-12-101-2/+2
| |/
* | Make commit IDs in merge request discussion header monospaceWinnie Hellmann2018-12-111-1/+5
| |
* | Fix MR discussion counts being offPaul Slaughter2018-12-101-1/+1
|/ | | | | | | | | **What was the issue?** Notes can be unresolved, but not resolvable. Without this, the unresolvedDiscussionsCount was inflated. **References** https://gitlab.com/gitlab-org/gitlab-ce/issues/55138
* Resolve "Navigating unresolved discussions on Merge Request page"André Luís2018-12-085-16/+68
|
* Resolve "Extended user centric tooltips"Tim Zallmann2018-12-083-3/+17
|
* Updated ajax error message with returned errorsPhil Hughes2018-12-071-6/+10
|
* Updated variable name to forceExpandedPhil Hughes2018-12-041-2/+2
|
* Fixed multiple diff line discussions not expandingPhil Hughes2018-12-041-2/+4
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
* Fix collapsing discussion repliesWinnie Hellmann2018-12-041-11/+4
|
* Merge branch 'winh-timeline-entry-component' into 'master'Kushal Pandya2018-11-303-307/+303
|\ | | | | | | | | Extract shared timeline entry component See merge request gitlab-org/gitlab-ce!23447
| * 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 changes See merge request gitlab-org/gitlab-ce!23438
| * 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
| | | | | | | | | | | Improve the renderign of new and existing discussions by reducing the number of watchers on each object & array. Previously every discussion change would trigger an update for every discussion component. Also tidied up some components to get them closer to our docs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51506
* 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
| | | | | | | | | | This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
* Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-125-22/+21
|\ | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
| * 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
| | | | | | | | Fixed duplicate TaskList requests being made
| * Improve initial rendering of discussion notesPhil Hughes2018-11-094-12/+13
| | | | | | | | | | | | This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis.
* | 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
| | | | | | | With multiple discussion requests we loose the reactivity of the previously stored discussions state. This means that certain features, toggling line discussions for example, are no longer reactive.
* 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 diffs Closes #48956 See merge request gitlab-org/gitlab-ce!22443
View Lorry Controller Status