Commit Graph

50 Commits

Author SHA1 Message Date
Winnie Hellmann 0625ccc652 Add failing test for saveNote error handling 2019-05-07 23:15:36 +02:00
Paul Slaughter d24d77a93a
Resolve discussion when suggestion is applied
- Adds color and a tooltip to describe this new behavior
- Does not resolve if discussion is already resolved
- Adds an action `resolveDiscussion` to simplify `toggleResolveNote`
- Updates docs

https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
2019-05-07 00:00:40 -05:00
Heinrich Lee Yu d72a61b41d Handle transformed notes from polling response
Transforms notes when the note was transformed in some other tab
2019-03-06 17:19:27 +08:00
Phil Hughes 3754111477
Move EE differences in CE diff files into CE
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
2019-03-01 09:34:16 +00:00
Takuya Noguchi a565f3d88d Fix misspellings in app/spec executable lines
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-02-27 22:41:34 +09:00
Constance Okoghenun 5e137b58ca Cancelling reply reverts comment to initial state
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
2019-02-18 08:16:13 +01:00
Heinrich Lee Yu f60734d3cb Fix polling for replies to individual notes
Sets `updated_at` so that the transformed note is returned together with
the new reply
2019-02-14 10:07:13 +00:00
Heinrich Lee Yu a04d9ba90c Add reply to notes to turn into discussions 2019-02-06 10:31:46 +00:00
Douwe Maan 03df54b226
Trim first char of diff line text on diff discussions
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.
2019-01-22 17:00:16 +01:00
Paul Slaughter 958aaebdde
Fix MR discussion counts being off
**What was the issue?**
Notes can be unresolved, but not resolvable. Without this, the
unresolvedDiscussionsCount was inflated.

**References**
https://gitlab.com/gitlab-org/gitlab-ce/issues/55138
2018-12-10 16:44:35 -06:00
André Luís 85daddbec9 Resolve "Navigating unresolved discussions on Merge Request page" 2018-12-08 07:19:03 +00:00
Phil Hughes 7aa8803083 Updated variable name to forceExpanded 2018-12-04 13:27:18 +00:00
Phil Hughes b8ee8c2787
Fixed multiple diff line discussions not expanding
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
2018-12-04 10:58:02 +00: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
Phil Hughes 84de687a7e
Fixed failing note actions spec 2018-11-09 13:38:51 +00:00
Felipe Artur b4d005eb7b Add 'only history' option to notes filter 2018-11-05 12:30:14 +00:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02: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
Phil Hughes 305ce57094
Added test for adding `truncated_diff_lines` to discussion 2018-09-20 10:23:36 +01:00
Filipa Lacerda ba40c7f1c3 Merge branch 'mr-widget-discussion-state-fix' into 'master'
Fixed MR widget unresolved discussions state

See merge request gitlab-org/gitlab-ce!21705
2018-09-17 08:20:19 +00:00
Phil Hughes a77a26eade
Use MR widget event_hub to dispatch update event
Instead of relying on a global method, we now emit an event on the MR
widget that tells it to check the status
2018-09-13 12:52:24 +01:00
Phil Hughes e12c2c77ce
Fixed resolved discussions not toggling expanded
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
2018-09-13 10:22:35 +01:00
Phil Hughes 8287f3477f
Fixed MR widget unresolved discussions state
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
2018-09-12 16:46:09 +01: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 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
Filipa Lacerda 135ead1d83
Merge branch 'master' into 48237-toggle-file-comments
* 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
  ...
2018-07-10 18:11:19 +01:00
Simon Knox 9dc6b03997 Resolve "MRs are showing some discussions as unresolved" 2018-07-05 22:10:38 +00:00
Fatih Acet d690cd9992 Prevent fetching diffs and discussions data unnecessarily on MR page 2018-06-29 07:22:07 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Jose Ivan Vargas 993438ada9 Support smarter system notes 2018-06-05 08:11:13 +00:00
Filipa Lacerda 470b8ca10a
Add dispatch mock to the test helper 2018-03-29 11:14:18 +01:00
Phil Hughes e26d20311c
fixed failinng tests after helper change 2018-03-29 10:44:38 +01:00
Filipa Lacerda 939c87233e Merge branch 'master' into 44149-issue-comment-buttons
* 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
  ...
2018-03-13 09:19:41 +00:00
Filipa Lacerda e84c943fa0
Fix loading icon being visible in the wrong button 2018-03-12 17:08:05 +00:00
Phil Hughes 63d3581e66
fixed note polling not sending updated last fetched at date
added spec for polling
2018-03-12 09:57:22 +00:00
Phil Hughes 98e31bf437
added mutation spec 2018-03-10 18:17:01 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Filipa Lacerda c33245e999
Reuse getter
Add loading button for better UX
2018-02-12 16:49:41 +00:00
Filipa Lacerda d637f87f88
Makes close/reopen issue request to inside the vue app 2018-02-09 18:56:41 +00:00
Simon Knox f8efaf1bf8 issue note store 2017-11-30 22:44:41 +00:00
Filipa Lacerda 07b0d933b5 Merge branch 'master' into 31050-registry-image-lists
* master: (112 commits)
  Replace the 'project/service.feature' spinach test with an rspec analog
  Removed two legacy config options
  Fix rendering double note issue.
  IssueNotes: Switch back to Write pane when note cancel or submit.
  Upgrade Nokogiri because of CVE-2017-9050
  Bump VERSION to 10.1.0-pre
  Standardize access to CSRF token in JavaScript
  Do not clone the repo when running the review-docs jobs
  Don't memoize storage configuration on `FsShardsCheck`
  Document that group Owners can always create subgroups
  Auto DevOps docs cleanup
  Display full pre-receive and post-receive hook output in GitLab UI
  Adds EE tag detection to remove_old in gitlab backup.
  Correctly detect multiple issue URLs after 'Closes...' in MR descriptions
  new sharing permissions
  IssueNotes: Resize comment form after note submit and discard.
  [skip ci] Add changelog
  Make resolve discussion icon gray
  update spacing
  Deleted another Fixture due to User Callout
  ...
2017-09-22 09:37:19 +01:00
Fatih Acet f22f75b752 Fix rendering double note issue. 2017-09-22 04:04:52 +03:00
Filipa Lacerda ee3cf5d6f3
[ci skip] Adds tests to vuex and collapsibe component
Formats dates
Fixes clipboard button
Simplifies HTML
2017-09-20 19:03:53 +01:00
Fatih Acet 479670df94 IssueNotesRefactor: Fix consistent typo. 2017-08-22 21:47:29 +03:00
Filipa Lacerda c7dbba8bf1 Adds tests for sync actions 2017-08-11 21:15:33 +01:00
Filipa Lacerda 8b01ef826d Adds helper to test Vuex actions 2017-08-11 20:58:20 +01:00
Filipa Lacerda cbddad5a2d Adds tests for mutations and getters 2017-08-11 19:54:58 +01:00
Filipa Lacerda 1c1fef7af3 [ci skip] Adds tests cases 2017-08-04 16:51:35 +01:00