Commit Graph

130 Commits

Author SHA1 Message Date
Natalia Tepluhina 6911c3435a Resolve "Tooltips on note timestamps not showing for issues" 2019-07-18 13:16:18 +00:00
Tim Zallmann b9e52612fe Updates on success of an MR the count on top and in other tabs
New API endpoint for merge request count
Updates all open tabs at the same time with one call
Restructured API response

API response changed to 401 if no current_user

Added API + JS specs

Fix for Static Check

Updated Count on Open/Close, Assign/Unassign of MR's

Checking if MR Count is refreshed

Added # frozen_string_literal: true to spec

Added Changelog
2019-07-09 08:44:19 +00:00
Sean McGivern b94daa35a4 Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953 2019-07-03 10:28:13 +01:00
Natalia Tepluhina d4151b14c2 Rebased and squashed commits
- all commits squashed to make danger review happy
2019-07-03 08:26:57 +00:00
Michel Engelen f41ab869ee prettified noteable_discussion spec file 2019-07-02 14:29:54 +02:00
Michel Engelen 385ef2abf7 prettified js testfile for noteable_discussion component 2019-07-02 14:29:54 +02:00
Michel Engelen e671ab06ce updated karma test for noteable_discussion component 2019-07-02 14:29:54 +02:00
Michel Engelen 2ded70292e prettified noteable_discussion component and updated tests 2019-07-02 14:29:54 +02:00
Samantha Ming 08359a8ebc Add back trimChar method to remove trailing +/-
Add test for checking output
2019-06-21 10:10:05 +00:00
Marc Schwede 982463e944 Change "Report abuse to GitLab" to more generic wording. 2019-06-06 10:05:42 +00:00
Winnie Hellmann aea013eab9 Move NoteApp tests to Jest 2019-06-03 14:36:34 +00:00
Fatih Acet 7099211ea7
Fix emoji picker visibility issue 2019-05-31 14:45:37 +02:00
Heinrich Lee Yu ede97703ea Increase global karma timeout
Revert useless timeout added in karma spec
2019-05-29 13:01:15 +08:00
Heinrich Lee Yu d480fc5192 Increase timeout of flaky specs 2019-05-28 17:59:45 +08:00
Paul Gascou-Vaillancourt 911701ae47 Extract discussion notes into new component
- Moved discussion notes out of `NoteableDiscussion` component into a
new `DiscussionNotes` component
- Wrote Jest tests for the new `DiscussionNotes` component
- Updated Jest config for emojis fixtures
- Updated Karma tests `NoteableDiscussion` to match its new structure
- Convert `DiffDiscussions` tests to use Vue test utils
2019-05-01 10:04:07 +00:00
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