diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-09 06:11:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-09 06:11:13 +0000 |
| commit | 8602c599660974a47ad705fd5cc3f97cd37b1a0f (patch) | |
| tree | 451721cd0674fed36623311434aedfcee19a882d /app | |
| parent | c860067451498253f56d70919bb01727a057184c (diff) | |
| download | gitlab-ce-8602c599660974a47ad705fd5cc3f97cd37b1a0f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/components/board_card_inner.vue | 1 | ||||
| -rw-r--r-- | app/models/integrations/base_chat_notification.rb | 2 | ||||
| -rw-r--r-- | app/models/repository.rb | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 5658a34e9a6..6c00f987b16 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -218,6 +218,7 @@ export default { :href="item.path || item.webUrl || ''" :title="item.title" :class="{ 'gl-text-gray-400!': item.isLoading }" + class="js-no-trigger" @mousemove.stop >{{ item.title }}</a > diff --git a/app/models/integrations/base_chat_notification.rb b/app/models/integrations/base_chat_notification.rb index 5eae8bce92a..c6335782b5e 100644 --- a/app/models/integrations/base_chat_notification.rb +++ b/app/models/integrations/base_chat_notification.rb @@ -253,3 +253,5 @@ module Integrations end end end + +Integrations::BaseChatNotification.prepend_mod_with('Integrations::BaseChatNotification') diff --git a/app/models/repository.rb b/app/models/repository.rb index fdb33008a8b..07d9bcb9368 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -632,7 +632,9 @@ class Repository return if licensee_object.name.blank? licensee_object - rescue Licensee::InvalidLicense + rescue Licensee::InvalidLicense => ex + Gitlab::ErrorTracking.track_exception(ex) + nil end memoize_method :license |