diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2016-12-12 15:22:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 15:22:28 +0100 |
| commit | 15d336256c0dca756e189fb9746ab60be2d3c886 (patch) | |
| tree | 0928ba68a0a679eae87b22fbf7ef5df7c09aa2b1 /gitlab/objects.py | |
| parent | 932ccd2214fc41a8274626397c4a88a3d6eef585 (diff) | |
| parent | f7e6482f6f8e5a5893f22739ec98005846c74eec (diff) | |
| download | gitlab-15d336256c0dca756e189fb9746ab60be2d3c886.tar.gz | |
Merge pull request #192 from galet/gitlab-8.14-jira
Fix JIRA service editing for GitLab 8.14+
Diffstat (limited to 'gitlab/objects.py')
| -rw-r--r-- | gitlab/objects.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gitlab/objects.py b/gitlab/objects.py index 2560ba4..4d1e7b8 100644 --- a/gitlab/objects.py +++ b/gitlab/objects.py @@ -1992,8 +1992,16 @@ class ProjectService(GitlabObject): 'server')), 'irker': (('recipients', ), ('default_irc_uri', 'server_port', 'server_host', 'colorize_messages')), - 'jira': (('new_issue_url', 'project_url', 'issues_url'), - ('api_url', 'description', 'username', 'password')), + 'jira': (tuple(), ( + # Required fields in GitLab >= 8.14 + 'url', 'project_key', + + # Required fields in GitLab < 8.14 + 'new_issue_url', 'project_url', 'issues_url', 'api_url', + 'description', + + # Optional fields + 'username', 'password', 'jira_issue_transition_id')), 'pivotaltracker': (('token', ), tuple()), 'pushover': (('api_key', 'user_key', 'priority'), ('device', 'sound')), 'redmine': (('new_issue_url', 'project_url', 'issues_url'), |