Commit Graph

188 Commits

Author SHA1 Message Date
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
Phil Hughes d32de82196 Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'
Fix note highlight being lost after real time update

Closes #33483

See merge request !12098
2017-06-15 07:46:43 +00:00
Eric Eastwood 4182e3fa63 Fix autocomplete not working on note edit form
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529

Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278
2017-06-14 11:55:34 -05:00
Eric Eastwood 82181f6c0a Fix note highlight being lost after real time update
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483
2017-06-14 11:32:12 -05:00
DJ Mountney 7113b1a45b Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'
Escapes html content before appending it to the DOM

See merge request !2107
2017-06-08 09:48:10 -07:00
Kushal Pandya 7abe27b425 Improve user experience around slash commands in instant comments 2017-06-05 09:12:15 +00:00
Fatih Acet 60ceffe479 Merge branch 'fix-up-notes-technical-debt' into 'master'
Fix up some notes.js tech debt

See merge request !11283
2017-05-29 13:19:06 +00:00
Douwe Maan 41b47965a7 More consistent padding of notes, system notes, and note form 2017-05-26 19:01:42 +00:00
Eric Eastwood 20bd76da27 Fix up some notes tech debt
Fix up tech debt comments from @jschatz1

 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952
 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013
2017-05-26 11:36:49 -05:00
Phil Hughes 6cc8a376bb Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'master'
Fix jQuery data attribute caching issue causing expanding issues

Closes #32705

See merge request !11609
2017-05-22 18:08:38 +00:00
Eric Eastwood 5563bf9ce6 Fix jQuery data attribute caching issue casuing expanding issues
Command | Result
$link.data('lineType') | ''
$link.data('line-type') | ''
$link.attr('data-line-type') | 'new'
$link[0].dataset.lineType | 'new'
2017-05-22 11:10:01 -05:00
Filipa Lacerda b261fb7b33 Merge branch 'adopt-es-module-syntax' into 'master'
Adopt ES module syntax

See merge request !9567
2017-05-22 16:07:43 +00:00
Eric Eastwood 682cfbb4dc Fix system note comparison and standardize note setup
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551
2017-05-19 09:50:59 -05:00
Kushal Pandya 4b9c952d35 Fix ability to edit diff notes multiple times 2017-05-18 18:05:01 +00:00
Phil Hughes 4d2d2b1179 Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'
Fix linking to unresolved/expanded diff note

Closes #32424

See merge request !11458
2017-05-18 14:13:37 +00:00
Phil Hughes 010e1dacab Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into 'master'
Fix note flicker with note you can't edit and trailing new line edge case

Closes #32449

See merge request !11472
2017-05-18 09:39:29 +00:00
Eric Eastwood f21a315590 Fix missing .original-note-content and trailing new line edge case
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
2017-05-18 03:23:16 -05:00
Sam Rose 1e0c6439ff Disable reference prefixes in notes for Snippets 2017-05-18 08:10:59 +00:00
Eric Eastwood 027ad1381e Fix linking to unresolved/expanded diff note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424

Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
2017-05-17 23:30:13 -05:00
Mike Greiling 5bd549187a update remaining uses of CJS syntax to ES module syntax 2017-05-16 15:52:40 -05:00
Eric Eastwood b8b6de4c75 Make `gfm_auto_complete` into a module and fix up tech debt 2017-05-16 18:42:06 +00:00
Fatih Acet 1a24a6704f Merge branch '32125-fix-link-to-note-in-diff' into 'master'
Fix linking to resolved note in diff

Closes #32125

See merge request !11327
2017-05-16 09:22:52 +00:00
Phil Hughes 3599d9ab90 Merge branch '24373-warning-message-go-away' into 'master'
Notes warning message should go away once resolved

Closes #24373

See merge request !10823
2017-05-16 09:01:59 +00:00
Jacopo 1fe6beae47 Notes: Warning message should go away once resolved
Flash error messages disappear(`fadeOut`) automatically after any successful request
2017-05-15 22:26:52 +02:00
Kushal Pandya 55294ce60a Improve slash command stripping, escape temporary note contents 2017-05-15 15:07:43 +00:00
Eric Eastwood 16da7f2365 Fix linking to resolved note in diff
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
2017-05-12 17:48:29 -05:00
tauriedavis d567b6474a 31886 Remove spinner from loading comment 2017-05-12 10:08:50 -07:00
Kushal Pandya 5c25629a14 Fix slash commands detection in comments 2017-05-11 09:05:07 +00:00
Filipa Lacerda ff5bd7a9e8 Merge branch 'remove-needless-bind-polyfills' into 'master'
Remove needless bind and indexOf polyfills

See merge request !11187
2017-05-09 17:38:05 +00:00
Filipa Lacerda 19c4aec32d Merge branch 'up-arrow-focus-discussion-comment' into 'master'
Fixed UP arrow key not editing last comment in discussion

Closes #31348

See merge request !11173
2017-05-09 09:08:03 +00:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Mike Greiling 8d865f62b7 remove bind polyfill from notes.js 2017-05-08 17:40:18 -05:00