Commit Graph

89 Commits

Author SHA1 Message Date
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 8047b00fb6 Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
2018-08-01 15:26:57 +01:00
André Luís c7cd9ee97c Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"
This reverts commit 5ba542b109, reversing
changes made to 32c831ea2b.
2018-08-01 13:45:15 +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
Fatih Acet c12ad01693
Fix failing specs :fingers-crossed: 2018-07-18 12:55:56 +02: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
Brett Walker 750af9fd32 Use proper markdown rendering for previews 2018-07-06 18:49:33 +00: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
Constance Okoghenun dea03a0815 Resolve "Remove “commented” from comment system notes" 2018-06-19 16:43:57 +00:00
Andreas Kämmerle 88808a1fd4 Replace ... with ellipsis in placeholders 2018-06-11 09:21:04 +02:00
Mark Chao 7c965a24f5 Fix spec 2018-06-06 20:57:15 +09:00
Jose Ivan Vargas 993438ada9 Support smarter system notes 2018-06-05 08:11:13 +00:00
Bob Van Landuyt 04c7d0d555 Prevent awarding emoji when a project is archived
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-11 10:51:43 +02:00
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