Merge branch 'master' into job-details-increase-debounejob-details-increase-deboune

* master: (273 commits)
  Pipeline show view real time header section
  Minor refactor based on review feedback
  Address review comments
  Show current user immediately in issuable filters
  Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`
  Add new Rake task to simplify the compilation of PO files
  Fix race condition between pipeline creation and MR diff_head_sha update
  Resolve "Improve Container Registry description"
  Allow admins to delete users from the admin users page
  Add username parameter to gravatar URL
  Explicitly test etag cache invalidation
  Fix replying to a commit discussion displayed in the context of an MR
  Add fog-aliyun as backup storage provider
  Add missing specs
  Make sure protected can't be null; Test protected!
  Update session cookie key name to be unique to instance in development
  Just mention which GitLab version is required
  Fix data inconsistency issue for old artifacts by moving them to a currently used path
  Fix N+1 queries for non-members in comment threads
  Fix rubocop in spec/helpers/diff_helper_spec.rb
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/app/views/projects/artifacts/_tree_directory.html.haml b/app/views/projects/artifacts/_tree_directory.html.haml
index 34d5c3b7285..e2966ec33c2 100644
--- a/app/views/projects/artifacts/_tree_directory.html.haml
+++ b/app/views/projects/artifacts/_tree_directory.html.haml
@@ -1,4 +1,4 @@
-- path_to_directory = browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: directory.path)
+- path_to_directory = browse_namespace_project_job_artifacts_path(@project.namespace, @project, @build, path: directory.path)
 
 %tr.tree-item{ 'data-link' => path_to_directory }
   %td.tree-item-file-name