1. 06 2月, 2015 8 次提交
    • J
      Merge branch 'security' into security-rc · 6fe334cc
      Jesse Glick 提交于
      Conflicts:
      	test/src/test/java/hudson/tasks/BuildTriggerTest.java
      6fe334cc
    • J
    • J
      Merge branch 'security' into security-rc · 0b96005f
      Jesse Glick 提交于
      0b96005f
    • R
      Merge pull request #10 from jenkinsci-cert/SECURITY-166 · 3e40c6fa
      Ryan Campbell 提交于
      [SECURITY-166] Make UI tests work across Jenkins versions
      3e40c6fa
    • J
      Merge branch 'security' into security-rc · 6ad8cbfc
      Jesse Glick 提交于
      Conflicts:
      	core/src/main/java/hudson/ClassicPluginStrategy.java
      	core/src/main/java/hudson/cli/AddJobToViewCommand.java
      	core/src/main/java/hudson/model/Run.java
      	core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
      	core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
      	core/src/main/java/jenkins/model/IdStrategyDescriptor.java
      	core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
      	core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
      	core/src/main/resources/hudson/model/FileParameterValue/value_pt_BR.properties
      	core/src/main/resources/hudson/model/Job/index.jelly
      	core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
      	core/src/main/resources/hudson/node_monitors/Messages_cs.properties
      	core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
      	core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
      	core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
      	core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
      	core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
      	core/src/main/resources/jenkins/model/IdStrategy/config.jelly
      	core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
      	core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
      	core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
      	core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
      	core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
      	core/src/main/resources/jenkins/triggers/Messages_fr.properties
      	core/src/main/resources/lib/form/class-entry.jelly
      	core/src/main/resources/lib/form/helpLink_pt_BR.properties
      	core/src/main/resources/lib/form/link.jelly
      	core/src/main/resources/lib/hudson/project/configurable.properties
      	core/src/main/resources/lib/hudson/project/configurable_bg.properties
      	core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
      	core/src/main/resources/lib/hudson/project/configurable_eu.properties
      	core/src/main/resources/lib/hudson/project/configurable_gl.properties
      	core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
      	core/src/main/resources/lib/hudson/project/configurable_nl.properties
      	core/src/main/resources/lib/hudson/project/configurable_tr.properties
      	core/src/main/resources/lib/hudson/project/console-link.jelly
      	core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
      	core/src/main/resources/lib/layout/pane_de.properties
      	core/src/main/resources/lib/layout/pane_pt.properties
      	core/src/main/resources/lib/layout/pane_pt_BR.properties
      	core/src/main/resources/lib/layout/task_pt.properties
      	core/src/test/java/hudson/util/XStream2Test.java
      	pom.xml
      	test/pom.xml
      	test/src/test/java/hudson/model/AbstractItemSecurityTest.java
      	test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
      	war/src/main/webapp/scripts/msie.js
      6ad8cbfc
    • J
      Merge pull request #6 from jenkinsci-cert/SECURITY-125 · a001f71d
      Jesse Glick 提交于
      [SECURITY-125] Matrix project script security
      a001f71d
    • R
      29f59e42
    • J
      Merge pull request #7 from jenkinsci-cert/SECURITY-167_2 · 5564a62e
      James Nord 提交于
      [SECURITY-167] Followup tweaks to address review comments.
      5564a62e
  2. 05 2月, 2015 28 次提交
  3. 04 2月, 2015 4 次提交