diff --git a/.prettierignore b/.prettierignore index 72610f04b419..7bdc346011d5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,7 +9,6 @@ node/ # libraries / external deps / generated files src/main/js/plugin-setup-wizard/bootstrap-detached.js -war/src/main/webapp/scripts/yui war/src/main/webapp/jsbundles/ src/main/scss/_bootstrap.scss diff --git a/.stylelintrc.js b/.stylelintrc.js index c73ee6eecfe9..50820909fbe2 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,6 +1,5 @@ module.exports = { - extends: "stylelint-config-standard", - customSyntax: "postcss-scss", + extends: "stylelint-config-standard-scss", ignoreFiles: ["src/main/scss/_bootstrap.scss"], rules: { "no-descending-specificity": null, @@ -14,23 +13,8 @@ module.exports = { }, ], "property-no-vendor-prefix": null, - "at-rule-no-unknown": [ - true, - { - ignoreAtRules: [ - "function", - "if", - "each", - "include", - "mixin", - "for", - "use", - ], - }, - ], "alpha-value-notation": "number", "number-max-precision": 5, - "function-no-unknown": null, "no-duplicate-selectors": null, "hue-degree-notation": "number", }, diff --git a/ath.sh b/ath.sh index 3f6bca7f61bf..965255834081 100644 --- a/ath.sh +++ b/ath.sh @@ -6,7 +6,7 @@ set -o xtrace cd "$(dirname "$0")" # https://github.com/jenkinsci/acceptance-test-harness/releases -export ATH_VERSION=6107.v8c73fa_b_8f784 +export ATH_VERSION=6133.v358d9a_47674f if [[ $# -eq 0 ]]; then export JDK=17 diff --git a/bom/pom.xml b/bom/pom.xml index d2912addc6a4..b039ad6f4305 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -63,7 +63,7 @@ THE SOFTWARE. org.springframework spring-framework-bom - 6.2.1 + 6.2.2 pom import diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index ea677293cb60..3ae81031b087 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -664,17 +664,14 @@ public static String validateIconSize(String iconSize) throws SecurityException } /** - * Gets the suffix to use for YUI JavaScript. - */ - public static String getYuiSuffix() { - return DEBUG_YUI ? "debug" : "min"; - } - - /** - * Set to true if you need to use the debug version of YUI. + * No longer used, to be removed after enough plugins have adopted a version of the test harness with + * jenkins-test-harness/pull/874 in it. + * + * @deprecated removed without replacement */ @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console") - public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI"); + @Deprecated(forRemoval = true, since = "TODO") + public static boolean DEBUG_YUI; /** * Creates a sub map by using the given range (both ends inclusive). diff --git a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java index b008697bbb88..5b7c362589cb 100644 --- a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java +++ b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java @@ -186,7 +186,10 @@ public GroupDetails loadGroupByGroupname(String groupname) throws org.acegisecur class Authenticator extends AbstractUserDetailsAuthenticationProvider { @Override protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException { - // authentication is assumed to be done already in the retrieveUser method + // Authentication is done in the retrieveUser method. Note that this method being a no-op is only safe + // because we use Spring Security's default NullUserCache. If caching was enabled, it would be possible to + // log in as any cached user with any password unless we updated this method to check the provided + // authentication as recommended in the superclass method's documentation, so be careful reusing this code. } @Override diff --git a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java index 869ec901757b..1f8231b0289f 100644 --- a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java @@ -26,6 +26,7 @@ import hudson.Extension; import hudson.ExtensionList; +import hudson.security.Permission; import hudson.util.DescribableList; import java.io.IOException; import java.util.List; @@ -64,6 +65,11 @@ public DescribableList - - +

@@ -33,7 +32,7 @@ THE SOFTWARE.

-
+      
         
         
         
${command.usage}
diff --git a/core/src/main/resources/hudson/cli/CLIAction/example.jelly b/core/src/main/resources/hudson/cli/CLIAction/example.jelly index f9ead71074c3..58e9b60966ab 100644 --- a/core/src/main/resources/hudson/cli/CLIAction/example.jelly +++ b/core/src/main/resources/hudson/cli/CLIAction/example.jelly @@ -24,6 +24,10 @@ THE SOFTWARE. -
java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request)} -http ${commandArgs}
+ java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request)} -http ${commandArgs} +
+ ${content} + +
diff --git a/core/src/main/resources/hudson/cli/CLIAction/index.jelly b/core/src/main/resources/hudson/cli/CLIAction/index.jelly index c91bbb530ce5..b7a17b0bfac2 100644 --- a/core/src/main/resources/hudson/cli/CLIAction/index.jelly +++ b/core/src/main/resources/hudson/cli/CLIAction/index.jelly @@ -24,36 +24,61 @@ THE SOFTWARE. - - + + + + - -

- ${%blurb(rootURL)} -

- - - -

${%Available Commands}

- - - - - - - - - + + + + +
+ ${%description} +
+ + +
    +
  1. +
    + ${%instruction1} +
    + + + jenkins-cli.jar + +
  2. +
  3. +

    + ${%instruction2} +

    + + +
  4. +
+
+ + +
${%Name}${%Description}
+ - - + + - - -
- ${command.name} - ${command.shortDescription}${%Name}${%Description}
+ + + + + + ${command.name} + + ${command.shortDescription} + + + + +
diff --git a/core/src/main/resources/hudson/cli/CLIAction/index.properties b/core/src/main/resources/hudson/cli/CLIAction/index.properties index 3dd89d4f87e1..45c5c1200a2b 100644 --- a/core/src/main/resources/hudson/cli/CLIAction/index.properties +++ b/core/src/main/resources/hudson/cli/CLIAction/index.properties @@ -1,4 +1,4 @@ -Jenkins\ CLI=Jenkins CLI -blurb=You can access various features in Jenkins through a command-line tool. See \ - the documentation for more details of this feature. \ - To get started, download jenkins-cli.jar, and run it as follows: +description=You can access various features in Jenkins through a command-line tool. This can be convenient for scripting\ + \ of routine tasks, bulk updates, troubleshooting, and more. +instruction1=Download the Jenkins CLI: +instruction2=Run it as follows diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_bg.properties b/core/src/main/resources/hudson/cli/CLIAction/index_bg.properties deleted file mode 100644 index 549c200df2da..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_bg.properties +++ /dev/null @@ -1,36 +0,0 @@ -# The MIT License -# -# Bulgarian translation: Copyright (c) 2016, 2017 Alexander Shopov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=\ - Налични команди -# You can access various features in Jenkins through a command-line tool. See \ -# the Wiki for more details of this feature.\ -# To get started, download jenkins-cli.jar, and run it as follows: -blurb=\ - Имате достъп до функционалността на Jenkins чрез програма за командния ред.\ - За повече информация прегледайте\ - уикито.\ - Свалете файла jenkins-cli.jar и го\ - изпълнете по следния начин: -# Jenkins CLI -Jenkins\ CLI=\ - Jenkins от командния ред diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_cs.properties b/core/src/main/resources/hudson/cli/CLIAction/index_cs.properties deleted file mode 100644 index 22e2a3a870ff..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_cs.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Dostupné příkazy -Jenkins\ CLI=Jenkins CLI diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_da.properties b/core/src/main/resources/hudson/cli/CLIAction/index_da.properties deleted file mode 100644 index 3de7765f1543..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_da.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Tilgængelige kommandoer -Jenkins\ CLI=Jenkins CLI -blurb=Du kan tilgå diverse features i Jenkins igennem et kommandolinie værktøj. Se \ diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_de.properties b/core/src/main/resources/hudson/cli/CLIAction/index_de.properties deleted file mode 100644 index 3b4c21448499..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_de.properties +++ /dev/null @@ -1,7 +0,0 @@ -Available\ Commands=Verfügbare Kommandos -Jenkins\ CLI=Jenkins CLI -blurb=\ - Sie können ausgewählte Funktionen von Jenkins über ein Kommandozeilenwerkzeug (engl.: Command Line Interface, CLI) nutzen. \ - Näheres dazu finden Sie in der Dokumentation. \ - Um Jenkins CLI einzusetzen, laden Sie jenkins-cli.jar \ - lokal herunter und starten es wie folgt: diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_es.properties b/core/src/main/resources/hudson/cli/CLIAction/index_es.properties deleted file mode 100644 index 740b3e50c3f8..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_es.properties +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=Puedes acceder a varias funcionalidades de Jenkins utilizando la linea de comandos. \ - Echa un vistazo a esta página para mas detalles. \ - Para comenzar, descarga a href="{0}/jnlpJars/jenkins-cli.jar">jenkins-cli.jar, y ejecuta lo siguiente: -Jenkins\ CLI=Interfaz de comandos (CLI) de Jenkins -Available\ Commands=Comandos disponibles diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_fr.properties b/core/src/main/resources/hudson/cli/CLIAction/index_fr.properties deleted file mode 100644 index f7d1f0c08220..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_fr.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Commandes disponibles -Jenkins\ CLI=Ligne de commande (CLI) Jenkins -blurb=Vous pouvez accéder à diverses fonctionnalités de Jenkins à travers une ligne de commande. Voir le wiki pour plus d''information sur cette fonctionnalité. Pour débuter, téléchargez jenkins-cli.jar et utilisez le comme suit: diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_it.properties b/core/src/main/resources/hudson/cli/CLIAction/index_it.properties deleted file mode 100644 index beca5931cfb0..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_it.properties +++ /dev/null @@ -1,32 +0,0 @@ -# The MIT License -# -# Italian localization plugin for Jenkins -# Copyright © 2020 Alessandro Menti -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Comandi disponibili -blurb=È possibile accedere a varie funzionalità di Jenkins tramite uno \ - strumento da riga di comando. Si veda \ - la documentazione per \ - ulteriori dettagli su questa funzionalità. \ - Per iniziare, scaricare \ - jenkins-cli.jar ed eseguirlo \ - come segue: -Jenkins\ CLI=Interfaccia a riga di comando di Jenkins diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_ja.properties b/core/src/main/resources/hudson/cli/CLIAction/index_ja.properties deleted file mode 100644 index 7fbaebe0f110..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_ja.properties +++ /dev/null @@ -1,28 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2011, Sun Microsystems, Inc., Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -blurb=コマンドラインのツールからJenkinsの様々な機能を利用できます。\ - 詳細はWikiを参照してください。\ - まずは、jenkins-cli.jarをダウンロードして次のように起動してください。 -Jenkins\ CLI=Jenkins CLI -Available\ Commands=利用可能なコマンド - diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_lv.properties b/core/src/main/resources/hudson/cli/CLIAction/index_lv.properties deleted file mode 100644 index 586a5c0b3f4d..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_lv.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Pieejamās komandas -Jenkins\ CLI=Jenkins komandrindas saskarne diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_nl.properties b/core/src/main/resources/hudson/cli/CLIAction/index_nl.properties deleted file mode 100644 index 5d0cbf81a0fe..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_nl.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Beschikbare commando''s -blurb=Je kan gebruik maken van verschillende mogelijkheden in Jenkins via een opdracht op de commandoregel. Zie de Wiki voor verder details hierover. Om te beginnen, download jenkins-cli.jar, en voer het uit als volgt: diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_pt_BR.properties b/core/src/main/resources/hudson/cli/CLIAction/index_pt_BR.properties deleted file mode 100644 index df50363df9e8..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_pt_BR.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva, Fernando Boaglio -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Comandos disponíveis -Jenkins\ CLI=CLI do Jenkins -blurb=Você pode acessar várias funcionalidades do Jenkins através da ferramenta de linha de comando. Veja \ - a documentação para maiores detalhes desta funcionalidade. \ - Para começar, baixe o jenkins-cli.jar e execute da seguinte forma: -Description=Descrição -Name=Nome diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_ru.properties b/core/src/main/resources/hudson/cli/CLIAction/index_ru.properties deleted file mode 100644 index df9f44405ea3..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_ru.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2010, Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Available\ Commands=Доступные команды -Jenkins\ CLI=Консольные команды Jenkins -blurb=С помощью консольных команд Jenkins вы можете получить доступ к большому количеству функций. Более детальная информация находится в базе знаний Jenkins. Для того, чтобы начать пользоваться консольными командами, необходимо скачать jenkins-cli.jar, и запустить пакет следующим образом: diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_sr.properties b/core/src/main/resources/hudson/cli/CLIAction/index_sr.properties deleted file mode 100644 index 6e5f072b3753..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_sr.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -Jenkins\ CLI=Jenkins са командне линије -blurb=Помоћу конзоле команде Jenkins можете добити приступ великом броју функција. Детаљне информације се налазе на у Jenkins вики. У циљу да почнете да користите команду, потребно је да преузмете jenkins-cli.jar, и покренете пакет на следећи начин: -Available\ Commands=Доступне команде diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_sv_SE.properties b/core/src/main/resources/hudson/cli/CLIAction/index_sv_SE.properties deleted file mode 100644 index c6bb04cf681b..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_sv_SE.properties +++ /dev/null @@ -1,8 +0,0 @@ -Available\ Commands=Tillgängliga kommandon -Jenkins\ CLI=Jenkins kommandoradsgränssnitt -blurb=Du kan komma åt olika funktioner i Jenkins genom ett kommandoradsverktyg. Mer information om \ - den här funktionen finns i dokumentationen. \ - Ladda ned jenkins-cli.jar för att komma igång och kör följande: - -Description=Beskrivning -Name=Namn diff --git a/core/src/main/resources/hudson/cli/CLIAction/index_zh_TW.properties b/core/src/main/resources/hudson/cli/CLIAction/index_zh_TW.properties deleted file mode 100644 index 860d1fd97d12..000000000000 --- a/core/src/main/resources/hudson/cli/CLIAction/index_zh_TW.properties +++ /dev/null @@ -1,29 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd., -# and Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -Jenkins\ CLI=Jenkins 命令列介面 -blurb=\ - 您可以透過命令列工具使用 Jenkins 的諸多功能。\ - 在 Wiki 上有詳細的功能說明。\ - 心動不如馬上行動,下載 jenkins-cli.jar 並執行以下指令: -Available\ Commands=可用指令 diff --git a/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy b/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy index 1d0d2eb4d9cb..eddea7413ffc 100644 --- a/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy +++ b/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy @@ -7,9 +7,7 @@ import jenkins.model.Jenkins def f = namespace(lib.FormTagLib) f.entry(title: _('Unprotected URLs')) { - p(class: "jenkins-form-description") { - _('blurb') - } + f.description(_('blurb')) ul { for (def action : Jenkins.get().getActions().sort { x, y -> x.getUrlName() <=> y.getUrlName() }) { if (action instanceof UnprotectedRootAction) { diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly index b24f0e872cf4..91d01c69f549 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly @@ -43,7 +43,7 @@ THE SOFTWARE.
${it.rootDir} - +
diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js index d985b92d0806..3f19dcfb7e7f 100644 --- a/core/src/main/resources/lib/form/repeatable/repeatable.js +++ b/core/src/main/resources/lib/form/repeatable/repeatable.js @@ -163,7 +163,7 @@ var repeatableSupport = { }; // do the ones that extract innerHTML so that they can get their original HTML before -// other behavior rules change them (like YUI buttons.) +// other behavior rules change them. Behaviour.specify("DIV.repeated-container", "repeatable", -100, function (e) { if (isInsideRemovable(e)) { return; diff --git a/core/src/main/resources/lib/layout/copyButton.jelly b/core/src/main/resources/lib/layout/copyButton.jelly index 8a65c641657a..a9117768becc 100644 --- a/core/src/main/resources/lib/layout/copyButton.jelly +++ b/core/src/main/resources/lib/layout/copyButton.jelly @@ -53,15 +53,19 @@ THE SOFTWARE. - + + + diff --git a/core/src/main/resources/lib/layout/copyButton.properties b/core/src/main/resources/lib/layout/copyButton.properties new file mode 100644 index 000000000000..2880b3dac1ee --- /dev/null +++ b/core/src/main/resources/lib/layout/copyButton.properties @@ -0,0 +1 @@ +copyInsecure=Copy is only supported with a secure (HTTPS) connection. diff --git a/core/src/main/resources/lib/layout/copyButton/copyButton.js b/core/src/main/resources/lib/layout/copyButton/copyButton.js index 2a9c7bfe56ff..bcc2a85d8da5 100644 --- a/core/src/main/resources/lib/layout/copyButton/copyButton.js +++ b/core/src/main/resources/lib/layout/copyButton/copyButton.js @@ -3,8 +3,8 @@ Behaviour.specify( "copyButton", 0, function (copyButton) { - copyButton.addEventListener("click", () => { - if (isSecureContext) { + if (isSecureContext) { + copyButton.addEventListener("click", () => { var text = copyButton.getAttribute("text"); if (copyButton.hasAttribute("ref")) { var ref = copyButton.getAttribute("ref"); @@ -18,8 +18,10 @@ Behaviour.specify( navigator.clipboard .writeText(text) .then(() => { - // Show the completion message - hoverNotification(copyButton.getAttribute("message"), copyButton); + copyButton.classList.add("jenkins-copy-button--copied"); + setTimeout(() => { + copyButton.classList.remove("jenkins-copy-button--copied"); + }, 2000); }) .catch(() => { hoverNotification( @@ -27,12 +29,12 @@ Behaviour.specify( copyButton, ); }); - } else { - hoverNotification( - "Copy is only supported with a secure (HTTPS) connection", - copyButton, - ); - } - }); + }); + } else { + copyButton.disabled = true; + copyButton.removeAttribute("tooltip"); + const parent = copyButton.parentElement; + parent.setAttribute("tooltip", parent.dataset.messageInsecure); + } }, ); diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index cbbfa6d9109e..d96e6ead76d2 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -128,37 +128,9 @@ THE SOFTWARE. - - - - - - - - - - - - - - - - - - - - - -