Commit Graph

93 Commits

Author SHA1 Message Date
Winnie Hellmann 647f045dde Convert note_app_spec.js to Vue test utils 2019-02-04 13:19:53 +01:00
Winnie Hellmann d8e18a743e Convert noteable_discussion_spec.js to Vue test utils 2019-01-29 20:06:33 +01:00
Martin Hobert 56c62208f6 refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from 2019-01-28 22:44:17 +00:00
Phil Hughes 958a819fce Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into 'master'
Refactor/56369 extract jump to next discussion button

Closes #56369

See merge request gitlab-org/gitlab-ce!24506
2019-01-28 17:33:20 +00:00
Martin Hobert 3af7723fcd refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its 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
2019-01-28 11:36:44 +01:00
Winnie Hellmann 8e6d2cca24 Convert note_actions_spec.js to Vue test utils 2019-01-25 10:59:22 +01:00
Lukas Eipert 0152cb0dd4
Fix discussion counter spec mock data
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.
2019-01-23 12:39:46 +01:00
Constance Okoghenun 211c946a67 Discussion filters - ensured note links resolves to the right note 2019-01-10 14:00:36 +00:00
Constance Okoghenun 64fcda29f6 Removed discard comment button
Removed the button and associated tests form notes
on Issues and Merge request page.
2019-01-07 13:06:42 +01:00
Constance Okoghenun 92eff44f0b Made discussion filters only visible in merge request discussions tab
Discussion filters will be hidden on Commits, Pipelines, and
Changes tabs on merge requests page.

This does not affect its behavior on issues page
2019-01-02 05:42:31 +01:00
Fatih Acet 5838598062
MR commits display commit ID for discussions
Fixes a bug where merge request comments made
in the context of a specific commit no longer specify
which commit they were created on
2018-12-21 00:19:44 +01:00
Filipa Lacerda f5eddb8074 Merge branch 'fixed-note-awards-js' into 'master'
Fixed emoji awards not being added to notes

Closes #55141

See merge request gitlab-org/gitlab-ce!23720
2018-12-12 09:39:28 +00:00
Winnie Hellmann 1272b5fadc Make commit IDs in merge request discussion header monospace 2018-12-11 10:22:00 +00:00
Phil Hughes 4e65fe2f1e
Fixed emoji awards not being added to notes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
2018-12-11 09:14:59 +00:00
André Luís 85daddbec9 Resolve "Navigating unresolved discussions on Merge Request page" 2018-12-08 07:19:03 +00:00
Tim Zallmann ddd4cc649f Resolve "Extended user centric tooltips" 2018-12-08 03:12:23 +00:00
Winnie Hellmann 1cae0af4b8 Fix collapsing discussion replies 2018-12-04 10:09:51 +00:00
Phil Hughes adf8ad9eee
Improve discussion rendering performance
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
2018-11-27 11:40:39 +00:00
Fatih Acet e6cf3c7a6f
Allow commenting to resolved non-diff discussions 2018-11-22 15:45:28 +01:00
Phil Hughes 234563ba30
Made diff & note data consistent
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.
2018-11-14 19:16:46 +00:00
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +00:00
Jeremy Watson 28840d3f5c Copy changes for abuse clarity 2018-11-07 11:24:36 +00:00
Filipa Lacerda e1e315ee28 Merge branch 'mr-image-commenting' into 'master'
Re-implemented image commenting on diffs

Closes #48956

See merge request gitlab-org/gitlab-ce!22443
2018-11-07 10:04:54 +00:00
Phil Hughes f7df9ddb52
Re-implemented image commenting on diffs
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
2018-11-05 14:02:41 +00:00
Felipe Artur b4d005eb7b Add 'only history' option to notes filter 2018-11-05 12:30:14 +00:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Oswaldo Ferreira 86ead874e2 Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" 2018-10-23 09:49:45 +00:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Johann Hubert Sonntagbauer 2a76e04091 enable jasmine/new-line-between-declarations 2018-10-09 19:01:49 +02:00
Fatih Acet e3b96ad76b
Fix placeholder note rendering 2018-10-03 13:29:14 +02:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
André Luís 296f489d85 Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
2018-08-01 15:26:57 +01:00
André Luís 8047b00fb6 Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
2018-08-01 15:26:57 +01:00
André Luís c7cd9ee97c Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit 5ba542b109, reversing
changes made to 32c831ea2b.
2018-08-01 13:45:15 +01:00
André Luís 8693aa139d Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit ced005f330, reversing
changes made to 9b01b293ce.
2018-08-01 13:45:15 +01:00
André Luís f2f8ddf4cc Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" 2018-07-20 15:24:46 +00:00
Fatih Acet c12ad01693
Fix failing specs :fingers-crossed: 2018-07-18 12:55:56 +02:00
Simon Knox 9dc6b03997 Resolve "MRs are showing some discussions as unresolved" 2018-07-05 22:10:38 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Constance Okoghenun dea03a0815 Resolve "Remove “commented” from comment system notes" 2018-06-19 16:43:57 +00:00
Andreas Kämmerle 88808a1fd4 Replace ... with ellipsis in placeholders 2018-06-11 09:21:04 +02:00
Mark Chao 7c965a24f5 Fix spec 2018-06-06 20:57:15 +09:00
Bob Van Landuyt 04c7d0d555 Prevent awarding emoji when a project is archived
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-11 10:51:43 +02:00
Simon Knox 39ee707c0a Don't show Jump to Discussion button on issue notes 2018-03-28 16:11:06 +11:00
George Tsiolis 85ce8c7e22 Update spec import path for vue mount component helper 2018-03-20 18:58:29 +02:00
Mike Greiling c1708514f5
move render_gfm into behaviors directory 2018-03-19 23:07:46 -05:00
Filipa Lacerda e84c943fa0
Fix loading icon being visible in the wrong button 2018-03-12 17:08:05 +00:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00