Commit Graph
32590 Commits
Author SHA1 Message Date
Daniel Beck 63186180e0 [FIX JENKINS-27694] Update dynamically loaded plugins' Downloadables 2015-07-02 16:44:23 +02:00
Daniel Beck 2557e58c1f Merge pull request #1713 from deadmoose/use_trigger_update
When an AbstractNodeMonitorDescriptor doesn't have a result, request it via triggerUpdate()
2015-07-01 23:30:33 +01:00
Jesse Glick c3eb4cfddb Typo. This list is of JobProperty, not UserProperty. 2015-07-01 13:55:06 -04:00
Jesse Glick 112dd652d1 Adding @Deprecated at the suggestion of @daniel-beck. 2015-07-01 07:20:24 -04:00
Jesse Glick 7a7071c3a6 Merge branch 'master' into BlockedBecauseOfBuildInProgress 2015-07-01 07:19:29 -04:00
Daniel Beck 76c1e77656 Merge pull request #1716 from ManuelB/jenkins-1.614-branch-JJI-188
[JENKINS-28553] Stable workaround for adding PluginServletFilter
2015-07-01 10:09:44 +01:00
Daniel Beck a5f704c73c Fix typo 2015-07-01 10:47:51 +02:00
recena 38818064a8 [JENKINS-28550] A commented line has been removed 2015-06-30 10:32:01 +02:00
Jesse Glick 93d91a3689 Matching test update. 2015-06-29 13:53:39 -04:00
Jesse Glick 87d2ac642a Moved BlockedBecauseOfBuildInProgress to the jenkins.model package. 2015-06-29 13:50:22 -04:00
Jesse Glick ea3c9726af Merge branch 'master' into BlockedBecauseOfBuildInProgress 2015-06-29 13:07:06 -04:00
Kohsuke Kawaguchi 2e4fe6a7c7 updated changelog for release 2015-06-29 06:56:18 -07:00
Kohsuke Kawaguchi f978389206 [maven-release-plugin] prepare for next development iteration 2015-06-29 06:45:55 -07:00
Kohsuke Kawaguchi fbf484377c [maven-release-plugin] prepare release jenkins-1.618 jenkins-1.618 2015-06-29 06:45:54 -07:00
Ulli Hafner bc744f9892 Merge pull request #1734 from eidottermihi/master
[FIXED JENKINS-4433] Explicitly set log4j version to 1.2.17.
2015-06-29 13:32:06 +02:00
ikedam 60c64a2047 [FIXED JENKINS-29064] dropdownDescriptorSelector should accept descriptors without configurations. 2015-06-28 12:10:11 +09:00
tfennelly 986530a780 Moved some jelly files to match earlier Java package move 2015-06-26 14:47:52 +01:00
tfennelly 7106d2cba9 Fix jelly refs to historyPageFilter 2015-06-26 13:10:09 +01:00
tfennelly 5dfe78d2fc Moved Build History pagination and search classes to jenkins as requested by @jglick
I understand the motivation for this but I think it creates a bit of a maint/comprehension issue in that splits related classes across 2 different package hierarchies. I know we'll say that's ok but I don't like it. Just say'n.
2015-06-25 18:32:42 +01:00
tfennelly c9a6c3f8de Build History pagination/search tweaks based on feedback from @oleg-nenashev 2015-06-25 18:32:42 +01:00
tfennelly 7c28ed8b7d Moved Mock Queue.Item out into test/java
Not sure why I ever had it in Queue.MockItem. I must have wrongly though it was private/protected in some way that did not allow it to live anywhere else.
2015-06-25 18:32:42 +01:00
tfennelly 85b3b1bc98 Fixed screwy indent 2015-06-25 18:32:42 +01:00
tfennelly 078d3c7c4b Build history pagination and search 2015-06-25 18:32:42 +01:00
Oliver Gondža 5d00292462 Merge pull request #1749 from muhammedeminakbulut/muhammedeminakbulut-patch-1
Grammer fix
2015-06-24 12:56:30 +02:00
Muhammed Akbulut 1d2e91a114 Grammer fix 2015-06-24 09:28:04 +02:00
Kamran Mackey bf5e2878d0 Merge pull request #1748 from jglick/it.run
AbstractScmTagAction.getBuild is deprecated in favor of getRun
2015-06-23 09:54:54 -06:00
Jesse Glick 09d9367f56 AbstractScmTagAction.getBuild is deprecated in favor of getRun; Jelly views should be updated accordingly. 2015-06-23 07:12:10 -04:00
Jesse Glick 05f49062de Added BlockedBecauseOfBuildInProgress. 2015-06-22 15:01:11 -04:00
Oliver Gondža df9588270c Merge pull request #1744 from olivergondza/fix-button-link
[JENKINS-27436] Fix button link appearance
2015-06-22 12:05:09 +02:00
Harald Albers 5fa7dc0b6c Merge pull request #1745 from Sounie/master
Added warning flag to shebang line, corrected string formatting, minor spelling and grammar fixes
2015-06-19 15:56:58 +02:00
recena 415b65f819 Merge remote-tracking branch 'upstream/master' 2015-06-19 15:32:42 +02:00
Daniel Beck 107a502db4 Merge pull request #1742 from QUIDDIA/master
[JENKINS-22028] update label to reflect actual behavior
2015-06-19 11:13:42 +02:00
Stephen Souness 9eb5793c8d Added warning flag to shebang line, corrected string formatting, minor spelling and grammar fixes to comments. 2015-06-19 08:22:51 +01:00
Radosław Antoniuk 6ac59d6154 Update Messages.properties 2015-06-18 21:22:59 -04:00
recena 4b1f46be48 Avoid other unwanted effect 2015-06-18 22:11:31 +02:00
Oliver Gondža 17fb4a4ffb [JENKINS-27436] Fix button link appearance 2015-06-18 22:01:26 +02:00
Daniel Beck 76f4c3519b Noting #1665 2015-06-18 17:06:18 +02:00
Daniel Beck c9c62d3681 Merge pull request #1665 from daniel-beck/JENKINS-2180
[JENKINS-2180] Always use earlier scheduling date.
2015-06-18 17:05:00 +02:00
recena bce0bed49d Layout adapted to small devices 2015-06-18 12:58:44 +02:00
recena 21d6221325 Removing a commented CSS property 2015-06-18 11:49:37 +02:00
recena 6d8db1c69e Solving a problem in listing jobs 2015-06-18 11:39:24 +02:00
recena 7f142e699e Modifications related to daniel-beck revisions 2015-06-18 00:12:48 +02:00
Stephen Connolly 8c5b9cd008 [JENKINS-28926] Tidy-up TODO for the Java 7+ Jenkins versions 2015-06-17 13:55:35 +01:00
Stephen Connolly a208dfeac8 [JENKINS-28926] Noting merge of #1743 2015-06-17 13:54:27 +01:00
Stephen Connolly 7929412037 Merge pull request #1743 from stephenc/jenkins-28926
[FIXED JENKINS-28926] Block while upstream/downstream building cycles never complete
2015-06-17 13:51:33 +01:00
Stephen Connolly c44c088442 [JENKINS-28926] Adding test case
- I was forgetting the call to `rebuildDependencyGraph()` which was why the test didn't work for me
2015-06-17 12:30:46 +01:00
Stephen Connolly de87736795 [FIXED JENKINS-28926] Block while upstream/downstream building cycles never complete
- One could argue that without this change the system is functioning correctly and that previous behaviour
  was a bug. On the other hand, people have come to rely on the previous behaviour.
- The issue really centeres around state changes in the blocked tasks. Since blocking on upstream/downstream
  relies on checking the building projects and the queued (excluding blocked) tasks we need any change in
  the blocked task list to be visible immediately (i.e. update the snapshot)
- I was able to reliably reproduce this behaviour with a convoluted set of manually configured projects
  but turning this into a test case has not proved quite as easy. Manual testing confirms that the issue is
  fixed for my manual test case
- I have also added a sorting of the blocked list when probing for tasks to unblock. This should prioritise
  tasks as intended by the QueueSorter
2015-06-17 12:04:33 +01:00
Manuel Blechschmidt 79f99e1e8d JENKINS-28553 added more feedback from #1716 pull request
* documented getInstance
  * used @CheckForNull
2015-06-17 11:53:37 +02:00
Manuel Blechschmidt 401512ef73 * Integrated Feedback from #1716 2015-06-17 11:46:18 +02:00
Oleg Nenashev 482bffa9cb Merge pull request #1740 from jglick/ExtractResourceWithChangesSCM
ExtractResourceWithChangesSCM now needs to have a descriptor
2015-06-17 10:39:38 +03:00