diff options
| author | Drew Blessing <drew@gitlab.com> | 2015-12-17 16:08:14 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2015-12-18 14:19:48 -0600 |
| commit | f177aaa5fa789654dc440d6ec4ae3546544c1401 (patch) | |
| tree | 709b259ea7903da9ac28e5393cc29d0780a6c63a /app/controllers | |
| parent | 27859f7ed9e1efe98b8386844d0a7e69fd58277a (diff) | |
| download | gitlab-ce-f177aaa5fa789654dc440d6ec4ae3546544c1401.tar.gz | |
Backport JIRA service
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 6e7590260ff..8b2577aebe1 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -1,5 +1,5 @@ class Projects::ServicesController < Projects::ApplicationController - ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :api_version, :subdomain, + ALLOWED_PARAMS = [:title, :token, :type, :active, :api_key, :api_url, :api_version, :subdomain, :room, :recipients, :project_url, :webhook, :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, :build_key, :server, :teamcity_url, :drone_url, :build_type, @@ -10,7 +10,8 @@ class Projects::ServicesController < Projects::ApplicationController :notify_only_broken_builds, :add_pusher, :send_from_committer_email, :disable_diffs, :external_wiki_url, :notify, :color, - :server_host, :server_port, :default_irc_uri, :enable_ssl_verification] + :server_host, :server_port, :default_irc_uri, :enable_ssl_verification, + :jira_issue_transition_id] # Parameters to ignore if no value is specified FILTER_BLANK_PARAMS = [:password] |