Commit Graph
32590 Commits
Author SHA1 Message Date
Oliver Gondža 2e802d7611 Do not move PluginManagerUtil as it relies on local data 2016-03-22 13:31:08 +01:00
recena 213cf1032b [JENKINS-31162] The service is now under View instead of View + ItemGroupMixin 2016-03-22 13:23:30 +01:00
Manuel Recena 5ad9303c49 Merge pull request #9 from gusreiber/JENKINS-33713
Gus's work focused on the UI
2016-03-22 12:26:37 +01:00
Oliver Gondža 2570488554 Move remaining test helper classes from core repo 2016-03-22 11:29:28 +01:00
Oliver Gondža 8fdca29713 [JENKINS-33683] Annotate Function#getActionUrl() as well 2016-03-22 11:07:31 +01:00
Daniel Beck 48a20ffc84 Merge pull request #2151 from daniel-beck/JENKINS-33706
[FIX JENKINS-33706] Remove ineligible build-monitor-plugin
2016-03-22 10:27:06 +01:00
Daniel Beck 143c271c76 Remove Slack Plugin again. 2016-03-22 10:26:28 +01:00
kzantow c52117a9ba JENKINS-33659 - Basic fix for scrollspy width issues 2016-03-22 01:48:05 -04:00
gusreiber cc74efb013 coloring default icons 2016-03-21 22:22:05 -07:00
gusreiber 6bbd34b579 error handling item selection 2016-03-21 21:37:06 -07:00
Kohsuke Kawaguchi c3e33df9d6 Merge pull request #2141 from jenkinsci/JENKINS-33662
[FIXED JENKINS-33662] upgrade wizard step #0
2016-03-21 19:35:26 -07:00
Daniel Beck 5999996aa3 Update changelog.html 2016-03-22 02:34:59 +01:00
Daniel Beck 85d6526bfb Update changelog.html 2016-03-22 02:24:19 +01:00
gusreiber 73567cc084 fixing copy item check 2016-03-21 17:41:30 -07:00
gusreiber 255551fa2b cleaning page centering for config 2016-03-21 17:30:41 -07:00
gusreiber f531327752 woops reverted newList/form to wrong file.. 2016-03-21 17:03:32 -07:00
gusreiber eb6ce48c06 merging new item and config item|splitting less files 2016-03-21 16:31:08 -07:00
Manuel Recena 5584229e3e [JENKINS-31162] LOGGER.log() instead of LOGGER.warning() 2016-03-21 23:42:36 +01:00
Daniel Beck 495784745d Add Slack Plugin again, 2.0.1 resolved cause for JENKINS-33571 2016-03-21 23:39:48 +01:00
Daniel Beck b5ab8714b3 Refine the plugin selection 2016-03-21 23:29:36 +01:00
Manuel Recena a585e87480 [JENKINS-31162] Changed the modifier of setWeight(int weight) method 2016-03-21 23:29:29 +01:00
Daniel Beck 7ceff586fd [FIX JENKINS-33706] Remove ineligible build-monitor-plugin 2016-03-21 23:26:01 +01:00
Daniel Beck 012a92e7de [FIX JENKINS-33705] Use platform line endings 2016-03-21 23:18:25 +01:00
Manuel Recena 23f65e2a60 [JENKINS-31162] ItemCategory no londer implements ModelObject 2016-03-21 22:13:24 +01:00
Manuel Recena 4bdadc2a6b [JENKINS-31162] More context in a javadoc 2016-03-21 21:49:58 +01:00
Manuel Recena ad2ae9de3e [JENKINS-31162] Constants as identifiers of the categories 2016-03-21 21:45:47 +01:00
recena 60803d480e [JENKINS-31162] @glick's comments were addressed 2016-03-21 20:25:07 +01:00
recena eb78face60 [JENKINS-31162] Another (part III) @jglick's comments were addressed 2016-03-21 19:44:23 +01:00
recena 5c10e57078 [JENKINS-31162] Another @jglick's comments were addressed 2016-03-21 19:21:06 +01:00
recena 74b58dc958 [JENKINS-31162] @jglick's comments were addressed (partially) 2016-03-21 19:06:35 +01:00
gusreiber 693741bae3 reconcieling new file names shared by addItem and config tabs 2016-03-21 10:48:00 -07:00
gusreiber 73c81ad9be adding missing less file 2016-03-21 10:15:48 -07:00
Stephen Connolly ee1ff1fdac Merge pull request #2147 from stephenc/jenkins-33681
[FIXED JENKINS-33681] Plugin filters were failing to be removed and blocking restart
2016-03-21 16:57:12 +00:00
Kohsuke Kawaguchi b4f28409b3 Resolved a merge failure 2016-03-21 09:24:59 -07:00
Kohsuke Kawaguchi 523aa087f8 Merge remote-tracking branch 'origin/2.0' into JENKINS-33662
Conflicts:
	core/src/main/java/jenkins/install/SetupWizard.java
2016-03-21 08:53:11 -07:00
Kohsuke Kawaguchi e7f72f011f Permission check was missing 2016-03-21 08:51:51 -07:00
Jesse Glick a5124b5fd5 Merge pull request #2129 from jglick/immutable-list-JENKINS-33467
[JENKINS-33467] Clarifying that CauseAction.getCauses is immutable
2016-03-21 10:52:30 -04:00
James Nord 490adc9d0f [FIXED JENKINS-33693] Do not hardcode .bat extension.
As the default maven command is on the path we can not hard code the
command to mvn.bat as since maven 3.something it has been mvn.cmd

As this is on the path we can just use mvn and let Windows do its thing
with PATHEXT which will has both .BAT and .CMD by default.

This fixes ATH failures when the ATH is run on windows.
2016-03-21 14:52:14 +00:00
Kohsuke Kawaguchi 697d4ad38c Merge branch 'master' of github.com:jenkinsci/jenkins 2016-03-21 07:49:03 -07:00
Kohsuke Kawaguchi ac8b6a317c updated changelog for release 2016-03-21 07:33:03 -07:00
Kohsuke Kawaguchi f2fa45a5e4 [maven-release-plugin] prepare for next development iteration 2016-03-21 07:25:58 -07:00
Kohsuke Kawaguchi a598c38999 [maven-release-plugin] prepare release jenkins-1.654 jenkins-1.654 2016-03-21 07:25:57 -07:00
Stephen Connolly a5febd7666 [FIXED JENKINS-33681] Plugin filters were failing to be removed and blocking restart 2016-03-21 14:21:44 +00:00
Jesse Glick 60ba6ee186 Merge pull request #2143 from batmat/INFRA-588
[INFRA-588] Upgrade + Remove inherited values
2016-03-21 09:36:17 -04:00
Oliver Gondža 4c02f1db33 [JENKINS-33683] Do not restrict invisible action to single test 2016-03-21 10:43:48 +01:00
Oliver Gondža eefafb2b38 [FIXED JENKINS-33683] Clarify Action methods can return null 2016-03-21 10:33:58 +01:00
Oliver Gondža e4d7da6053 [JENKINS-33683] Reproduce 2016-03-21 10:30:02 +01:00
recena 3c17558eb8 [JENKINS-31162] Merge from upstream/2.0 and resolve conflicts 2016-03-21 10:09:05 +01:00
Antonio Muñiz 7045be86e5 API use restricted and simplified logic in Functions 2016-03-20 23:17:40 +01:00
Baptiste Mathus 3d290009cf [INFRA-588] Upgrade&Remove some inherited values
See
https://github.com/jenkinsci/pom/commit/4518f1577489d7a7fd91c0213ab708defb77a67f

effective-pom diff between & after this change:

    $ diff before.xml after.xml
    7c7
    <     <version>1.35</version>
    ---
    >     <version>1.36</version>
    85c85
    <       <url>http://maven.jenkins-ci.org:8081/content/repositories/releases</url>
    ---
    >       <url>https://repo.jenkins-ci.org/releases/</url>
    89c89
    <       <url>http://maven.jenkins-ci.org:8081/content/repositories/snapshots</url>
    ---
    >       <url>https://repo.jenkins-ci.org/snapshots/</url>
2016-03-20 14:48:51 +01:00