diff options
| author | Tim <tgaudette88@gmail.com> | 2016-06-27 18:42:50 -0400 |
|---|---|---|
| committer | Tim <tgaudette88@gmail.com> | 2016-06-29 06:01:54 -0400 |
| commit | 3d108760ea4c625587a1d29bb0e4ace77531f25d (patch) | |
| tree | 1d3e00e56cdd3437a63d8250fd29403814b1b8f3 | |
| parent | bc313deaae2fae3e5532a28245fe72fcf9aef9a6 (diff) | |
| download | gitlab-ce-3d108760ea4c625587a1d29bb0e4ace77531f25d.tar.gz | |
Set field defaults to be the same as IssueTrackerService
Rebased to resolve merge conflicts
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/models/project_services/bugzilla_service.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index f183539aa4f..7c653f091d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,12 +26,12 @@ v 8.9.3 (unreleased) - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem - Update mobile button icons to be more inline with typical UI paradigms - Fixes missing avatar on system notes. !4954 + - Add Bugzilla integration !4930 (iamtjg) v 8.9.2 - Fix visibility of snippets when searching. - Fix an information disclosure when requesting access to a group containing private projects. - Update omniauth-saml to 1.6.0 !4951 - - Add Bugzilla integration v 8.9.1 - Refactor labels documentation. !3347 diff --git a/app/models/project_services/bugzilla_service.rb b/app/models/project_services/bugzilla_service.rb index b84f9ebe479..199cad0eb86 100644 --- a/app/models/project_services/bugzilla_service.rb +++ b/app/models/project_services/bugzilla_service.rb @@ -25,9 +25,9 @@ class BugzillaService < IssueTrackerService def fields [ { type: 'text', name: 'description', placeholder: description }, - { type: 'text', name: 'project_url', placeholder: 'http://bugzilla.example.com/describecomponents.cgi?product=PRODUCT_NAME' }, - { type: 'text', name: 'issues_url', placeholder: 'http://bugzilla.example.com/show_bug.cgi?id=:id' }, - { type: 'text', name: 'new_issue_url', placeholder: 'http://bugzilla.example.com/enter_bug.cgi?product=PRODUCT_NAME' } + { type: 'text', name: 'project_url', placeholder: 'Project url' }, + { type: 'text', name: 'issues_url', placeholder: 'Issue url' }, + { type: 'text', name: 'new_issue_url', placeholder: 'New Issue url' } ] end |