diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 15:11:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 15:11:31 +0300 |
commit | e2999d09ec050b12b6de9121d9aedc38c12477fd (patch) | |
tree | 8da9e224d3959aa110e109d2869023e0e236b148 /app/helpers | |
parent | 67cdffe4deb5c887c17115d4f974c0e8a267ffd2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/packages_helper.rb | 3 | ||||
-rw-r--r-- | app/helpers/tree_helper.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb index 8f365fd0786..04465f7798c 100644 --- a/app/helpers/packages_helper.rb +++ b/app/helpers/packages_helper.rb @@ -50,6 +50,7 @@ module PackagesHelper def track_package_event(event_name, scope, **args) ::Packages::CreateEventService.new(nil, current_user, event_name: event_name, scope: scope).execute - track_event(event_name, **args) + category = args.delete(:category) || self.class.name + ::Gitlab::Tracking.event(category, event_name.to_s, **args) end end diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index b050f533d77..b795851ba30 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -131,6 +131,8 @@ module TreeHelper def breadcrumb_data_attributes attrs = { + selected_branch: selected_branch, + can_push_code: can?(current_user, :push_code, @project).to_s, can_collaborate: can_collaborate_with_project?(@project).to_s, new_blob_path: project_new_blob_path(@project, @ref), upload_path: project_create_blob_path(@project, @ref), |