This is an automated email from the ASF dual-hosted git repository. gcruz pushed a commit to branch gc/8481 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 73ddd54848ee067f3b2b6319d4c85e8e8df15aaf Author: Guillermo Cruz <[email protected]> AuthorDate: Mon Nov 28 14:30:29 2022 -0600 [#8481] added target attributes to repository activity --- Allura/allura/controllers/repository.py | 2 +- Allura/allura/model/repo_refresh.py | 2 +- Allura/allura/tasks/repo_tasks.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py index cb9cad866..3f9c68997 100644 --- a/Allura/allura/controllers/repository.py +++ b/Allura/allura/controllers/repository.py @@ -219,7 +219,7 @@ class RepoRootController(BaseController, FeedController): ) session(t).flush() allura.tasks.notification_tasks.send_usermentions_notification.post(mr.index_id(), kw['description']) - g.director.create_activity(c.user, 'created', mr, + g.director.create_activity(c.user, 'created', mr, target=mr.app.repo, related_nodes=[c.project], tags=['merge-request']) redirect(mr.url()) diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py index da7d81651..232735c3d 100644 --- a/Allura/allura/model/repo_refresh.py +++ b/Allura/allura/model/repo_refresh.py @@ -93,7 +93,7 @@ def refresh_repo(repo, all_commits=False, notify=True, new_clone=False, commits_ g.statsUpdater.newCommit(new, repo.app_config.project, user) actor = user or TransientActor( activity_name=new.committed.name or new.committed.email) - g.director.create_activity(actor, 'committed', new, + g.director.create_activity(actor, 'committed', new, target=repo, related_nodes=[repo.app_config.project], tags=['commit', repo.tool.lower()]) diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py index 17f26788c..3eae80327 100644 --- a/Allura/allura/tasks/repo_tasks.py +++ b/Allura/allura/tasks/repo_tasks.py @@ -160,7 +160,7 @@ def merge(merge_request_id): mr.app.repo.merge(mr) mr.add_meta_post(changes={'Status': [mr.status, 'merged']}) mr.status = 'merged' - g.director.create_activity(c.user, 'merged', mr, + g.director.create_activity(c.user, 'merged', mr, target=mr.app.repo, related_nodes=[c.project], tags=['merge-request']) session(mr).flush(mr)
