Skip to content

Commit 4d326a0

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Removing orphaned footnote [2] Tweak [AssetMapper] Adding updater to comparison table doc: added a disambiguation on what the identifier is
2 parents 2ee569b + 549627f commit 4d326a0

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

frontend.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Supports TypeScript :ref:`yes <asset-mapper-ts>` yes
3737
Removes comments from JavaScript no yes
3838
Removes comments from CSS no no
3939
Versioned assets always optional
40+
Can update 3rd party packages yes no :ref:`[2] <ux-note-2>`
4041
================================ ================================== ==========
4142

4243
.. _ux-note-1:
@@ -46,6 +47,10 @@ need to use their native tools for pre-compilation. Also, some features (like
4647
Vue single-file components) cannot be compiled down to pure JavaScript that can
4748
be executed by a browser.
4849

50+
.. _ux-note-2:
51+
52+
**[2]** If you use ``npm``, there are update checkers available (e.g. ``npm-check``).
53+
4954
.. _frontend-asset-mapper:
5055

5156
AssetMapper (Recommended)

security/access_token.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ This handler must implement
9797
}
9898

9999
// and return a UserBadge object containing the user identifier from the found token
100+
// (this is the same identifier used in Security configuration; it can be an email,
101+
// a UUUID, a username, a database ID, etc.)
100102
return new UserBadge($accessToken->getUserId());
101103
}
102104
}

0 commit comments

Comments
 (0)