Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix a string externalisation for i18n | Katrin Leinweber | 2019-01-12 | 1 | -1/+2 | |
| | | ||||||
* | | Upgrade prettier and reformat files as necessary | Mike Greiling | 2019-01-14 | 5 | -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 Tsiolis | 2019-01-10 | 1 | -2/+2 | |
| | ||||||
* | Discussion filters - ensured note links resolves to the right note | Constance Okoghenun | 2019-01-10 | 1 | -2/+21 | |
| | ||||||
* | Fixes doubles tooltips on note awards | Phil Hughes | 2019-01-09 | 1 | -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 Hughes | 2019-01-07 | 1 | -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-enter | Natalia Tepluhina | 2019-01-07 | 1 | -2/+5 | |
| | | ||||||
* | | Removed discard comment button | Constance Okoghenun | 2019-01-07 | 1 | -9/+0 | |
|/ | | | | | Removed the button and associated tests form notes on Issues and Merge request page. | |||||
* | Collapsible Comments Test for Issues | Ramya Authappan | 2019-01-03 | 2 | -3/+7 | |
| | ||||||
* | Made discussion filters only visible in merge request discussions tab | Constance Okoghenun | 2019-01-02 | 2 | -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 Hellmann | 2018-12-21 | 2 | -39/+7 | |
| | | | This reverts merge request !23622 | |||||
* | Merge branch 'winh-merge-request-commit-context' into 'master' | Kushal Pandya | 2018-12-21 | 1 | -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 discussions | Fatih Acet | 2018-12-21 | 1 | -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 requests | Winnie Hellmann | 2018-12-19 | 2 | -7/+39 | |
|/ | | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion | |||||
* | Add message saying who resolved nondiff discussion | sbigelow | 2018-12-17 | 2 | -11/+22 | |
| | | | | | - Add resolution text to notes in MR Discussions - Use slots to do so | |||||
* | Display reply field if resolved discussion has no replies | Winnie Hellmann | 2018-12-14 | 1 | -1/+1 | |
| | ||||||
* | Allow suggesting single line changes in diffs | Oswaldo Ferreira | 2018-12-13 | 10 | -2/+150 | |
| | ||||||
* | Merge branch 'fixed-note-awards-js' into 'master' | Filipa Lacerda | 2018-12-12 | 1 | -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 notes | Phil Hughes | 2018-12-11 | 1 | -1/+1 | |
| | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141 | |||||
* | | Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master' | Fatih Acet | 2018-12-11 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | | | | | | | Remove boxes around code comments Closes #54030 and #54058 See merge request gitlab-org/gitlab-ce!23092 | |||||
| * | | Remove boxes around code comments | Annabel Dunstone Gray | 2018-12-10 | 1 | -2/+2 | |
| |/ | ||||||
* | | Make commit IDs in merge request discussion header monospace | Winnie Hellmann | 2018-12-11 | 1 | -1/+5 | |
| | | ||||||
* | | Fix MR discussion counts being off | Paul Slaughter | 2018-12-10 | 1 | -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ís | 2018-12-08 | 5 | -16/+68 | |
| | ||||||
* | Resolve "Extended user centric tooltips" | Tim Zallmann | 2018-12-08 | 3 | -3/+17 | |
| | ||||||
* | Updated ajax error message with returned errors | Phil Hughes | 2018-12-07 | 1 | -6/+10 | |
| | ||||||
* | Updated variable name to forceExpanded | Phil Hughes | 2018-12-04 | 1 | -2/+2 | |
| | ||||||
* | Fixed multiple diff line discussions not expanding | Phil Hughes | 2018-12-04 | 1 | -2/+4 | |
| | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600 | |||||
* | Fix collapsing discussion replies | Winnie Hellmann | 2018-12-04 | 1 | -11/+4 | |
| | ||||||
* | Merge branch 'winh-timeline-entry-component' into 'master' | Kushal Pandya | 2018-11-30 | 3 | -307/+303 | |
|\ | | | | | | | | | Extract shared timeline entry component See merge request gitlab-org/gitlab-ce!23447 | |||||
| * | Replace existing uses of timeline-entry with timeline entry component | Winnie Hellmann | 2018-11-29 | 3 | -307/+303 | |
| | | ||||||
* | | Merge branch 'draft-design-improvements-backport' into 'master' | Filipa Lacerda | 2018-11-29 | 2 | -8/+12 | |
|\ \ | |/ |/| | | | | | Backport of draft-design-improvements changes See merge request gitlab-org/gitlab-ce!23438 | |||||
| * | Backport of draft-design-improvements changes | Phil Hughes | 2018-11-29 | 2 | -8/+12 | |
| | | ||||||
* | | Display commit ID for commit diff discussion on merge request | Winnie Hellmann | 2018-11-29 | 1 | -19/+34 | |
|/ | ||||||
* | Improve discussion rendering performance | Phil Hughes | 2018-11-27 | 13 | -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-discussion | Fatih Acet | 2018-11-22 | 2 | -3/+12 | |
| | ||||||
* | Prettify all the things | Mike Greiling | 2018-11-20 | 18 | -375/+155 | |
| | ||||||
* | Use @gitlab npm namespace | Clement Ho | 2018-11-16 | 2 | -2/+2 | |
| | ||||||
* | Made diff & note data consistent | Phil Hughes | 2018-11-14 | 4 | -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 Lacerda | 2018-11-12 | 5 | -22/+21 | |
|\ | | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607 | |||||
| * | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvement | Phil Hughes | 2018-11-09 | 1 | -8/+11 | |
| | | ||||||
| * | Init task list when creating new note & discussion | Phil Hughes | 2018-11-09 | 1 | -0/+1 | |
| | | ||||||
| * | Fix TaskList init on update & poll | Phil Hughes | 2018-11-09 | 2 | -11/+5 | |
| | | | | | | | | Fixed duplicate TaskList requests being made | |||||
| * | Improve initial rendering of discussion notes | Phil Hughes | 2018-11-09 | 4 | -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-btns | Annabel Dunstone Gray | 2018-11-09 | 1 | -3/+3 | |
|/ | ||||||
* | Stop multiple discussion requestsnotes-multiple-discussion-fetches | Phil Hughes | 2018-11-08 | 1 | -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 redesign | Fatih Acet | 2018-11-08 | 8 | -147/+260 | |
| | ||||||
* | Copy changes for abuse clarity | Jeremy Watson | 2018-11-07 | 1 | -3/+3 | |
| | ||||||
* | Remove gitlab-ui loading icon from global | Clement Ho | 2018-11-07 | 1 | -0/+2 | |
| | ||||||
* | Merge branch 'mr-image-commenting' into 'master' | Filipa Lacerda | 2018-11-07 | 3 | -11/+44 | |
|\ | | | | | | | | | | | | | Re-implemented image commenting on diffs Closes #48956 See merge request gitlab-org/gitlab-ce!22443 |