diff --git a/Gemfile b/Gemfile index 52bfd45efa308253464b6b4e5c350c81f07998d5..75c4e52a4c70c2fafd042df3e12129ba567f5f37 100644 --- a/Gemfile +++ b/Gemfile @@ -634,7 +634,8 @@ gem 'ssh_data', '~> 2.0', feature_category: :shared gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 18.6.0', feature_category: :gitaly +# Using local gitaly gem for ListContributors RPC development +gem 'gitaly', path: '../gitaly/_build/gitaly', feature_category: :gitaly # KAS GRPC protocol definitions gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management diff --git a/Gemfile.lock b/Gemfile.lock index b430d961ddfc19ec903b0898b5fe26c10d8dba2e..24323b370955673a2064ec65acf992b39e810986 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,9 @@ +PATH + remote: ../gitaly/_build/gitaly + specs: + gitaly (18.6.0.pre.fa577c21b) + grpc (~> 1.0) + PATH remote: gems/activerecord-gitlab specs: @@ -732,8 +738,6 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (18.6.0) - grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) @@ -2175,7 +2179,7 @@ DEPENDENCIES gettext (~> 3.5, >= 3.5.1) gettext_i18n_rails (~> 1.13.0) git (~> 1.8) - gitaly (~> 18.6.0) + gitaly! gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) diff --git a/app/assets/javascripts/user_popovers.js b/app/assets/javascripts/user_popovers.js index b9dcb097c849d01e29814179d7852a75207de23f..8aeb916e51101275cdf5d0081293270537b9c8be 100644 --- a/app/assets/javascripts/user_popovers.js +++ b/app/assets/javascripts/user_popovers.js @@ -13,7 +13,7 @@ const removeTitle = (el) => { const getPreloadedUserInfo = (dataset) => { const userId = dataset.user || dataset.userId; - const { username, name, avatarUrl, email } = dataset; + const { username, name, avatarUrl, email, commitCountText } = dataset; return { userId, @@ -21,6 +21,7 @@ const getPreloadedUserInfo = (dataset) => { name, avatarUrl, email, + commitCountText, }; }; diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index b2756fc248353d2afb565be3402985b962bd1222..d7069aabce0b89a771bc54fa6b45e86a5571532a 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -275,6 +275,14 @@ export default {