diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 12:10:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 12:10:23 +0300 |
commit | 4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (patch) | |
tree | a411c934419690755623a57ff7ea5f47050050e2 /app/helpers/issuables_helper.rb | |
parent | 03a521732276f8abc4ba069dd985b22cd9bc5929 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r-- | app/helpers/issuables_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 0b859a39c4f..398e76b6697 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -292,6 +292,7 @@ module IssuablesHelper { hasClosingMergeRequest: issuable.merge_requests_count(current_user) != 0, + issueType: issuable.issue_type, zoomMeetingUrl: ZoomMeeting.canonical_meeting_url(issuable), sentryIssueIdentifier: SentryIssue.find_by(issue: issuable)&.sentry_issue_identifier # rubocop:disable CodeReuse/ActiveRecord } @@ -301,8 +302,8 @@ module IssuablesHelper return { groupPath: parent.path } if parent.is_a?(Group) { - projectPath: ref_project.path, - projectNamespace: ref_project.namespace.full_path + projectPath: ref_project.path, + projectNamespace: ref_project.namespace.full_path } end |