diff --git a/pagure/api/user.py b/pagure/api/user.py index 6ea2b44..103fbae 100644 --- a/pagure/api/user.py +++ b/pagure/api/user.py @@ -62,18 +62,6 @@ def api_view_user(username): "custom_keys": [], "description": "", "parent": null, - "settings": { - "issues_default_to_private": false, - "Minimum_score_to_merge_pull-request": -1, - "Web-hooks": None, - "fedmsg_notifications": true, - "always_merge": false, - "project_documentation": true, - "Enforce_signed-off_commits_in_pull-request": false, - "pull_requests": true, - "Only_assignee_can_merge_pull-request": false, - "issue_tracker": true - }, "tags": [], "namespace": None, "priorities": {}, diff --git a/pagure/lib/model.py b/pagure/lib/model.py index e6640e4..7831079 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -915,7 +915,7 @@ class Project(BASE): 'close_status': self.close_status, 'milestones': self.milestones, } - if not api: + if not api and not public: output['settings'] = self.settings return output diff --git a/tests/test_pagure_flask_api_group.py b/tests/test_pagure_flask_api_group.py index b1b6bf6..bd3a117 100644 --- a/tests/test_pagure_flask_api_group.py +++ b/tests/test_pagure_flask_api_group.py @@ -313,24 +313,6 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): "namespace": None, "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "project_documentation": False, - "pull_request_access_only": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "url_path": "test2", "user": { @@ -411,24 +393,6 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): "namespace": None, "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "project_documentation": False, - "pull_request_access_only": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "url_path": "test2", "user": { @@ -502,24 +466,6 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): "namespace": None, "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "project_documentation": False, - "pull_request_access_only": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "url_path": "test2", "user": { diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py index e16a723..0d08635 100644 --- a/tests/test_pagure_flask_api_user.py +++ b/tests/test_pagure_flask_api_user.py @@ -124,24 +124,6 @@ class PagureFlaskApiUSertests(tests.Modeltests): "namespace": None, "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "pull_request_access_only": False, - "project_documentation": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "user": { "fullname": "PY C", @@ -178,24 +160,6 @@ class PagureFlaskApiUSertests(tests.Modeltests): "namespace": None, "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "pull_request_access_only": False, - "project_documentation": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "user": { "fullname": "PY C", @@ -231,24 +195,6 @@ class PagureFlaskApiUSertests(tests.Modeltests): "namespace": "somenamespace", "parent": None, "priorities": {}, - "settings": { - "Enforce_signed-off_commits_in_pull-request": False, - "Minimum_score_to_merge_pull-request": -1, - "Only_assignee_can_merge_pull-request": False, - "Web-hooks": None, - "always_merge": False, - "fedmsg_notifications": True, - "issue_tracker": True, - "issue_tracker_read_only": False, - "issues_default_to_private": False, - "notify_on_commit_flag": False, - "notify_on_pull-request_flag": False, - "project_documentation": False, - "pull_request_access_only": False, - "pull_requests": True, - "roadmap_on_issues_page": False, - "stomp_notifications": True, - }, "tags": [], "user": { "fullname": "PY C",