Commit Graph

53 Commits

Author SHA1 Message Date
GitLab Bot 000087abd5 Add latest changes from gitlab-org/gitlab@master 2020-07-16 06:09:33 +00:00
GitLab Bot ff430539d5 Add latest changes from gitlab-org/gitlab@master 2020-07-13 15:09:08 +00:00
GitLab Bot 83fc2f3dc8 Add latest changes from gitlab-org/gitlab@master 2020-07-08 21:09:09 +00:00
GitLab Bot a2dbe2a8d8 Add latest changes from gitlab-org/gitlab@master 2020-06-16 21:08:20 +00:00
GitLab Bot f3e7bc8060 Add latest changes from gitlab-org/gitlab@master 2020-06-02 18:08:32 +00:00
GitLab Bot ec884edd46 Add latest changes from gitlab-org/gitlab@master 2020-06-01 06:08:21 +00:00
GitLab Bot 680d188025 Add latest changes from gitlab-org/gitlab@master 2020-05-19 21:08:05 +00:00
GitLab Bot c7ad2610df Add latest changes from gitlab-org/gitlab@master 2020-05-14 09:07:53 +00:00
GitLab Bot 143f7be045 Add latest changes from gitlab-org/gitlab@master 2020-05-12 06:09:37 +00:00
GitLab Bot c6f0b221b7 Add latest changes from gitlab-org/gitlab@master 2020-05-12 00:10:11 +00:00
GitLab Bot 79ddf16358 Add latest changes from gitlab-org/gitlab@master 2020-05-08 06:09:40 +00:00
GitLab Bot 0c6bc5443a Add latest changes from gitlab-org/gitlab@master 2020-02-07 21:08:39 +00:00
GitLab Bot b86f474bf5 Add latest changes from gitlab-org/gitlab@master 2019-12-11 12:08:10 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00: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
Ezekiel Kigbo 0c028a816b Vue-i18n: app/assets/javascripts/notes directory
i18n linting for .vue files under the
app/assets/javascripts/notes directory
2019-07-04 10:20:38 +00:00
Nathan Friend bee3c7e847 Comply with `no-implicit-coercion` rule (CE)
This commit is the result of running `yarn eslint --fix` after enabling
the `no-implicit-coercion` ESLint rule.  This rule has been added to
our ESLint config here:

https://gitlab.com/gitlab-org/gitlab-eslint-config/merge_requests/14
2019-06-03 22:51:02 +00:00
Winnie Hellmann aea013eab9 Move NoteApp tests to Jest 2019-06-03 14:36:34 +00:00
Phil Hughes b6a23caceb
Fixed EE differences in noteable_note.vue
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9972
2019-04-09 09:18:45 +01:00
Sergiu Marton 52f9315192 Fix comment typo 2019-04-02 10:33:21 +00:00
Sanad Liaquat ddef2f1fbd Update GitHub Import test
Removes the unnecessary :orchestrated tag and updates a few
selectors. Also wait_for_success for import before proceeding.
The test is currently placed in quarantine because of a bug.
2019-02-25 18:37:27 +05: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
Heinrich Lee Yu a04d9ba90c Add reply to notes to turn into discussions 2019-02-06 10:31:46 +00:00
Constance Okoghenun a8dcc181da Updated i18n format for note header commit link
Unified commit link in note header action text
2019-01-24 19:48:41 +01:00
Constance Okoghenun 8322495027 Updated i18n for discussion note commit SHA
Ensured that sentence order is preserved when translating
2019-01-23 07:14:21 +01:00
Constance Okoghenun 993616a6c4 Added i18n to discussion note commit SHA 2019-01-22 13:14:08 +01:00
Constance Okoghenun 682a43932d Refactored implementation of discussion note header
- Removed use of v-html
- Removed HTML content from the computed property
2019-01-18 22:00:17 +01:00
Constance Okoghenun c1c0c0c21b Display "commented" only for commit discussions on merge requests
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
2019-01-17 12:15:33 +01:00
Winnie Hellmann 0817c21067 Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
This reverts merge request !23622
2018-12-21 17:00:26 +00:00
Winnie Hellmann 6aed2212bd Display "commented" only for commit discussions on merge requests
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
2018-12-19 23:54:54 +01:00
sbigelow 45203dc4b0 Add message saying who resolved nondiff discussion
- Add resolution text to notes in MR Discussions
- Use slots to do so
2018-12-17 09:45:27 -05:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Winnie Hellmann e3bddb6223 Replace existing uses of timeline-entry with timeline entry component 2018-11-29 23:15:40 +01: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
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06:00
Phil Hughes cfedc31b7a
Improve initial rendering of discussion notes
This improves the initial rendering performance of notes
by only creating a new TaskList for the whole app,
rather than on a per-note component basis.
2018-11-09 09:55:37 +00:00
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +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
André Luís 8e5c0e68ec Backport CE changes for: [Frontend only] Batch comments on merge requests 2018-10-06 17:16:40 +00:00
Tim Zallmann 173ecfc42b Delete Discussions fix 2018-09-07 12:25:50 +02:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Constance Okoghenun dea03a0815 Resolve "Remove “commented” from comment system notes" 2018-06-19 16:43:57 +00:00
gfyoung bce890820f Enable no-restricted-globals in JS files 2018-06-15 15:58:27 +00:00
Filipa Lacerda 647a4d6a3b
Updates eslint vue plugin version 2018-06-11 15:36:54 +01:00
Bob Van Landuyt 04c7d0d555 Prevent awarding emoji when a project is archived
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-11 10:51:43 +02:00
Fatih Acet fdc9ae2edf
Prettify notes. 2018-03-16 23:16:21 +03:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Simon Knox 2ee08f4770 Resolve "Cancelling a second comment edit doesn't return its state to before the edit" 2018-02-07 21:45:53 +00:00
Filipa Lacerda cdc4938834
[ci skip] Fix more rules 2018-01-05 00:45:32 +00:00