diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 21:06:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 21:06:15 +0300 |
| commit | 7515ec41c527c62bfd56f46e388cf6d9fe06479f (patch) | |
| tree | 614b555ec428b7eac4b836473d43516c41f9da46 /app/helpers | |
| parent | a77db6bc47d8cdd9edae2ec22f640821d0794404 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 5 | ||||
| -rw-r--r-- | app/helpers/search_helper.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index df9d1933271..3c72f41a4c9 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -281,10 +281,7 @@ module IssuablesHelper } data[:hasClosingMergeRequest] = issuable.merge_requests_count(current_user) != 0 if issuable.is_a?(Issue) - - zoom_links = Gitlab::ZoomLinkExtractor.new(issuable.description).links - - data[:zoomMeetingUrl] = zoom_links.last if zoom_links.any? + data[:zoomMeetingUrl] = ZoomMeeting.canonical_meeting_url(issuable) if issuable.is_a?(Issue) if parent.is_a?(Group) data[:groupPath] = parent.path diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 978d0a8c8fb..a59cc3282bb 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -273,7 +273,7 @@ module SearchHelper sanitize(html, tags: %w(a p ol ul li pre code)) end - def search_tabs?(tab) + def show_user_search_tab? return false if Feature.disabled?(:users_search, default_enabled: true) if @project |