From 9279c1479ae75c610929b90bb19912d4d6389453 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Thu, 8 Oct 2015 10:08:07 -0500 Subject: [PATCH] Fix Jenkins CI parameters --- app/controllers/projects/services_controller.rb | 3 ++- app/models/project_services/jenkins_service.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 4a82ddf8d0..4ff04b97f3 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -9,7 +9,8 @@ class Projects::ServicesController < Projects::ApplicationController :note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url, :jira_issue_transition_id, :notify, :color, - :server_host, :server_port, :default_irc_uri, :enable_ssl_verification] + :server_host, :server_port, :default_irc_uri, :enable_ssl_verification, + :multiproject_enabled, :pass_unstable] # Authorize before_action :authorize_admin_project! before_action :service, only: [:edit, :update, :test] diff --git a/app/models/project_services/jenkins_service.rb b/app/models/project_services/jenkins_service.rb index 2678cb783e..200af5ba69 100644 --- a/app/models/project_services/jenkins_service.rb +++ b/app/models/project_services/jenkins_service.rb @@ -52,7 +52,7 @@ class JenkinsService < CiService { type: 'checkbox', name: 'multiproject_enabled', title: "Multi-project setup enabled?", help: "Multi-project mode is configured in Jenkins Gitlab Hook plugin." }, { type: 'checkbox', name: 'pass_unstable', title: 'Should unstable builds be treated as passing?', - help: 'Unstable builds will be treated as passing.'} + help: 'Unstable builds will be treated as passing.' } ] end