Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 2 deletions

diff --git a/app/assets/javascripts/repository/commits_service.js b/app/assets/javascripts/repository/commits_service.js
index f009c0310c5..d029f8cf89f 100644
--- a/app/assets/javascripts/repository/commits_service.js
+++ b/app/assets/javascripts/repository/commits_service.js
@@ -35,7 +35,7 @@ const fetchData = (projectPath, path, ref, offset) => {
     gon.relative_url_root || '/',
     projectPath,
     '/-/refs/',
-    ref,
+    encodeURIComponent(ref),
     '/logs_tree/',
     encodeURIComponent(removeLeadingSlash(path)),
   );
diff --git a/app/assets/javascripts/repository/utils/ref_switcher_utils.js b/app/assets/javascripts/repository/utils/ref_switcher_utils.js
index 8ff52104c93..ceb80d85f74 100644
--- a/app/assets/javascripts/repository/utils/ref_switcher_utils.js
+++ b/app/assets/javascripts/repository/utils/ref_switcher_utils.js
@@ -24,7 +24,12 @@ export function generateRefDestinationPath(projectRootPath, selectedRef) {
     [, namespace, , target] = match;
   }
 
-  const destinationPath = joinPaths(projectRootPath, namespace, selectedRef, target);
+  const destinationPath = joinPaths(
+    projectRootPath,
+    namespace,
+    encodeURIComponent(selectedRef),
+    target,
+  );
 
   return `${destinationPath}${window.location.hash}`;
 }