root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
99,137 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

190 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
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
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
Heinrich Lee Yu 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
Phil Hughes 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
Fatih Acet 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
Winnie Hellmann 910c7f5f63 Refactor note_form_spec.js to use Vue test utils 2019-02-28 09:21:32 +01:00
Takuya Noguchi a565f3d88d Fix misspellings in app/spec executable lines 
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
 2019-02-27 22:41:34 +09: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
Constance Okoghenun 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
Heinrich Lee Yu 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
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
Phil Hughes 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
Simon Knox be485a781d Hide More Actions tooltip when the menu opens 2019-02-12 21:41:01 +11:00
Douglas Barbosa Alexandre 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
Jan Provaznik 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
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