e540c0d71e
Fixed test specs
...
- added suggestions to mock data
- fixed props to be not required
2019-04-04 13:08:34 +00:00
c17b7afa02
Remove reply_to_individual_notes feature flag
...
Also removes specs related to the flag
2019-04-03 10:00:18 +08:00
4f0b2079de
Upgraded Vue to 2.6.8
...
Upgrade to latest Version
2019-03-27 21:33:20 +00:00
4d1ac56518
Remove top-level mount from note_form_spec.js
2019-03-26 19:53:07 +01:00
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
53e23a296d
Pass autosaveKey from NoteableDiscussion to NoteForm
2019-03-21 17:14:44 +01:00
93c27c3b22
Validate NoteForm props in noteable_discussion_spec.js
2019-03-21 17:14:44 +01:00
f5ce678dfe
Use autosave utilities in NoteForm component
2019-03-21 17:14:44 +01:00
d72a61b41d
Handle transformed notes from polling response
...
Transforms notes when the note was transformed in some other tab
2019-03-06 17:19:27 +08:00
3754111477
Move EE differences in CE diff files into CE
...
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9974 , https://gitlab.com/gitlab-org/gitlab-ee/issues/9973 , https://gitlab.com/gitlab-org/gitlab-ee/issues/9969
2019-03-01 09:34:16 +00:00
1b85760467
Merge branch 'winh-note_form_spec-vue-test-utils' into 'master'
...
Refactor note_form_spec.js to use Vue test utils
See merge request gitlab-org/gitlab-ce!25571
2019-03-01 00:40:28 +00:00
910c7f5f63
Refactor note_form_spec.js to use Vue test utils
2019-02-28 09:21:32 +01:00
a565f3d88d
Fix misspellings in app/spec executable lines
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-02-27 22:41:34 +09:00
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
a26cd1235a
Extract ResolveWithIssueButton from NoteableDiscussion component
2019-02-25 16:38:29 +00:00
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
0e619d01b0
Move discussion_jump_to_next_button_spec.js to Jest
2019-02-21 10:53:00 +01:00
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
8441fc4799
Remove noteId prop from ReplyButton component
...
Move convertToDiscussion call from ReplyButton to NoteApp component
2019-02-18 09:43:13 +00:00
5e137b58ca
Cancelling reply reverts comment to initial state
...
When converting a comment to a discussion
if the "Cancel" button is used to exit the new discussion note,
the comment would revert back to its initial state
2019-02-18 08:16:13 +01:00
f60734d3cb
Fix polling for replies to individual notes
...
Sets `updated_at` so that the transformed note is returned together with
the new reply
2019-02-14 10:07:13 +00:00
7430149d4d
Convert noteable_note_spec.js to Vue test utils
...
(cherry picked from commit 861f93e6fc
2019-02-12 20:55:56 +00:00
3537f12fc8
Merge branch '55209-tool-tip-hides-menu-item' into 'master'
...
Resolve "Tool Tip Hides Menu Item"
Closes #55209
See merge request gitlab-org/gitlab-ce!24285
2019-02-12 11:31:37 +00:00
be485a781d
Hide More Actions tooltip when the menu opens
2019-02-12 21:41:01 +11:00
05033177d7
Merge branch 'local-markdown-version' into 'master'
...
Add local markdown version
Closes #32789
See merge request gitlab-org/gitlab-ce!24822
2019-02-07 12:58:38 +00:00
433bcf9b04
Add local markdown version
...
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).
2019-02-06 19:46:59 +01:00
2ab083aba6
Revert "Convert noteable_note_spec.js to Vue test utils"
2019-02-06 14:15:45 +01:00
a04d9ba90c
Add reply to notes to turn into discussions
2019-02-06 10:31:46 +00:00
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
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
63975b4a68
Extract ReplyPlaceholder from NoteableDiscussion component
2019-02-05 08:56:34 +00:00
647f045dde
Convert note_app_spec.js to Vue test utils
2019-02-04 13:19:53 +01:00
861f93e6fc
Convert noteable_note_spec.js to Vue test utils
2019-01-30 17:34:06 +01:00
d8e18a743e
Convert noteable_discussion_spec.js to Vue test utils
2019-01-29 20:06:33 +01:00
56c62208f6
refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from
2019-01-28 22:44:17 +00:00
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
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
8e6d2cca24
Convert note_actions_spec.js to Vue test utils
2019-01-25 10:59:22 +01:00
6e085eea53
Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'
...
Bump CI image to use Chrome 71.0 and Golang 1.11
Closes #56614 and #55578
See merge request gitlab-org/gitlab-ce!24572
2019-01-24 16:25:31 +00:00
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
03df54b226
Trim first char of diff line text on diff discussions
...
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.
2019-01-22 17:00:16 +01:00
211c946a67
Discussion filters - ensured note links resolves to the right note
2019-01-10 14:00:36 +00:00
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
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
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
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
1272b5fadc
Make commit IDs in merge request discussion header monospace
2018-12-11 10:22:00 +00:00
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
958aaebdde
Fix MR discussion counts being off
...
**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
2018-12-10 16:44:35 -06:00
85daddbec9
Resolve "Navigating unresolved discussions on Merge Request page"
2018-12-08 07:19:03 +00:00
Oswaldo Ferreira
Heinrich Lee Yu
Tim Zallmann
Winnie Hellmann
Phil Hughes
Fatih Acet
Takuya Noguchi
Kushal Pandya
Constance Okoghenun
Simon Knox
Douglas Barbosa Alexandre
Jan Provaznik
Martin Hobert
Clement Ho
Lukas Eipert
Douwe Maan
Constance Okoghenun
Filipa Lacerda
Paul Slaughter
André Luís