summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-03-01 12:21:36 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-03-01 12:25:08 +0200
commit6a859bbdda6aaca75ac40ca90aad71b695e92313 (patch)
treef423260b77fb80e8b177428b5a2659dbb498a3e3
parent34535c7d0a94591227692824661af143cf7f7759 (diff)
downloadgitlab-ce-dz-improve-mr-widget-json.tar.gz
Replace stubbed data in merge request entity with real onedz-improve-mr-widget-json
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/serializers/merge_request_entity.rb10
1 files 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