From 6a859bbdda6aaca75ac40ca90aad71b695e92313 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 1 Mar 2017 12:21:36 +0200 Subject: Replace stubbed data in merge request entity with real one Signed-off-by: Dmitriy Zaporozhets --- app/serializers/merge_request_entity.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index cf025d6ec80..ba1473f95e3 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -47,19 +47,21 @@ class MergeRequestEntity < IssuableEntity end expose :can_revert do |merge_request| - true + merge_request.can_be_reverted?(request.current_user) end end expose :can_be_cherry_picked do |merge_request| - true + merge_request.can_be_cherry_picked? end expose :target_branch_path do |merge_request| - '/gitlab-org/gitlab-ce/commits/wiki-doc' + namespace_project_commits_path(merge_request.project.namespace, + merge_request.project, + merge_request.target_branch) end expose :project_archived do |merge_request| - false + merge_request.project.archived? end end -- cgit v1.2.1