| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Also removes specs related to the flag
|
| | |
|
| |
|
|
|
| |
We need this to be able to distinguish between Markdown tables and diff
tables.
|
| | |
|
| |
|
|
| |
Makes discussion expansion depend on `discussion.expanded`
|
| |\
| |
| |
| |
| |
| |
| | |
Display draft when toggling replies
Closes #48211 and #56364
See merge request gitlab-org/gitlab-ce!25563
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Also sets default selectedValue for discussion filter when not logged in
|
| | | |
|
| |/
|
|
| |
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
|
| | |
|
| |
|
|
| |
Transforms notes when the note was transformed in some other tab
|
| |
|
|
| |
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
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Fix `import_github_repo_spec.rb`
Closes #55700
See merge request gitlab-org/gitlab-ce!25133
|
| | |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| | |
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.
|
| |/ |
|
| |
|
|
| |
Backports template and Vue changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9632 to CE
|
| |
|
|
| |
Move convertToDiscussion call from ReplyButton to NoteApp component
|
| |
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
|
| |\
| |
| |
| |
| |
| |
| | |
Correctly align resolved discussion text
Closes #55206
See merge request gitlab-org/gitlab-ce!25001
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The header of the `NoteableDiscussion` component is really a media
object[1], but it didn't have the right DOM or styling to correctly
achieve it.
This change wraps all the children of the media object (except the
floated image) in a dedicated `.timeline-content` element, which is
styled to establish its own block formatting context[2]. This ensures
*all* of its children sit left-aligned to the right edge of the float.
In short, the DOM used to look like this:
.discussion-header
.timeline-icon
note-header
note-edited-text
and now it looks like this:
.discussion-header
.timeline-icon
.timeline-content (with own formatting context)
note-header
note-edited-text
This is also now more consistent with the DOM of `NoteableNote`, in that
`.timeline-icon` and `.timeline-content` seem to want to be siblings.
[1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/
[2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
|
| | |
| |
| |
| | |
Removed the `note-text` class since it conflicted other classes.
|
| | |
| |
| |
| |
| | |
Sets `updated_at` so that the transformed note is returned together with
the new reply
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Resolve "Tool Tip Hides Menu Item"
Closes #55209
See merge request gitlab-org/gitlab-ce!24285
|
| | | |
|
| | | |
|
| |/
|
|
|
|
| |
- Tooltips, by default, will display at the top of the element, instead
of at the bottom
- Note actions and emoji awards tooltips are now top-positioned
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Remove Redcarpet markdown engine
Closes #51374
See merge request gitlab-org/gitlab-ce!24819
|
| | |
| |
| |
| |
| | |
This engine was replaced with CommonMarker in 11.4, it was deprecated
since then.
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
'master'
Refactor/56369 extract jump to next discussion button
Closes #56369
See merge request gitlab-org/gitlab-ce!24506
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. Presents the system error message when available,
when applying suggestions
2. Adjusts target branch updates affecting MRs pointing
to it when there are previously created suggestions in
the MR. We just need to compare the HEAD shas from
position and MR source branch.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Resolve "Commit comments displayed on a merge request that contains that commit no longer specify which commit they come from"
Closes #53950
See merge request gitlab-org/gitlab-ce!24427
|
| | | |
| | |
| | |
| | | |
Unified commit link in note header action text
|
| | | |
| | |
| | |
| | | |
Ensured that sentence order is preserved when translating
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
- Removed use of v-html
- Removed HTML content from the computed property
|
| | |/
| |
| |
| |
| | |
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| |/
|/|
| |
| | |
Add a string externalisation in note form
See merge request gitlab-org/gitlab-ce!24514
|
