Commit Graph
15862 Commits
Author SHA1 Message Date
Wadeck Follonier eac53dcf72 Address Devin's rewording points 2018-05-25 11:50:40 +02:00
Wadeck Follonier 0ca6238d66 Address Devin's comment
- change comparator null and counter parts
- add unit test to cover this part of the comparison
2018-05-24 11:26:48 +02:00
Wadeck Follonier 20cdb05f94 Correct typo 2018-05-18 14:03:38 +02:00
Wadeck Follonier 2a08932f7b Address James' comment
- also rename TokenId to TokenUuid everywhere
2018-05-15 17:25:14 +02:00
Wadeck Follonier 2b498df38d uppercase the token 2018-05-04 17:34:07 +02:00
Wadeck Follonier 480555dc2f Adjust UI after discussion with Devin
- trigger the confirm message if someone change an existing token name (for the rename) and does not click on Save / Apply
- improve the ignore/force dirty mechanism
- display the warning message about the temporary aspect of the token plain text only *after* the generation
- change "Save" to "Generate" for the new token
2018-05-04 17:33:22 +02:00
Wadeck Follonier 4ff76be14f Change the warning message 2018-05-04 16:46:43 +02:00
Devin Nusbaum a3d5985190 Remove unnecessary dash
(Wadeck and I want to see how the on-GitHub PR editing features work in case they are useful for proposing grammar changes)
2018-05-04 10:21:07 -04:00
Wadeck Follonier 3395141650 Address Devin's comment
- adjust the way the stats are used for the monitoring page
- correct the re-creation of legacy token on restart
2018-05-04 11:04:49 +02:00
Wadeck Follonier 0c3b5a1b7d Merge remote-tracking branch 'origin/JENKINS-32442-32776_HASHED_TOKEN' into JENKINS-32442-32776_HASHED_TOKEN 2018-05-01 09:50:42 +02:00
Wadeck Follonier 7d1f232504 Better usage of Optional 2018-05-01 09:50:24 +02:00
Wadeck Follonier 3280de517a Merge branch 'master' into JENKINS-32442-32776_HASHED_TOKEN 2018-04-30 10:33:59 +02:00
Andy Neebel 701485e86b [JENKINS-9104] Move process killing veto checks to master (#3357)
* [JENKINS-9104] Add a test method to show that vetos aren't processed on slaves

* Move the veto check to always run on the master

* Add a flag to skip master call if empty list
2018-04-29 12:50:30 +02:00
Wadeck Follonier 79ec930a8e [JENKINS-49839] correct annotation check (#3321)
- also correct a bad annotation in Run
2018-04-29 00:58:35 +02:00
Oleg Nenashev c7bc10341f Merge pull request #3409 from daniel-beck/at-since-201804
Cleanup since Javadoc tags
2018-04-27 21:16:46 +02:00
Wadeck Follonier 38313e4fc2 Separate the statistics from the token store
- different file for better versioning / synchronization
- ability using a configuration to avoid completely the statistics
- add unit / integration tests
- adjust the configuration page
2018-04-27 19:01:35 +02:00
Oleg Nenashev b15c21d5b0 Merge pull request #3407 from Jochen-A-Fuerbacher/fixEndcoding
Fixed encoding in German translation (log recorder levels)
2018-04-27 10:47:47 +02:00
Daniel Beck 6e037bfa39 Cleanup since Javadoc tags 2018-04-26 17:21:30 +02:00
Wadeck Follonier 17b94a044a [JENKINS-31661] Check the root url (Admin monitor + Wizard) (#3082)
* [JENKINS-31661] Add an administrative monitor to check the root url configuration
- add the monitor + test

* - corrections requested by Oleg in code review

* - add a field to fill during SetupWizard for the rootUrl (default value using javascript but editable)
- WIP : missing the translation

* - revert whitespace change

* - little refactoring of js methods

* - translation added

* - modification requested during PR by Jesse

* - renaming proposed by Keith

* - rework to have a new page in the SetupWizard for the root URL

* Correct relevant non-conflicting merge changes

* - in case of skip => also skip the instance configuration
- terminate => finish (+ uppercase)
- replace double single quotes
- add help message in the wizard to inform admins
- correct the installState serialization problem
- update working (admin monitor + wizard)

* address Daniel's comment
- skip all steps will show two messages instead of one (like before when clicking on skip twice)
- skip => not now
- remove margin and adjust padding for the wizard forms
- add the "if possible"

* address Arnaud's comment on the sauter vs passer

* address Liam's comment

* correct previous commit typo

* correct previous commit typo (2)

* add blank end line

* address James' comment

* address Daniel's comment

* address Devin's comment
- implement error management in the wizard
- provide different message in the monitor in case of null / invalid url
- add an helper to validate URL (even with _ in domain)
- add @Restricted

* - also update the monitor test to be consistent with its new behavior

* address Devin's comments

* correct header files

* include relevant classes for the url validation from commons-validator:1.6

* Move Apache classes in a more standard package
2018-04-26 16:58:29 +02:00
Jochen Fürbacher 3a124bfdb6 Fixed regression of ed8d905 2018-04-26 12:28:55 +02:00
Jochen Fürbacher aaa068a305 Fixed encoding in German translation (log recorder levels) 2018-04-26 10:45:01 +02:00
Oleg Nenashev 5be4ddec16 Merge pull request #3401 from LinuxSuRen/slave-zh
Add Chinese translation for slave
2018-04-26 00:45:04 +02:00
Oleg Nenashev fc61378739 [JENKINS-50616] - Add org.jruby.RubyNil to the whitelist (#3404)
* [JENKINS-50616] - Add org.jruby.RubyNil to the whitelist

* [JENKINS-50616] - Fix the typo in the comment
2018-04-24 14:39:57 +02:00
Baptiste Mathus a363f2e33c Merge pull request #3364 from batmat/JENKINS-50164
[JENKINS-50164] Remove UI option to modify WS and builds locations
2018-04-24 11:42:59 +02:00
Oleg Nenashev e511ff832a Merge pull request #3403 from marcosbento/whitelist_enumset
[JENKINS-50939] - Whitelist java.util.EnumSet
2018-04-24 11:02:20 +02:00
Vincent Latombe 909f55b77d [JENKINS-50767] Control crumb issuer proxy compatibility through system property (#3389)
-Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true enables proxy compatibility on startup
2018-04-23 15:23:41 +02:00
Marcos Bento e2abc734da Whitelist java.util.EnumMap 2018-04-23 09:44:53 +01:00
surenpi d6800ac9eb Add Chinese translation for slave 2018-04-22 19:32:37 +08:00
Daniel Beck 398e032fa0 Merge pull request #3355 from suren-jenkins/suren-configure-zh
Add Chinese translation for global configuration
2018-04-22 00:00:37 +02:00
Wadeck Follonier c4fc9098bf Taglib docs: Add the checkMethod attribute to textbox (#3396)
* Add the checkMethod attribute to textbox
- better discovery capability for the plugin maintainers and core developers

* Address Daniel's comment about the possible values

* Address Devin's comment about the documentation content
2018-04-21 10:31:38 +02:00
Jesse Glick 51cac7de2c Merge pull request #3302 from jglick/VirtualFile-JENKINS-49635
[JEP-202] Extending VirtualFile
2018-04-20 18:08:48 -04:00
Baptiste Mathus d8ef16e422 Update javadoc & clarify parameter name 2018-04-20 14:26:22 +02:00
Sylvestre Ledru c248489288 Improve the french translation: 'pas bonne' isn't a great wording 2018-04-17 11:27:13 +02:00
Jesse Glick 8f5d1d3493 Merge branch 'master' into VirtualFile-JENKINS-49635 2018-04-16 16:52:19 -04:00
Oleg Nenashev fb274faa23 Merge pull request #3386 from LinuxSuRen/rename_zh
Add Chinese translation for Rename action
2018-04-14 23:02:11 +02:00
Oleg Nenashev d34c87c3dd Merge pull request #3387 from LinuxSuRen/abstract_project_zh
Add Chinese translation for abstract project
2018-04-14 22:59:50 +02:00
Devin Nusbaum 9557da32a3 [JENKINS-50599] Make Nodes#addNode fail atomically (#3383)
* Reproduce JENKINS-50599

* Make Nodes#addNode fail atomically

* Simplify rollback logic and add some tests

* Fix typo

* Rename lambda parameters to clarify that they are intentionally ignored

* Catch RuntimeException as well
2018-04-14 22:57:27 +02:00
Oleg Nenashev c6561fac15 Merge pull request #3388 from daniel-beck/JENKINS-50748
[FIX JENKINS-50748] Handle null arg to jsStringEscape
2018-04-14 22:56:02 +02:00
Oleg Nenashev 7f1da58c8b Merge pull request #3391 from LinuxSuRen/install-zh
Add Chinese translation for installer page
2018-04-14 19:18:52 +02:00
suren 6c4976fa98 Add Chinese translation for basic entry (#3368)
* Add Chinese translation for basic entry

* Delete the comment to avoid error.
2018-04-14 19:16:14 +02:00
Jesse Glick d25c0b2c39 Merge branch 'master' into VirtualFile-JENKINS-49635 2018-04-13 12:32:38 -04:00
suren 905ab43dbe Typo fixed 2018-04-13 16:27:56 +08:00
suren 4019ff53e7 Add Chinese translation for installer page 2018-04-13 16:24:19 +08:00
Mark Waite 591c7407d6 Expand contraction in message
Simpler to expand the contraction in the message so that "it's" becomes
"it is" than it is to identify the correct combination of characters to
embed a single quote into a property file.
2018-04-12 11:38:48 -06:00
Daniel Beck 7c23884c59 [FIX JENKINS-50748] Handle null arg to jsStringEscape 2018-04-12 09:45:30 +02:00
surenpi e4f2ed89db Add Chinese translation for abstract project 2018-04-12 15:00:47 +08:00
Kohsuke Kawaguchi 2ab4c4a11c Merge remote-tracking branch 'origin/master' 2018-04-11 03:48:06 -07:00
surenpi eb44e1ff7e Add Chinese translation for Rename action. 2018-04-11 15:08:19 +08:00
唐明 9c4c4627d0 fix translation error
"连接"应为“链接”
2018-04-10 10:00:29 +08:00
Daniel Beck ed4fc8dd44 Merge commit 'db48500fb8be4c4fd59c1ded088fe48025d4735d' into security-master 2018-04-09 18:31:19 +02:00