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
Display `formatter` as the sole content of `position` object.
This means `diff_file` data is not referenced, which is the
caseu of "IOError: not opened for reading".
After resolving a discussion on a merge request page the merge request
widget state would not get updated meaning users would need to refresh
the page to merge (if that option is enabled in the projects settings)
https://gitlab.com/gitlab-org/gitlab-ce/issues/42882
* master: (38 commits)
Update bitbucket.md to fix typo and small grammar touchups.
Update time_helper.rb to fix output for exact minutes.
Document update for GitLab Pages users.
Support manually stopping any environment from the UI
Fix link to frontend in handbook
Shorten CHANGELOG filename to avoid breaking ecryptfs users
Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
Fix mountComponent helper path in docs
Fix#48537 - Update avatar only via the projects API
Add additional headline for Adding SSH keys to GitLab
Request to be a proofreader.
Fix specs
Fix search bar text input alignment
Fix API docs on unauthenticated projects return
Adds with_projects optional parameter to /groups/:id API endpoint
Docs: make it clear that you need a completely separate domain for Pages
Document that we don't want to wait in tests
Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor
Remove useless return
Use latest gitlab-styles
...
* master: (29 commits)
Fix provider server URL used when listing repos to import
Fix inconsistent punctuation on MR form
Update dependency for svgs
Fix timestamp to include %M instead of %I for post-deploy migrations.
Use Gitaly 0.89.0
Resolve "Hover style for sidebar dropdowns is wrong"
fixed spec
Respect the protocol in `expose_url`
Fix removes source branch text being rendered in merged state
Fix code and wiki search results when filename is non-ASCII
Include the ee/ directory in backtraces
Use GitLab fork of zaproxy
Updates file extensions on Vue docs
fixed note polling not sending updated last fetched at date added spec for polling
Add changelog entry
Use `list.id` for `:key`
added mutation spec
Bump parser and unparser gems to remove warnings
fix polling not working correctly
Fixed issue notes being duplicated
...
Phil Hughes
Fatih Acet
Jeremy Watson
Filipa Lacerda
Felipe Artur
Achilleas Pipinellis
George Tsiolis
Mike Greiling
Oswaldo Ferreira
Johann Hubert Sonntagbauer
Mark Chao
Jan Provaznik
🌴🇿🇦 Lukas Eipert (OOO until Summit)
André Luís
André Luís
Brett Walker
Simon Knox
Constance Okoghenun
Andreas Kämmerle
Jose Ivan Vargas
Bob Van Landuyt
Kushal Pandya
Simon Knox