From ca3d868c3731018e18c4b5931d5a37466a16fa6a Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Wed, 10 May 2017 23:05:25 +0300 Subject: MRWidget: Implement new design for nothing to commit state. --- app/serializers/merge_request_entity.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/serializers') diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index a2542c54f7a..d31057c030c 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -97,6 +97,12 @@ class MergeRequestEntity < IssuableEntity presenter(merge_request).target_branch_commits_path end + expose :new_blob_path do |merge_request| + namespace_project_new_blob_path(merge_request.project.namespace, + merge_request.project, + merge_request.source_branch) + end + expose :conflict_resolution_path do |merge_request| presenter(merge_request).conflict_resolution_path end -- cgit v1.2.1 From 3f6121f2f57fab49326a2082a14dae249a91ac9d Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Wed, 10 May 2017 20:29:00 -0300 Subject: Returns new_blob_path only when user can push_code to project --- app/serializers/merge_request_entity.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/serializers') diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index d31057c030c..a49f4d834cd 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -98,9 +98,11 @@ class MergeRequestEntity < IssuableEntity end expose :new_blob_path do |merge_request| - namespace_project_new_blob_path(merge_request.project.namespace, - merge_request.project, - merge_request.source_branch) + if can?(current_user, :push_code, merge_request.project) + namespace_project_new_blob_path(merge_request.project.namespace, + merge_request.project, + merge_request.source_branch) + end end expose :conflict_resolution_path do |merge_request| -- cgit v1.2.1