diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-16 21:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-16 21:09:01 +0300 |
| commit | 4f5c8572e988e8c0c6871fb59ccfbfd39b9c2a06 (patch) | |
| tree | 5a88f2b76e947bce06488dc6c091fbd970ee73ea /app/serializers | |
| parent | 10fd79745df7b572fc79fd84b58e818e64bf2571 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_noteable_entity.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/merge_request_noteable_entity.rb b/app/serializers/merge_request_noteable_entity.rb index 8e7456ce059..a356b5b5cd4 100644 --- a/app/serializers/merge_request_noteable_entity.rb +++ b/app/serializers/merge_request_noteable_entity.rb @@ -50,6 +50,8 @@ class MergeRequestNoteableEntity < IssuableEntity merge_request.project.archived? end + expose :project_id + expose :archived_project_docs_path, if: -> (merge_request) { merge_request.project.archived? } do |merge_request| help_page_path('user/project/settings/index.md', anchor: 'archiving-a-project') end |