diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 18:08:59 +0300 |
| commit | 51858218a3961c6d872703eabde0635bc0a1368f (patch) | |
| tree | 4b62ba865821631fcc2e68025a5fade1b1e7b069 /app | |
| parent | 6986c1adc235859111e45593bb0bd61e70892d3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions/reply_button.vue | 1 | ||||
| -rw-r--r-- | app/services/issuable_base_service.rb | 5 | ||||
| -rw-r--r-- | app/views/import/bulk_imports/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions/reply_button.vue b/app/assets/javascripts/notes/components/note_actions/reply_button.vue index ae7afa71184..5ce03091504 100644 --- a/app/assets/javascripts/notes/components/note_actions/reply_button.vue +++ b/app/assets/javascripts/notes/components/note_actions/reply_button.vue @@ -18,7 +18,6 @@ export default { <template> <gl-button - ref="button" v-gl-tooltip data-track-event="click_button" data-track-label="reply_comment_button" diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 7c508237c8d..094b31b4ad6 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -258,6 +258,11 @@ class IssuableBaseService < BaseService invalidate_cache_counts(issuable, users: issuable.assignees.to_a) after_update(issuable) execute_hooks(issuable, 'update', old_associations: nil) + + if issuable.is_a?(MergeRequest) + Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter + .track_task_item_status_changed(user: current_user) + end end end diff --git a/app/views/import/bulk_imports/status.html.haml b/app/views/import/bulk_imports/status.html.haml index 17b1169609c..9ae71eabc8e 100644 --- a/app/views/import/bulk_imports/status.html.haml +++ b/app/views/import/bulk_imports/status.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs 'New group', admin_users_path +- add_to_breadcrumbs _('New group'), new_group_path - add_page_specific_style 'page_bundles/import' - breadcrumb_title _('Import groups') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index d8fac947a1f..debfe57dbd7 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -14,7 +14,8 @@ .cover-block.user-cover-block{ class: [('border-bottom' if profile_tabs.empty?)] } = render layout: 'users/cover_controls' do - if @user == current_user - = link_to profile_path, class: link_classes + 'btn gl-button btn-default btn-icon has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do + = link_to profile_path, class: link_classes + 'btn gl-button btn-default btn-icon has-tooltip', + title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = sprite_icon('pencil') - elsif current_user - if @user.abuse_report |