Commit Graph

115 Commits

Author SHA1 Message Date
Heinrich Lee Yu c17b7afa02 Remove reply_to_individual_notes feature flag
Also removes specs related to the flag
2019-04-03 10:00:18 +08:00
Tim Zallmann 4f0b2079de Upgraded Vue to 2.6.8
Upgrade to latest Version
2019-03-27 21:33:20 +00:00
Winnie Hellmann 4d1ac56518 Remove top-level mount from note_form_spec.js 2019-03-26 19:53:07 +01:00
Winnie Hellmann 514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00
Winnie Hellmann 53e23a296d Pass autosaveKey from NoteableDiscussion to NoteForm 2019-03-21 17:14:44 +01:00
Winnie Hellmann 93c27c3b22 Validate NoteForm props in noteable_discussion_spec.js 2019-03-21 17:14:44 +01:00
Winnie Hellmann f5ce678dfe Use autosave utilities in NoteForm component 2019-03-21 17:14:44 +01:00
Winnie Hellmann 910c7f5f63 Refactor note_form_spec.js to use Vue test utils 2019-02-28 09:21:32 +01:00
Kushal Pandya 2dd22ecb46 Add support for toggling discussion filter from notes section
Adds discussion note style section under notes app from where
user can toggle discussion when they have selected a filter to show
only system notes.
2019-02-26 14:04:15 +00:00
Winnie Hellmann a26cd1235a Extract ResolveWithIssueButton from NoteableDiscussion component 2019-02-25 16:38:29 +00:00
Kushal Pandya 161851de36 Merge branch 'winh-jest-gitlab-ui' into 'master'
Make Jest work with gitlab-ui

Closes #56689

See merge request gitlab-org/gitlab-ce!25440
2019-02-21 11:26:05 +00:00
Winnie Hellmann 0e619d01b0 Move discussion_jump_to_next_button_spec.js to Jest 2019-02-21 10:53:00 +01:00
Phil Hughes 810a8b78b6
CE backport of design-management-issue-tab
Backports template and Vue changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9632 to CE
2019-02-20 14:51:06 +00:00
Winnie Hellmann 8441fc4799 Remove noteId prop from ReplyButton component
Move convertToDiscussion call from ReplyButton to NoteApp component
2019-02-18 09:43:13 +00:00
Winnie Hellmann 7430149d4d Convert noteable_note_spec.js to Vue test utils
(cherry picked from commit 861f93e6fc)
2019-02-12 20:55:56 +00:00
Simon Knox be485a781d Hide More Actions tooltip when the menu opens 2019-02-12 21:41:01 +11:00
Winnie Hellmann 2ab083aba6 Revert "Convert noteable_note_spec.js to Vue test utils" 2019-02-06 14:15:45 +01:00
Heinrich Lee Yu a04d9ba90c Add reply to notes to turn into discussions 2019-02-06 10:31:46 +00:00
Fatih Acet c5f1b83468 Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master'
Convert noteable_note_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24801
2019-02-06 09:56:02 +00:00
Fatih Acet ea525bdbfa Merge branch 'winh-note_app_spec-vue-test-utils' into 'master'
Convert note_app_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24900
2019-02-06 00:02:30 +00:00
Winnie Hellmann 63975b4a68 Extract ReplyPlaceholder from NoteableDiscussion component 2019-02-05 08:56:34 +00:00
Winnie Hellmann 647f045dde Convert note_app_spec.js to Vue test utils 2019-02-04 13:19:53 +01:00
Winnie Hellmann 861f93e6fc Convert noteable_note_spec.js to Vue test utils 2019-01-30 17:34:06 +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