summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-03-23 14:15:34 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-24 23:13:05 +0800
commita16defb89aec1f1604e076adf0e6bc07baa29a43 (patch)
tree87cb7889e5ac1561dfaf0461115cd7ed3efeb165
parentc84b03d1cbc020e77798acffc6e312e3d71e7360 (diff)
downloadgitlab-ce-a16defb89aec1f1604e076adf0e6bc07baa29a43.tar.gz
Merge branch 'filter-bar-fix-ie' into 'master'
Fixed the filter bar not working in IE Closes #29742 See merge request !10149
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_manager.js2
-rw-r--r--changelogs/unreleased/filter-bar-fix-ie.yml4
-rw-r--r--spec/javascripts/filtered_search/filtered_search_manager_spec.js2
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 95cc6bd4b8b..aa68954fff7 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -369,7 +369,7 @@
paths.push(`search=${sanitized}`);
}
- const parameterizedUrl = `?scope=all&utf8=✓&${paths.join('&')}`;
+ const parameterizedUrl = `?scope=all&utf8=%E2%9C%93&${paths.join('&')}`;
gl.utils.visitUrl(parameterizedUrl);
}
diff --git a/changelogs/unreleased/filter-bar-fix-ie.yml b/changelogs/unreleased/filter-bar-fix-ie.yml
new file mode 100644
index 00000000000..f1fa7d9b177
--- /dev/null
+++ b/changelogs/unreleased/filter-bar-fix-ie.yml
@@ -0,0 +1,4 @@
+---
+title: Fixed filtered search not working in IE
+merge_request:
+author:
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
index b11b0c42e78..f82c4240034 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
@@ -55,7 +55,7 @@ const FilteredSearchSpecHelper = require('../helpers/filtered_search_spec_helper
});
describe('search', () => {
- const defaultParams = '?scope=all&utf8=✓&state=opened';
+ const defaultParams = '?scope=all&utf8=%E2%9C%93&state=opened';
it('should search with a single word', (done) => {
input.value = 'searchTerm';