Add latest changes from gitlab-org/gitlab@master

5 files changed, 11 insertions, 6 deletions

diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js
index 218bf41cd58..6ebbeecae1d 100644
--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
@@ -44,6 +44,7 @@ class DueDateSelect {
         this.$selectbox.hide();
         this.$value.css('display', '');
       },
+      shouldPropagate: false,
     });
   }
 
diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue
index 751565ad542..be70bfc7399 100644
--- a/app/assets/javascripts/repository/components/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/breadcrumbs.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlDropdown, GlDropdownDivider, GlDropdownHeader, GlDropdownItem } from '@gitlab/ui';
+import { joinPaths } from '~/lib/utils/url_utility';
 import { __ } from '../../locale';
 import Icon from '../../vue_shared/components/icon.vue';
 import getRefMixin from '../mixins/get_ref';
@@ -102,12 +103,12 @@ export default {
         .filter(p => p !== '')
         .reduce(
           (acc, name, i) => {
-            const path = `${i > 0 ? acc[i].path : ''}/${name}`;
+            const path = joinPaths(i > 0 ? acc[i].path : '', encodeURIComponent(name));
 
             return acc.concat({
               name,
               path,
-              to: `/-/tree/${escape(this.ref)}${escape(path)}`,
+              to: `/-/tree/${joinPaths(escape(this.ref), path)}`,
             });
           },
           [
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index c905c39bbba..b81e6a38b4c 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -91,7 +91,9 @@ export default {
   },
   computed: {
     routerLinkTo() {
-      return this.isFolder ? { path: `/-/tree/${escape(this.ref)}/${escape(this.path)}` } : null;
+      return this.isFolder
+        ? { path: `/-/tree/${escape(this.ref)}/${encodeURIComponent(this.path)}` }
+        : null;
     },
     iconName() {
       return `fa-${getIconName(this.type, this.path)}`;
@@ -141,6 +143,7 @@ export default {
       <i v-else :aria-label="type" role="img" :class="iconName" class="fa fa-fw"></i>
       <component
         :is="linkComponent"
+        ref="link"
         :to="routerLinkTo"
         :href="url"
         class="str-truncated"
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index 192e410b36f..ade92cc92e0 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -27,7 +27,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
 
   fetchpromise = axios
     .get(
-      `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${escape(
+      `${gon.relative_url_root}/${projectPath}/-/refs/${escape(ref)}/logs_tree/${encodeURIComponent(
         path.replace(/^\//, ''),
       )}`,
       {
diff --git a/app/assets/javascripts/vue_shared/components/pagination/constants.js b/app/assets/javascripts/vue_shared/components/pagination/constants.js
index 229132c0e33..748ad178c70 100644
--- a/app/assets/javascripts/vue_shared/components/pagination/constants.js
+++ b/app/assets/javascripts/vue_shared/components/pagination/constants.js
@@ -3,8 +3,8 @@ import { s__ } from '~/locale';
 export const PAGINATION_UI_BUTTON_LIMIT = 4;
 export const UI_LIMIT = 6;
 export const SPREAD = '...';
-export const PREV = s__('Pagination|‹ Prev');
-export const NEXT = s__('Pagination|Next ›');
+export const PREV = s__('Pagination|Prev');
+export const NEXT = s__('Pagination|Next');
 export const FIRST = s__('Pagination|« First');
 export const LAST = s__('Pagination|Last »');
 export const LABEL_FIRST_PAGE = s__('Pagination|Go to first page');