Commit Graph

219 Commits

Author SHA1 Message Date
Simon Knox 8fa001e760 Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" 2018-03-13 12:01:36 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Jacob Schatz 35c8fd5586 Update to jQuery 3. 2018-02-20 22:20:48 +00:00
Clement Ho 0cc87e5f6d Remove duplicate axios import 2018-02-02 12:28:13 -06:00
Filipa Lacerda 8fa2932dc5 Merge branch 'ph-axios-2' into 'master'
More conversions to axios

See merge request gitlab-org/gitlab-ce!16800
2018-02-02 18:12:12 +00:00
Phil Hughes 1c8553f21e
Converted notes.js to axios 2018-02-01 10:50:18 +00:00
Phil Hughes 4377b4795f
remove useless ajaxPost method 2018-02-01 09:14:53 +00:00
Phil Hughes 641f1d2c4b
Converted common_utils to axios 2018-01-31 10:14:55 +00:00
Phil Hughes eaf2f48dc7
Export and use Notes ES module 2017-12-15 16:33:36 +00:00
Filipa Lacerda 3c19c971df
Merge branch 'master' into 38869-datetime
* master: (112 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...
2017-12-11 19:42:58 +00:00
Phil Hughes 6bb4442054
updated imports 2017-12-11 12:28:11 +00:00
Phil Hughes e0bbadc2d2
use exported methods instead of gl.utils 2017-12-08 08:54:51 +00:00
Filipa Lacerda 139ce1c445
Export date utility functions as ES6 modules 2017-12-07 11:09:17 +00:00
Filipa Lacerda 46dc343f60 Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'
Added discussion_line_code value to note response and use it to query the right…

Closes #38677

See merge request gitlab-org/gitlab-ce!14981
2017-11-06 09:55:02 +00:00
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00:00
Luke "Jared" Bennett 2f130527c0
FE review changes - remove internal details assertion and look for closest form if no discussion_line_code 2017-10-27 20:43:04 +01:00
Mike Greiling f7bdfe5098 Merge branch 'master' into 'es-module-autosave'
# Conflicts:
#   app/assets/javascripts/issuable_form.js
#   app/assets/javascripts/notes.js
2017-10-24 07:52:21 +00:00
Luke "Jared" Bennett 1ae013dad5
Fix karma 2017-10-23 14:37:32 +01:00
Luke "Jared" Bennett 3176eb83b6
Added discussion_line_code value to note response and use it to query the right row for the discussion UI 2017-10-21 16:19:04 +01:00
Ben Boeckel 1d30e5e964 notes.js: use the original content when resetting the form
Otherwise, when an error occurred, the content was escaped and
re-escaped on every error.

Fixes #37724
2017-10-19 13:31:51 -04:00
Ben Boeckel d0630ed38d notes.js: also return the original content when getting form data 2017-10-19 11:48:30 -04:00
Filipa Lacerda 6ffd34897d Remove dropzoneInput from global namespace 2017-10-19 07:45:52 +00:00
Mike Greiling b0c2772a90
convert Autosave into pure es module and remove global export 2017-10-12 11:31:29 -05:00
Clement Ho c194f22814 Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master'
Cleanup data-page attribute after each Karma test

Closes #38871

See merge request gitlab-org/gitlab-ce!14742
2017-10-11 17:37:20 +00:00
Eric Eastwood 03cd536b54 Cleanup data-page attribute after each Karma test
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871
2017-10-11 11:02:55 -05:00
Phil Hughes 556ef5ed9f
spec fixes 2017-10-11 08:41:33 +01:00
Phil Hughes 44d3745e51
Moves form related JS modules out of global 2017-10-11 08:41:33 +01:00
Phil Hughes fcd842b558
fixed notes specs
changed how the container class is added onto the text element
more specs
2017-10-10 10:14:23 +01:00
Phil Hughes d668294f28
spec fixes 2017-10-10 10:14:22 +01:00
Phil Hughes fa2af5e0f5
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
2017-10-10 10:14:22 +01:00
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
Filipa Lacerda 96e6fc70b4 Import modules instead of using the ones in global namespace
Removes set favicon related methods from global scope
Improves test related with favicon

Removes convertPermissionToBoolean from global scope.
Adds tests for convertPermissionToBoolean - were non existant

Removes setParamInURL from gl.utils

Removes parseIntPagination from gl.utils namespace

Remove normalizeCRLFHeaders from gl.utils namespace

Removes normalizeHeaders from gl.utils namespace

Use gl.utils for filtered search

Fix bad import

Fix broken test by cleaning window.history namespace

Adds changelog
2017-09-09 09:54:27 +01:00
Filipa Lacerda 6a1b84c7b4 Use modules in common utils 2017-09-09 09:54:24 +01:00
Jacob Schatz 941a2d2737 Merge branch 'fix-comment-reflection' into 'security-9-5'
Fix Live Comment XSS Vulnerability

See merge request gitlab/gitlabhq!2183
2017-09-07 20:22:16 -04:00
Phil Hughes cdb305ce68 Fix diff comment button not showing after deleting a comment 2017-09-05 10:20:40 +00:00
Tim Zallmann dab08be606 Resolve "Specific Async Script Loading by using a Page Variable" 2017-08-03 20:31:53 +00:00
Sean McGivern 75d04f6a29 Fix replying to commit comments on MRs from forks
A commit comment shows in the MR, but if the MR is from a fork, it will have a
different project ID to the MR's target project. In that case, add an
note_project_id param so that we can pick the correct project for the note.
2017-07-28 16:25:13 +01:00
Filipa Lacerda aaa78199c2 Update vue-resource 2017-07-12 14:47:09 +00:00
Mike Greiling d990df7481 refactor TaskList class to ES module syntax 2017-07-06 13:05:58 -05:00
Jacob Schatz e48f54b5b2 Merge branch 'enable-webpack-code-splitting' into 'master'
Enable webpack code splitting

Closes #32989

See merge request !12032
2017-06-30 20:55:09 +00:00
Kushal Pandya 9e3ef082be Remove placeholder note when award emoji slash command is applied 2017-06-30 14:10:09 +00:00
Bryce Johnson 81e9c28425 Render add-diff-note button with server.
This commit moves the rendering of the button back to the server, and
shows/hides it using opacity rather than display. It also removes the
transform applied to the button on hover (scale). Previously, both of these
factors automatically triggered a reflow, which creates a performance
bottleneck on pages with larger DOM size.

MR: !12103
2017-06-29 12:50:45 -04:00
Mike Greiling f26d477865 dynamically import emoji helpers for AwardsHandler class 2017-06-28 13:04:34 -05:00
kushalpandya df4e731a9f Remove unnecessary call to `_.escape` 2017-06-28 11:33:47 +05:30
Mike Greiling ca25ad266b refactor Notes class to ES class syntax 2017-06-22 17:06:42 -05:00
Jacob Schatz b2e1d32e7a Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note

Closes #33868

See merge request !12297
2017-06-20 19:31:02 +00:00
Eric Eastwood f7ad9e5abb Fix MR "Changes" diff note up arrow to edit last note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868

While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.

I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
Eric Eastwood 19e12aac02 Fix note highlight being added to new notes
Always use a explicit true/false value to set highlight because jQuery
assumes `null` means toggle from whatever state and doesn't force false.

Regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
2017-06-19 18:52:19 -05:00
Sean McGivern 352a9ed562 Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'
Rename "Slash commands" to "Quick actions"

Closes #27070

See merge request !11811
2017-06-16 16:32:53 +00:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions"
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
2017-06-15 09:01:56 -05:00