Commit Graph

215 Commits

Author SHA1 Message Date
GitLab Bot 6755df108b Add latest changes from gitlab-org/gitlab@master 2020-01-21 00:08:46 +00:00
GitLab Bot 0ba3a054d2 Add latest changes from gitlab-org/gitlab@master 2020-01-10 09:07:49 +00:00
GitLab Bot 969ce9efdb Add latest changes from gitlab-org/gitlab@master 2019-12-30 15:09:15 +00:00
GitLab Bot 8b61452138 Add latest changes from gitlab-org/gitlab@master 2019-12-20 15:07:34 +00:00
GitLab Bot 7f8330873c Add latest changes from gitlab-org/gitlab@master 2019-12-18 21:07:37 +00:00
GitLab Bot 123c68a7cf Add latest changes from gitlab-org/gitlab@master 2019-12-16 18:08:22 +00:00
GitLab Bot 47b8f79a08 Add latest changes from gitlab-org/gitlab@master 2019-12-13 00:08:05 +00:00
GitLab Bot 93c6764dac Add latest changes from gitlab-org/gitlab@master 2019-12-09 12:07:58 +00:00
GitLab Bot bd8a202da6 Add latest changes from gitlab-org/gitlab@master 2019-11-27 00:06:23 +00:00
GitLab Bot 581c10e344 Add latest changes from gitlab-org/gitlab@master 2019-11-26 18:06:33 +00:00
GitLab Bot ea4762d464 Add latest changes from gitlab-org/gitlab@master 2019-11-22 18:06:00 +00:00
GitLab Bot 3fc9a8e695 Add latest changes from gitlab-org/gitlab@master 2019-11-15 12:06:12 +00:00
GitLab Bot 6d31b8f052 Add latest changes from gitlab-org/gitlab@master 2019-11-12 18:06:57 +00:00
GitLab Bot a58529a3f5 Add latest changes from gitlab-org/gitlab@master 2019-11-11 03:06:13 +00:00
GitLab Bot 133924c6cc Add latest changes from gitlab-org/gitlab@master 2019-10-11 00:06:24 +00:00
GitLab Bot 4e9f718e19 Add latest changes from gitlab-org/gitlab@master 2019-09-26 15:06:18 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot a93dfc1b7e Add latest changes from gitlab-org/gitlab@master 2019-09-14 00:06:25 +00:00
Samantha Ming 589c8d5625 Hide resolve thread button from guest
- Show if user can_resolve all of the notes
2019-09-12 07:41:19 +00:00
Igor Drozdov 72544449cf Change the way totalNotes is calculated
totalNotes is only used to prerender a number of
skeleton containers until real notes are loaded

issuable.discussions makes multiple requests, so
too expensive for this

This commit uses mere notes for this and sends
actual totalNotes number if it's less than 10;
otherwise it sends 10 - it allows us to avoid
bunch of skeleton prerenderings, which are not
necessary since they doesn't fit into the whole
screen and disappear quite fast
2019-08-28 08:30:13 +03:00
Patrick Derichs a13abd6731 Add edit_note and spec for editing quick actions
Call QuickActionsService on Note update

Add support for notes which just contain
commands after editing

Return http status gone (410) if note was deleted

Temporary frontend addition so it is not
failing when a note is deleted

Move specs to shared examples

Fix rubocop style issue

Deleting note on frontend when status is 410

Use guard clause for note which got deleted

Simplified condition for nil note

This method should no longer be called
with nil note

Refactoring of execute method to reduce
complexity

Move errors update to delete_note method

Note is now deleted visually when it only
contains commands after update

Add expectation

Fix style issues

Changing action to fix tests

Add tests for removeNote and update
deleteNote expectations
2019-08-26 09:20:00 +00:00
Arun Kumar Mohan b179b752e8 Refactor nextUnresolvedDiscussionId and previousUnresolvedDiscussionId getters 2019-08-15 14:07:20 -05:00
Sam Bigelow eba4422803 Add kbd shortcuts for discussion navigation
Add keyboard shortcuts `p` and `n` to navigate duscussions.
2019-08-12 06:41:04 +00:00
Heinrich Lee Yu b689ddd9b6 Do not persist notes filter when auto-switching
Send a `persist_filter: false` param to backend when
opening links to notes and auto-switching to show
all notes
2019-08-07 15:45:23 +00:00
jboyson1 d90865a960 Backport from EE 2019-08-01 16:00:36 -05:00
Natalia Tepluhina 6911c3435a Resolve "Tooltips on note timestamps not showing for issues" 2019-07-18 13:16:18 +00:00
Winnie Hellmann 49d5cc34ca Remove deleteNote from notes service 2019-07-10 16:48:15 +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
Winnie Hellmann 23bd46cf01 Remove applySuggestion from notes service 2019-07-05 22:59:30 +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
Winnie Hellmann c2429ed553 Fix typo in updateResolvableDiscussionsCounts action 2019-07-02 23:11:13 +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 4bf0434359 Rearrange discussion resolve buttons & update button display
- next-discuss button is always show unless there is only 1 discussion
- regroup buttons arrangements
2019-06-28 07:32:03 +00: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
Winnie Hellmann 0625ccc652 Add failing test for saveNote error handling 2019-05-07 23:15:36 +02:00
Paul Slaughter d24d77a93a
Resolve discussion when suggestion is applied
- Adds color and a tooltip to describe this new behavior
- Does not resolve if discussion is already resolved
- Adds an action `resolveDiscussion` to simplify `toggleResolveNote`
- Updates docs

https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
2019-05-07 00:00:40 -05: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
Oswaldo Ferreira e540c0d71e Fixed test specs
- added suggestions to mock data
- fixed props to be not required
2019-04-04 13:08:34 +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