summaryrefslogtreecommitdiff
path: root/spec/javascripts/notes
Commit message (Collapse)AuthorAgeFilesLines
* Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-061-1/+0
| | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
* Merge branch 'winh-note_app_spec-vue-test-utils' into 'master'sh-bump-supported-ruby-versionsFatih Acet2019-02-061-81/+86
|\ | | | | | | | | Convert note_app_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24900
| * Convert note_app_spec.js to Vue test utilsWinnie Hellmann2019-02-041-81/+86
| |
* | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-052-17/+48
|/
* Convert noteable_discussion_spec.js to Vue test utilsWinnie Hellmann2019-01-291-65/+77
|
* refactor(NoteableDiscussion): Extracted ResolveDiscussionButton fromMartin Hobert2019-01-281-0/+74
|
* Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into ↵Phil Hughes2019-01-281-0/+33
|\ | | | | | | | | | | | | | | | | 'master' Refactor/56369 extract jump to next discussion button Closes #56369 See merge request gitlab-org/gitlab-ce!24506
| * refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its ↵Martin Hobert2019-01-281-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | own component fix #56369 chore(changelog): Added changelog entry chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Added test for new component test(Refactored tests to use vue test-utils): chore(translations): Added newly generated locales Update spec/javascripts/notes/components/discussion_jump_to_next_button_spec.js chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Updated tests to use a local vue instance test(JumpToNextDiscussionButton): Running tests in async to prevent maximum stack overflow
* | Convert note_actions_spec.js to Vue test utilsWinnie Hellmann2019-01-251-19/+33
| |
* | Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'Clement Ho2019-01-241-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Bump CI image to use Chrome 71.0 and Golang 1.11 Closes #56614 and #55578 See merge request gitlab-org/gitlab-ce!24572
| * | Fix discussion counter spec mock dataLukas Eipert2019-01-231-0/+2
| |/ | | | | | | | | | | To me it seems like the mock data does not match the actual data anymore. I checked the actual data and to me it seems like the resolved property actually should live in the overall discussion object.
* | Trim first char of diff line text on diff discussionsDouwe Maan2019-01-221-5/+11
|/ | | | | | | | | | | | Before, diff file `higlighted_diff_lines`/`parallel_diff_lines` and diff discussion `truncated_diff_lines` were inconsistent: `text` and `rich_text` on the latter included the leading +/-/<space> character, like on the backend, while the former had no `text` and its `rich_text` had dropped this char. This resulted in a bug when the suggestions feature expected these diff line objects to be identical in format and thus interchangeable, which was not the case.
* Discussion filters - ensured note links resolves to the right noteConstance Okoghenun2019-01-101-5/+41
|
* Removed discard comment buttonConstance Okoghenun2019-01-071-1/+0
| | | | | Removed the button and associated tests form notes on Issues and Merge request page.
* Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-021-2/+34
| | | | | | | Discussion filters will be hidden on Commits, Pipelines, and Changes tabs on merge requests page. This does not affect its behavior on issues page
* MR commits display commit ID for discussionsFatih Acet2018-12-211-8/+65
| | | | | | Fixes a bug where merge request comments made in the context of a specific commit no longer specify which commit they were created on
* Merge branch 'fixed-note-awards-js' into 'master'Filipa Lacerda2018-12-121-0/+23
|\ | | | | | | | | | | | | 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-0/+23
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
* | Make commit IDs in merge request discussion header monospaceWinnie Hellmann2018-12-111-2/+44
| |
* | Fix MR discussion counts being offPaul Slaughter2018-12-101-27/+44
|/ | | | | | | | | **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-083-1/+6
|
* Resolve "Extended user centric tooltips"Tim Zallmann2018-12-082-1/+4
|
* Updated variable name to forceExpandedPhil Hughes2018-12-041-1/+1
|
* Fixed multiple diff line discussions not expandingPhil Hughes2018-12-041-0/+10
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
* Fix collapsing discussion repliesWinnie Hellmann2018-12-041-46/+0
|
* Improve discussion rendering performancePhil Hughes2018-11-275-54/+119
| | | | | | | | | | | 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-221-0/+44
|
* Made diff & note data consistentPhil Hughes2018-11-141-3/+2
| | | | | | | | | | 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.
* Fixed failing note actions specPhil Hughes2018-11-091-0/+3
|
* Discussions redesignFatih Acet2018-11-082-2/+92
|
* Copy changes for abuse clarityJeremy Watson2018-11-071-1/+1
|
* Merge branch 'mr-image-commenting' into 'master'Filipa Lacerda2018-11-071-1/+1
|\ | | | | | | | | | | | | Re-implemented image commenting on diffs Closes #48956 See merge request gitlab-org/gitlab-ce!22443
| * Re-implemented image commenting on diffsPhil Hughes2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-implements image commenting in merge request diffs. This feature was previously lost when the merge request page was refactored into Vue. With this, we create an overlay component. The overlay component handles displaying the comment badges and the comment form badge. Badges are displayed based on the position attribute sent with the discussion. Comment forms for diff files are controlled through a different state property. This is so we don't tie comment forms to diff files directly creating deep nested state. Instead we create a flat array which holds the file hash & the X & Y position of the comment form. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
* | Add 'only history' option to notes filterFelipe Artur2018-11-054-2/+52
|/
* Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-1/+1
|\ | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
| |
* | Prettify remaining files with differences in CE and EEMike Greiling2018-10-312-8/+15
|/
* Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-233-2/+76
| | | | requests"
* Prettify all spec filesMike Greiling2018-10-174-15/+12
|
* enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-177-2/+32
|
* enable jasmine/new-line-between-declarationsJohann Hubert Sonntagbauer2018-10-091-0/+1
|
* Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-041-16/+8
|\ | | | | | | | | | | | | Fix MR discussion not loaded issue Closes #51958 See merge request gitlab-org/gitlab-ce!21982
| * Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-16/+8
| | | | | | | | | | | | Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading".
* | Fix placeholder note renderingFatih Acet2018-10-031-0/+25
|/
* Added test for adding `truncated_diff_lines` to discussionPhil Hughes2018-09-201-0/+35
|
* Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda2018-09-171-0/+192
|\ | | | | | | | | Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705
| * Use MR widget event_hub to dispatch update eventPhil Hughes2018-09-131-4/+3
| | | | | | | | | | Instead of relying on a global method, we now emit an event on the MR widget that tells it to check the status
| * Fixed MR widget unresolved discussions statePhil Hughes2018-09-121-0/+193
| | | | | | | | | | | | | | | | After resolving a discussion on a merge request page the merge request widget state would not get updated meaning users would need to refresh the page to merge (if that option is enabled in the projects settings) https://gitlab.com/gitlab-org/gitlab-ce/issues/42882
* | Fixed resolved discussions not toggling expandedPhil Hughes2018-09-131-1/+35
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
* Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-075-30/+70
|