stable

Clone or download

Read-only

Merge commit 'refs/changes/88/18888/5' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: request #14849 Merge ScriptAssets and JavascriptAssets

Modified Files

Name
M plugins/agiledashboard/include/AgileDashboard/Artifact/AdditionalArtifactActionBuilder.php +3 −3 Go to diff View file
M plugins/agiledashboard/include/agiledashboardPlugin.php +3 −3 Go to diff View file
M plugins/agiledashboard/tests/unit/AgileDashboard/Artifact/AdditionalArtifactActionBuilderTest.php +3 −10 Go to diff View file
M plugins/git/include/Git/Repository/CollectAssets.php +4 −4 Go to diff View file
M plugins/openidconnectclient/include/OpenIDConnectClient/Administration/Controller.php +2 −13 Go to diff View file
M plugins/pullrequest/include/PullrequestDisplayer.php +2 −2 Go to diff View file
M plugins/pullrequest/include/pullrequestPlugin.php +2 −2 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Field/ArtifactLink/Nature/NatureConfigController.php +2 −2 Go to diff View file
M src/common/Password/Administration/PasswordPolicyDisplayController.php +2 −2 Go to diff View file
M src/common/User/Account/DisplayAppearanceController.php +1 −5 Go to diff View file
M src/common/User/Account/DisplayEditionController.php +1 −4 Go to diff View file
M src/common/User/Account/DisplayExperimentalController.php +1 −4 Go to diff View file
M src/common/User/Account/DisplayKeysTokensController.php +1 −4 Go to diff View file
M src/common/User/Account/DisplaySecurityController.php +1 −4 Go to diff View file
M src/common/User/Account/UserPreferencesHeader.php +1 −4 Go to diff View file
M src/common/layout/BaseLayout.php +1 −1 Go to diff View file
M src/common/layout/JavascriptAsset.php +2 −3 Go to diff View file
R src/common/layout/ScriptAsset.php Go to diff View file