release: merge back stable branch into default

docs/release-notes/release-notes-4.21.0.rst

@@ -0,0 +1,54
+|RCE| 4.21.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-09-28
+
+
+New Features
+^^^^^^^^^^^^
+
+- Pull requests: overhaul of the UX/UI by adding new sidebar
+- Pull requests: new live reviewer present indicator (requires channelstream enabled)
+- Pull requests: new live new comments indicator (requires channelstream enabled)
+- Pull requests: new sidebar with comments/todos/referenced tickets navigation
+- Commits page: Introduced sidebar for single commits pages
+
+
+General
+^^^^^^^
+
+- API: allow repo admins to get/set settings.
+  Previously it was only super-admins that could do that.
+- Sessions: patch baker to take expire time for redis for auto session cleanup feature.
+- Git: bumped git version to 2.27.0
+- Packages: bumped to channelstream==0.6.14
+
+
+Security
+^^^^^^^^
+
+- Issue trackers: fix XSS with description field.
+
+
+Performance
+^^^^^^^^^^^
+
+- Artifacts: speed-up of artifacts download request processing.
+
+
+Fixes
+^^^^^
+
+- Pull requests: properly save merge failure metadata.
+  In rare cases merge check reported conflicts which there were none.
+- Sessions: fixed cleanup with corrupted session data issue.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled feature release.
+- Git version was bumped to 2.27.0

docs/release-notes/release-notes-4.22.0.rst

@@ -0,0 +1,55
+|RCE| 4.22.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-10-12
+
+
+New Features
+^^^^^^^^^^^^
+
+- Reviewers: added observers as another role for reviewers.
+  Observers is a role that doesn't require voting, but still gets notified about
+  PR and should participate in review process.
+- Issue trackers: implemented more sophisticated ticket data extraction based on
+  advanced regex module. This allows using ticket references without false positives
+  like catching ticket data in an URL.
+- Channelstream: Notification about updates and comments now works via API, and both
+  Pull-requests and individual commits.
+
+
+General
+^^^^^^^
+
+- Data tables: unified tables look for main pages of rhodecode repo pages.
+- Users: autocomplete now sorts by matched username to show best matches first.
+- Pull requests: only allow actual reviewers to leave status/votes in order to not
+  confuse others users about voting from people who aren't actual reviewers.
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+- Default reviewers: optimize diff data, and creation of PR with advanced default reviewers
+- default-reviewers: diff data should load more things lazy for better performance.
+- Pull requests: limit the amount of data saved in default reviewers data for better memory usage
+- DB: don't use lazy loaders on PR related objects, to optimize memory usage on large
+  Pull requests with lots of comments, and commits.
+
+Fixes
+^^^^^
+
+- Quick search bar: fixes #5634, crash when search on non-ascii characters.
+- Sidebar: few fixes for panel rendering of reviewers/observers for both commits and PRS.
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled feature release.
+

rhodecode/lib/dbmigrate/versions/110_version_4_22_0.py

@@ -0,0 +1,68
+# -*- coding: utf-8 -*-
+
+import logging
+from sqlalchemy import *
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import meta, init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_20_0_0 as db
+
+    init_model_encryption(db)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    table = db.RepoReviewRuleUser.__table__
+    with op.batch_alter_table(table.name) as batch_op:
+        new_column = Column('role', Unicode(255), nullable=True)
+        batch_op.add_column(new_column)
+
+    _fill_rule_user_role(op, meta.Session)
+
+    table = db.RepoReviewRuleUserGroup.__table__
+    with op.batch_alter_table(table.name) as batch_op:
+        new_column = Column('role', Unicode(255), nullable=True)
+        batch_op.add_column(new_column)
+
+    _fill_rule_user_group_role(op, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
+
+
+def _fill_rule_user_role(op, session):
+    params = {'role': 'reviewer'}
+    query = text(
+        'UPDATE repo_review_rules_users SET role = :role'
+    ).bindparams(**params)
+    op.execute(query)
+    session().commit()
+
+
+def _fill_rule_user_group_role(op, session):
+    params = {'role': 'reviewer'}
+    query = text(
+        'UPDATE repo_review_rules_users_groups SET role = :role'
+    ).bindparams(**params)
+    op.execute(query)
+    session().commit()

rhodecode/lib/string_renderer.py

@@ -0,0 +1,35
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2020 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+def html(info):
+    """
+    Custom string as html content_type renderer for pyramid
+    """
+    def _render(value, system):
+        request = system.get('request')
+        if request is not None:
+            response = request.response
+            ct = response.content_type
+            if ct == response.default_content_type:
+                response.content_type = 'text/html'
+        return value
+
+    return _render

.hgtags

@@ -68,3 +68,5 7ac623a4a2405917e2af660d645ded662011e40d
 ef7ffda65eeb90c3ba88590a6cb816ef9b0bc232 v4.19.3
 3e635489bb7961df93b01e42454ad1a8730ae968 v4.20.0
 7e2eb896a02ca7cd2cd9f0f853ef3dac3f0039e3 v4.20.1
+8bb5fece08ab65986225b184e46f53d2a71729cb v4.21.0
+90734aac31ee4563bbe665a43ff73190cc762275 v4.22.0

docs/api/methods/pull-request-methods.rst

@@ -90,7 +90,7 comment_pull_request
 create_pull_request 
 -------------------
 
-.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, owner=<Optional:<OptionalAttr:apiuser>>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>)
+.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, owner=<Optional:<OptionalAttr:apiuser>>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, observers=<Optional:None>)
 
    Creates a new pull request.
 
@@ -128,6 +128,13 create_pull_request
        Accepts username strings or objects of the format:
 
            [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
+   :param observers: Set the new pull request observers list.
+       Reviewer defined by review rules will be added automatically to the
+       defined list. This feature is only available in RhodeCode EE
+   :type observers: Optional(list)
+       Accepts username strings or objects of the format:
+
+           [{'username': 'nick', 'reasons': ['original author']}]
 
 
 get_pull_request 
@@ -392,7 +399,7 merge_pull_request
 update_pull_request 
 -------------------
 
-.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
+.. py:function:: update_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, title=<Optional:''>, description=<Optional:''>, description_renderer=<Optional:''>, reviewers=<Optional:None>, observers=<Optional:None>, update_commits=<Optional:None>)
 
    Updates a pull request.
 
@@ -414,7 +421,11 update_pull_request
        Accepts username strings or objects of the format:
 
            [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
+   :param observers: Update pull request observers list with new value.
+   :type observers: Optional(list)
+       Accepts username strings or objects of the format:
 
+           [{'username': 'nick', 'reasons': ['should be aware about this PR']}]
    :param update_commits: Trigger update of commits for this pull request
    :type: update_commits: Optional(bool)
 
@@ -432,6 +443,12 update_pull_request
              ],
              "removed": []
            },
+           "updated_observers": {
+             "added": [
+               "username"
+             ],
+             "removed": []
+           },
            "updated_commits": {
              "added": [
                "<sha1_hash>"

docs/release-notes/release-notes.rst

@@ -9,6 +9,8 Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.22.0.rst
+   release-notes-4.21.0.rst
    release-notes-4.20.1.rst
    release-notes-4.20.0.rst
    release-notes-4.19.3.rst

pkgs/python-packages.nix

@@ -1816,6 +1816,17 self: super: {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  "regex" = super.buildPythonPackage {
+    name = "regex-2020.9.27";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/93/8c/17f45cdfb39b13d4b5f909e4b4c2917abcbdef9c0036919a0399769148cf/regex-2020.9.27.tar.gz";
+      sha256 = "179ngfzwbsjvn5vhyzdahvmg0f7acahkwwy9bpjy1pv08bm2mwx6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
+  };
   "redis" = super.buildPythonPackage {
     name = "redis-3.4.1";
     doCheck = false;
@@ -1872,7 +1883,7 self: super: {
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.20.0";
+    name = "rhodecode-enterprise-ce-4.22.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1946,6 +1957,7 self: super: {
       self."tzlocal"
       self."pyzmq"
       self."py-gfm"
+      self."regex"
       self."redis"
       self."repoze.lru"
       self."requests"

requirements.txt

@@ -56,6 +56,7 pytz==2019.3
 tzlocal==1.5.1
 pyzmq==14.6.0
 py-gfm==0.1.4
+regex==2020.9.27
 redis==3.4.1
 repoze.lru==0.7
 requests==2.22.0

rhodecode/__init__.py

@@ -48,7 +48,7 PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 109  # defines current db version for migrations
+__dbversion__ = 110  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/tests/test_create_pull_request.py

@@ -320,7 +320,7 class TestCreatePullRequestApi(object):
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
-        expected_message = 'no commits found'
+        expected_message = 'no commits found for merge between specified references'
         assert_error(id_, expected_message, given=response.body)
 
     @pytest.mark.backends("git", "hg")

rhodecode/api/tests/test_get_pull_requests.py

@@ -29,6 +29,7 from rhodecode.api.tests.utils import (
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
+
     @pytest.mark.backends("git", "hg")
     def test_api_get_pull_requests(self, pr_util):
         pull_request = pr_util.create_pull_request()
@@ -40,6 +41,7 class TestGetPullRequest(object):
             target_ref=pull_request.target_ref,
             revisions=pull_request.revisions,
             reviewers=(),
+            observers=(),
             title=pull_request.title,
             description=pull_request.description,
         )

rhodecode/api/tests/test_update_pull_request.py

@@ -51,6 +51,7 class TestUpdatePullRequest(object):
             "pull_request": response.json['result']['pull_request'],
             "updated_commits": {"added": [], "common": [], "removed": []},
             "updated_reviewers": {"added": [], "removed": []},
+            "updated_observers": {"added": [], "removed": []},
         }
 
         response_json = response.json['result']
@@ -111,6 +112,7 class TestUpdatePullRequest(object):
                                 "total": total_commits,
                                 "removed": []},
             "updated_reviewers": {"added": [], "removed": []},
+            "updated_observers": {"added": [], "removed": []},
         }
 
         assert_ok(id_, expected, response.body)
@@ -122,7 +124,7 class TestUpdatePullRequest(object):
         b = user_util.create_user()
         c = user_util.create_user()
         new_reviewers = [
-            {'username': b.username,'reasons': ['updated via API'],
+            {'username': b.username, 'reasons': ['updated via API'],
              'mandatory':False},
             {'username': c.username, 'reasons': ['updated via API'],
              'mandatory':False},
@@ -132,7 +134,7 class TestUpdatePullRequest(object):
         removed = [a.username]
 
         pull_request = pr_util.create_pull_request(
-            reviewers=[(a.username, ['added via API'], False, [])])
+            reviewers=[(a.username, ['added via API'], False, 'reviewer', [])])
 
         id_, params = build_data(
             self.apikey, 'update_pull_request',
@@ -146,6 +148,7 class TestUpdatePullRequest(object):
             "pull_request": response.json['result']['pull_request'],
             "updated_commits": {"added": [], "common": [], "removed": []},
             "updated_reviewers": {"added": added, "removed": removed},
+            "updated_observers": {"added": [], "removed": []},
         }
 
         assert_ok(id_, expected, response.body)

rhodecode/api/views/pull_request_api.py

@@ -26,12 +26,15 from rhodecode.api.utils import (
     has_superadmin_permission, Optional, OAttr, get_repo_or_error,
     get_pull_request_or_error, get_commit_or_error, get_user_or_error,
     validate_repo_permissions, resolve_ref_or_error, validate_set_owner_permissions)
+from rhodecode.lib import channelstream
 from rhodecode.lib.auth import (HasRepoPermissionAnyApi)
 from rhodecode.lib.base import vcs_operation_context
 from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.vcs.backends.base import unicode_to_reference
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import CommentsModel
-from rhodecode.model.db import Session, ChangesetStatus, ChangesetComment, PullRequest
+from rhodecode.model.db import (
+    Session, ChangesetStatus, ChangesetComment, PullRequest, PullRequestReviewers)
 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.validation_schema import Invalid
@@ -502,16 +505,19 def comment_pull_request(
         },
         error :  null
     """
+    _ = request.translate
+
     pull_request = get_pull_request_or_error(pullrequestid)
     if Optional.extract(repoid):
         repo = get_repo_or_error(repoid)
     else:
         repo = pull_request.target_repo
 
+    db_repo_name = repo.repo_name
     auth_user = apiuser
     if not isinstance(userid, Optional):
         is_repo_admin = HasRepoPermissionAnyApi('repository.admin')(
-            user=apiuser, repo_name=repo.repo_name)
+            user=apiuser, repo_name=db_repo_name)
         if has_superadmin_permission(apiuser) or is_repo_admin:
             apiuser = get_user_or_error(userid)
             auth_user = apiuser.AuthUser()
@@ -596,6 +602,7 def comment_pull_request(
         extra_recipients=extra_recipients,
         send_email=send_email
     )
+    is_inline = comment.is_inline
 
     if allowed_to_change_status and status:
         old_calculated_status = pull_request.calculated_review_status()
@@ -628,14 +635,39 def comment_pull_request(
         'comment_id': comment.comment_id if comment else None,
         'status': {'given': status, 'was_changed': status_change},
     }
+
+    comment_broadcast_channel = channelstream.comment_channel(
+        db_repo_name, pull_request_obj=pull_request)
+
+    comment_data = data
+    comment_type = 'inline' if is_inline else 'general'
+    channelstream.comment_channelstream_push(
+        request, comment_broadcast_channel, apiuser,
+        _('posted a new {} comment').format(comment_type),
+        comment_data=comment_data)
+
     return data
 
+def _reviewers_validation(obj_list):
+    schema = ReviewerListSchema()
+    try:
+        reviewer_objects = schema.deserialize(obj_list)
+    except Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
+
+    # validate users
+    for reviewer_object in reviewer_objects:
+        user = get_user_or_error(reviewer_object['username'])
+        reviewer_object['user_id'] = user.user_id
+    return reviewer_objects
+
 
 @jsonrpc_method()
 def create_pull_request(
         request, apiuser, source_repo, target_repo, source_ref, target_ref,
         owner=Optional(OAttr('apiuser')), title=Optional(''), description=Optional(''),
-        description_renderer=Optional(''), reviewers=Optional(None)):
+        description_renderer=Optional(''),
+        reviewers=Optional(None), observers=Optional(None)):
     """
     Creates a new pull request.
 
@@ -673,6 +705,13 def create_pull_request(
         Accepts username strings or objects of the format:
 
             [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
+    :param observers: Set the new pull request observers list.
+        Reviewer defined by review rules will be added automatically to the
+        defined list. This feature is only available in RhodeCode EE
+    :type observers: Optional(list)
+        Accepts username strings or objects of the format:
+
+            [{'username': 'nick', 'reasons': ['original author']}]
     """
 
     source_db_repo = get_repo_or_error(source_repo)
@@ -686,34 +725,39 def create_pull_request(
     full_source_ref = resolve_ref_or_error(source_ref, source_db_repo)
     full_target_ref = resolve_ref_or_error(target_ref, target_db_repo)
 
-    source_commit = get_commit_or_error(full_source_ref, source_db_repo)
-    target_commit = get_commit_or_error(full_target_ref, target_db_repo)
+    get_commit_or_error(full_source_ref, source_db_repo)
+    get_commit_or_error(full_target_ref, target_db_repo)
 
     reviewer_objects = Optional.extract(reviewers) or []
+    observer_objects = Optional.extract(observers) or []
 
     # serialize and validate passed in given reviewers
     if reviewer_objects:
-        schema = ReviewerListSchema()
-        try:
-            reviewer_objects = schema.deserialize(reviewer_objects)
-        except Invalid as err:
-            raise JSONRPCValidationError(colander_exc=err)
+        reviewer_objects = _reviewers_validation(reviewer_objects)
+
+    if observer_objects:
+        observer_objects = _reviewers_validation(reviewer_objects)
 
-        # validate users
-        for reviewer_object in reviewer_objects:
-            user = get_user_or_error(reviewer_object['username'])
-            reviewer_object['user_id'] = user.user_id
+    get_default_reviewers_data, validate_default_reviewers, validate_observers = \
+        PullRequestModel().get_reviewer_functions()
 
-    get_default_reviewers_data, validate_default_reviewers = \
-        PullRequestModel().get_reviewer_functions()
+    source_ref_obj = unicode_to_reference(full_source_ref)
+    target_ref_obj = unicode_to_reference(full_target_ref)
 
     # recalculate reviewers logic, to make sure we can validate this
     default_reviewers_data = get_default_reviewers_data(
-        owner, source_db_repo,
-        source_commit, target_db_repo, target_commit)
+        owner,
+        source_db_repo,
+        source_ref_obj,
+        target_db_repo,
+        target_ref_obj,
+    )
 
-    # now MERGE our given with the calculated
-    reviewer_objects = default_reviewers_data['reviewers'] + reviewer_objects
+    # now MERGE our given with the calculated from the default rules
+    just_reviewers = [
+        x for x in default_reviewers_data['reviewers']
+        if x['role'] == PullRequestReviewers.ROLE_REVIEWER]
+    reviewer_objects = just_reviewers + reviewer_objects
 
     try:
         reviewers = validate_default_reviewers(
@@ -721,9 +765,21 def create_pull_request(
     except ValueError as e:
         raise JSONRPCError('Reviewers Validation: {}'.format(e))
 
+    # now MERGE our given with the calculated from the default rules
+    just_observers = [
+        x for x in default_reviewers_data['reviewers']
+        if x['role'] == PullRequestReviewers.ROLE_OBSERVER]
+    observer_objects = just_observers + observer_objects
+
+    try:
+        observers = validate_observers(
+            observer_objects, default_reviewers_data)
+    except ValueError as e:
+        raise JSONRPCError('Observer Validation: {}'.format(e))
+
     title = Optional.extract(title)
     if not title:
-        title_source_ref = source_ref.split(':', 2)[1]
+        title_source_ref = source_ref_obj.name
         title = PullRequestModel().generate_pullrequest_title(
             source=source_repo,
             source_ref=title_source_ref,
@@ -732,20 +788,17 def create_pull_request(
 
     diff_info = default_reviewers_data['diff_info']
     common_ancestor_id = diff_info['ancestor']
-    commits = diff_info['commits']
+    # NOTE(marcink): reversed is consistent with how we open it in the WEB interface
+    commits = [commit['commit_id'] for commit in reversed(diff_info['commits'])]
 
     if not common_ancestor_id:
-        raise JSONRPCError('no common ancestor found')
+        raise JSONRPCError('no common ancestor found between specified references')
 
     if not commits:
-        raise JSONRPCError('no commits found')
-
-    # NOTE(marcink): reversed is consistent with how we open it in the WEB interface
-    revisions = [commit.raw_id for commit in reversed(commits)]
+        raise JSONRPCError('no commits found for merge between specified references')
 
     # recalculate target ref based on ancestor
-    target_ref_type, target_ref_name, __ = full_target_ref.split(':')
-    full_target_ref = ':'.join((target_ref_type, target_ref_name, common_ancestor_id))
+    full_target_ref = ':'.join((target_ref_obj.type, target_ref_obj.name, common_ancestor_id))
 
     # fetch renderer, if set fallback to plain in case of PR
     rc_config = SettingsModel().get_all_settings()
@@ -760,8 +813,9 def create_pull_request(
         target_repo=target_repo,
         target_ref=full_target_ref,
         common_ancestor_id=common_ancestor_id,
-        revisions=revisions,
+        revisions=commits,
         reviewers=reviewers,
+        observers=observers,
         title=title,
         description=description,
         description_renderer=description_renderer,
@@ -781,7 +835,7 def create_pull_request(
 def update_pull_request(
         request, apiuser, pullrequestid, repoid=Optional(None),
         title=Optional(''), description=Optional(''), description_renderer=Optional(''),
-        reviewers=Optional(None), update_commits=Optional(None)):
+        reviewers=Optional(None), observers=Optional(None), update_commits=Optional(None)):
     """
     Updates a pull request.
 
@@ -803,7 +857,11 def update_pull_request(
         Accepts username strings or objects of the format:
 
             [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
+    :param observers: Update pull request observers list with new value.
+    :type observers: Optional(list)
+        Accepts username strings or objects of the format:
 
+            [{'username': 'nick', 'reasons': ['should be aware about this PR']}]
     :param update_commits: Trigger update of commits for this pull request
     :type: update_commits: Optional(bool)
 
@@ -821,6 +879,12 def update_pull_request(
               ],
               "removed": []
             },
+            "updated_observers": {
+              "added": [
+                "username"
+              ],
+              "removed": []
+            },
             "updated_commits": {
               "added": [
                 "<sha1_hash>"
@@ -852,36 +916,14 def update_pull_request(
                 pullrequestid,))
 
     reviewer_objects = Optional.extract(reviewers) or []
-
-    if reviewer_objects:
-        schema = ReviewerListSchema()
-        try:
-            reviewer_objects = schema.deserialize(reviewer_objects)
-        except Invalid as err:
-            raise JSONRPCValidationError(colander_exc=err)
-
-        # validate users
-        for reviewer_object in reviewer_objects:
-            user = get_user_or_error(reviewer_object['username'])
-            reviewer_object['user_id'] = user.user_id
-
-        get_default_reviewers_data, get_validated_reviewers = \
-            PullRequestModel().get_reviewer_functions()
-
-        # re-use stored rules
-        reviewer_rules = pull_request.reviewer_data
-        try:
-            reviewers = get_validated_reviewers(
-                reviewer_objects, reviewer_rules)
-        except ValueError as e:
-            raise JSONRPCError('Reviewers Validation: {}'.format(e))
-    else:
-        reviewers = []
+    observer_objects = Optional.extract(observers) or []
 
     title = Optional.extract(title)
     description = Optional.extract(description)
     description_renderer = Optional.extract(description_renderer)
 
+    # Update title/description
+    title_changed = False
     if title or description:
         PullRequestModel().edit(
             pull_request,
@@ -890,8 +932,12 def update_pull_request(
             description_renderer or pull_request.description_renderer,
             apiuser)
         Session().commit()
+        title_changed = True
 
     commit_changes = {"added": [], "common": [], "removed": []}
+
+    # Update commits
+    commits_changed = False
     if str2bool(Optional.extract(update_commits)):
 
         if pull_request.pull_request_state</