Commit Graph

73 Commits

Author SHA1 Message Date
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +00:00
Jeremy Watson 28840d3f5c Copy changes for abuse clarity 2018-11-07 11:24:36 +00:00
Filipa Lacerda e1e315ee28 Merge branch 'mr-image-commenting' into 'master'
Re-implemented image commenting on diffs

Closes #48956

See merge request gitlab-org/gitlab-ce!22443
2018-11-07 10:04:54 +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
Felipe Artur b4d005eb7b Add 'only history' option to notes filter 2018-11-05 12:30:14 +00:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Oswaldo Ferreira 86ead874e2 Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" 2018-10-23 09:49:45 +00:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Johann Hubert Sonntagbauer 2a76e04091 enable jasmine/new-line-between-declarations 2018-10-09 19:01:49 +02:00
Fatih Acet e3b96ad76b
Fix placeholder note rendering 2018-10-03 13:29:14 +02:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
André Luís 296f489d85 Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
2018-08-01 15:26:57 +01:00
André Luís 8047b00fb6 Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
2018-08-01 15:26:57 +01:00
André Luís c7cd9ee97c Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit 5ba542b109, reversing
changes made to 32c831ea2b.
2018-08-01 13:45:15 +01:00
André Luís 8693aa139d Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"
This reverts commit ced005f330, reversing
changes made to 9b01b293ce.
2018-08-01 13:45:15 +01:00
André Luís f2f8ddf4cc Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" 2018-07-20 15:24:46 +00:00
Fatih Acet c12ad01693
Fix failing specs :fingers-crossed: 2018-07-18 12:55:56 +02:00
Simon Knox 9dc6b03997 Resolve "MRs are showing some discussions as unresolved" 2018-07-05 22:10:38 +00: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
Andreas Kämmerle 88808a1fd4 Replace ... with ellipsis in placeholders 2018-06-11 09:21:04 +02:00
Mark Chao 7c965a24f5 Fix spec 2018-06-06 20:57:15 +09: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
Simon Knox 39ee707c0a Don't show Jump to Discussion button on issue notes 2018-03-28 16:11:06 +11:00
George Tsiolis 85ce8c7e22 Update spec import path for vue mount component helper 2018-03-20 18:58:29 +02:00
Mike Greiling c1708514f5
move render_gfm into behaviors directory 2018-03-19 23:07:46 -05:00
Filipa Lacerda e84c943fa0
Fix loading icon being visible in the wrong button 2018-03-12 17:08:05 +00: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
Phil Hughes 8ab611509a Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master'
Fix Ctrl+Enter keyboard shortcut saving comment/note edit

Closes #41956

See merge request gitlab-org/gitlab-ce!16415
2018-01-12 09:50:53 +00:00
Eric Eastwood 333c1723ab Fix Ctrl+Enter keyboard shortcut saving comment/note edit
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956
2018-01-11 20:28:56 -06:00
Phil Hughes ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Filipa Lacerda ba5b539548 Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'
Stop "ERROR: TypeError{}" from being logged to the console and fail tests

Closes #37619

See merge request gitlab-org/gitlab-ce!15830
2017-12-12 10:49:50 +00:00
Eric Eastwood 05e61c369e Use shared interceptor in note specs 2017-12-11 17:21:07 -06:00
Fatih Acet 8d739237de Merge branch 'issue-note-rename' into 'master'
rename remaining issue_ prefixed files

See merge request gitlab-org/gitlab-ce!15818
2017-12-11 21:56:50 +00:00
Eric Eastwood 9469979a91 Try to clean up legit Vue error that was patched over
See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
2017-12-10 05:10:38 -06:00
Fatih Acet f4fbe61a9e Merge branch 'note-preview' into 'security-10-2'
prevent potential XSS when editing comment

See merge request gitlab/gitlabhq!2238

(cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c)

7480e462 prevent potential XSS when editing comment
2017-12-08 13:48:23 -08:00
Simon Knox 874deb4142 rename remaining issue_ prefixed files 2017-12-09 07:24:52 +11:00
Simon Knox bf85a90037 issue note component rename 2017-12-04 16:19:07 +00:00
Simon Knox f8efaf1bf8 issue note store 2017-11-30 22:44:41 +00:00
Luke "Jared" Bennett 8ba8800660
Disable issue action button whilst submitting and test 2017-11-06 11:42:11 +00:00
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00:00
Filipa Lacerda 1ab8aeeefd
Moves placeholders components into shared folder with documentation. Makes them easier to reuse in MR and Snippets comments 2017-10-19 10:39:47 +01:00
Fatih Acet cba95d9e32 Add tests for handle save method of the comment form. 2017-10-03 15:07:37 +03:00
Fatih Acet d9a3bbce61 IssueNotes: Resize comment form after note submit and discard. 2017-09-21 03:08:17 +03:00
Douwe Maan 9c22974cd1 Rename a few attribute suffixes from `_url` to `_path` 2017-08-17 19:25:56 +02:00
Fatih Acet 5604348fcc IssueNotesRefactor: Implement missing attachment image. 2017-08-16 21:23:59 +03:00
Filipa Lacerda 1e41440b0b Fix broken tests 2017-08-12 00:35:44 +01:00