Commit Graph

73 Commits

Author SHA1 Message Date
Kushal Pandya 7544a555aa Add noteableType to mock data object 2018-04-06 14:26:40 +05:30
Filipa Lacerda 3e6e2ef60d
Removes eslint disabled comments 2018-03-29 18:56:19 +01: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
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 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
Filipa Lacerda b3daf108aa Merge branch 'fix-duplicate-notes' into 'master'
Fixed issue notes being duplicated

Closes #44099

See merge request gitlab-org/gitlab-ce!17671
2018-03-12 15:48:04 +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
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
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 2ee08f4770 Resolve "Cancelling a second comment edit doesn't return its state to before the edit" 2018-02-07 21:45:53 +00:00
Achilleas Pipinellis 85940d766a
Default to HTTPS for all Gravatar URLs
If using gravatar.com, both plain_url and ssl_url in settings are now
served via HTTPS. Make this the default.
2018-01-25 10:00:46 +01: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
Filipa Lacerda 1245d35f14 Merge branch 'main-js-tidy-up' into 'master'
Tidy up main JS file

See merge request gitlab-org/gitlab-ce!16007
2018-01-11 18:40:22 +00:00
Phil Hughes ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Yorick Peterse d0b8f536a1
Remove soft removals related code
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.

This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
2018-01-08 17:04:45 +01: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
Filipa Lacerda 12d275adce Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'
Disable comment textarea while submitting a new comment.

Closes #37858

See merge request gitlab-org/gitlab-ce!14541
2017-10-04 08:30:07 +00:00
Fatih Acet cba95d9e32 Add tests for handle save method of the comment form. 2017-10-03 15:07:37 +03: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
Fatih Acet d9a3bbce61 IssueNotes: Resize comment form after note submit and discard. 2017-09-21 03:08:17 +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
Douwe Maan 9c22974cd1 Rename a few attribute suffixes from `_url` to `_path` 2017-08-17 19:25:56 +02:00
Douwe Maan 99ba5d0d50 Remove view=full_data from NotesController 2017-08-17 18:55:04 +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
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 cedee01240 Adds missing unit tests for vue components: issue_note_awards_list; issue_note_body; issue_note_form;issue_note_spec 2017-08-11 19:54:58 +01:00
Filipa Lacerda cf77cdba51 Adds unit tests for discussion component 2017-08-11 19:54:58 +01:00