549ee8ada3
Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'
...
Resolve "Ctrl+Enter immediately adds MR comment"
See merge request gitlab-org/gitlab-ce!24053
2019-01-07 17:27:16 +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
98ad22d2aa
Added handleKeySubmit method to match EE
2019-01-07 08:56:32 +00:00
d3c73487c5
Collapsible Comments Test for Issues
2019-01-03 14:57:51 +00: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
0817c21067
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
...
This reverts merge request !23622
2018-12-21 17:00:26 +00:00
80ff142c1c
Merge branch 'winh-merge-request-commit-context' into 'master'
...
Display commit ID for discussions made on merge request commits
Closes #53953
See merge request gitlab-org/gitlab-ce!23837
2018-12-21 05:28:57 +00: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
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
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
a2e9ad83f4
Display reply field if resolved discussion has no replies
2018-12-14 11:49:53 +00:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00: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
71209c91f0
Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master'
...
Remove boxes around code comments
Closes #54030 and #54058
See merge request gitlab-org/gitlab-ce!23092
2018-12-11 14:18:52 +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
63e2c97b36
Remove boxes around code comments
2018-12-10 14:45:27 +02:00
85daddbec9
Resolve "Navigating unresolved discussions on Merge Request page"
2018-12-08 07:19:03 +00:00
ddd4cc649f
Resolve "Extended user centric tooltips"
2018-12-08 03:12:23 +00:00
1e3881b000
Updated ajax error message with returned errors
2018-12-07 12:31:36 +00:00
1cae0af4b8
Fix collapsing discussion replies
2018-12-04 10:09:51 +00:00
b6e70c8ae4
Merge branch 'winh-timeline-entry-component' into 'master'
...
Extract shared timeline entry component
See merge request gitlab-org/gitlab-ce!23447
2018-11-30 09:27:27 +00:00
e3bddb6223
Replace existing uses of timeline-entry with timeline entry component
2018-11-29 23:15:40 +01:00
77c2677735
Merge branch 'draft-design-improvements-backport' into 'master'
...
Backport of draft-design-improvements changes
See merge request gitlab-org/gitlab-ce!23438
2018-11-29 16:10:36 +00:00
ac1badb4db
Display commit ID for commit diff discussion on merge request
2018-11-29 14:31:34 +01:00
662a3c335b
Backport of draft-design-improvements changes
2018-11-29 12:03:33 +00:00
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
e6cf3c7a6f
Allow commenting to resolved non-diff discussions
2018-11-22 15:45:28 +01:00
5b9495c5db
Prettify all the things
2018-11-20 09:30:01 -06:00
8b1f2823a2
Use @gitlab npm namespace
2018-11-16 19:29:11 +00:00
234563ba30
Made diff & note data consistent
...
This caused many pain points when working with it.
Part of the data was camel cased the other snake case.
Other parts where snake case & then getting converted in components,
this conversion has the potential for leaking memory.
This changes that & makes it consistent with what it returned from the
API, snake case.
2018-11-14 19:16:46 +00:00
f93539af26
Merge branch 'discussion-perf-improvement' into 'master'
...
Improve initial rendering of discussion notes
See merge request gitlab-org/gitlab-ce!22607
2018-11-12 14:48:13 +00:00
a597103ad5
Fix alignment of diff comment buttons
2018-11-09 09:37:00 -06:00
5796221bc4
Fix TaskList init on update & poll
...
Fixed duplicate TaskList requests being made
2018-11-09 11:04:13 +00:00
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
1519c3470c
Stop multiple discussion requests
...
With multiple discussion requests we loose the reactivity of the
previously stored discussions state.
This means that certain features, toggling line discussions for example,
are no longer reactive.
2018-11-08 10:42:11 +00:00
cd5ddc4f2e
Discussions redesign
2018-11-08 07:58:45 +00:00
28840d3f5c
Copy changes for abuse clarity
2018-11-07 11:24:36 +00:00
c4aa33fc8b
Remove gitlab-ui loading icon from global
2018-11-07 10:06:15 +00:00
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
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
b4d005eb7b
Add 'only history' option to notes filter
2018-11-05 12:30:14 +00:00
2ae6c47ddd
Merge branch 'qa-batch-comments-e2e-tests' into 'master'
...
QA Selectors for Batch Comment E2E Automation
See merge request gitlab-org/gitlab-ce!22681
2018-11-05 11:34:10 +00:00
7f47e13218
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
...
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
2018-11-01 10:34:23 +00:00
733ae94921
Fix typos in comments and specs
2018-11-01 08:59:20 +02:00
160157a92b
Prettify remaining files with differences in CE and EE
2018-10-31 14:33:12 -05:00
25b658cf65
QA Selectors for Batch Comment E2E Automation
2018-10-30 14:42:50 +05:30
75847b55a1
Adding tests for filtering activities/comments in issues
2018-10-30 07:48:49 +00:00
df587c15c4
Update gitlab-ui to 1.9.0
2018-10-29 23:16:10 +00:00
0efbc126d0
Merge branch 'master' into 'prettify-all-the-things-4'
...
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
2018-10-26 00:45:03 +00:00
Phil Hughes
Constance Okoghenun
Natalia Tepluhina
Ramya Authappan
Winnie Hellmann
Kushal Pandya
Fatih Acet
sbigelow
Oswaldo Ferreira
Filipa Lacerda
Annabel Dunstone Gray
André Luís
Tim Zallmann
Mike Greiling
Clement Ho
Jeremy Watson
Felipe Artur
Nick Thomas
Achilleas Pipinellis
George Tsiolis