diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-10 23:05:25 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 15:11:55 +0300 |
| commit | ca3d868c3731018e18c4b5931d5a37466a16fa6a (patch) | |
| tree | 2a9634828a21755c1e6510ffc5df891d3e40ac79 /app/serializers | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
| download | gitlab-ce-ca3d868c3731018e18c4b5931d5a37466a16fa6a.tar.gz | |
MRWidget: Implement new design for nothing to commit state.
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 |