diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-03 02:22:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-03 02:22:31 +0300 |
| commit | f00feb14ecba4f2efa0960d81b6085744517d4ed (patch) | |
| tree | ebf6fcbad4b756d7f68ed25fdf54bfd589c3389d /app/controllers/projects/services_controller.rb | |
| parent | 12581f15eeb7b60e966c89642233bb2a1d9306ee (diff) | |
| parent | f84b7eef3f969a65d0930c9d62b6968b2ae70f12 (diff) | |
Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service
Conflicts:
app/controllers/projects/services_controller.rb
Diffstat (limited to 'app/controllers/projects/services_controller.rb')
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index ce0f98bdeff..82aad329c1a 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -50,7 +50,8 @@ class Projects::ServicesController < Projects::ApplicationController :room, :recipients, :project_url, :webhook, :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, :build_key, :server, :teamcity_url, :build_type, - :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel + :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel, + :colorize_messages, :channels ) end end |