diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-03 13:17:03 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-03 13:17:03 -0600 |
| commit | 04dc2b76d7e382a6b6369576753cfc20928c99b8 (patch) | |
| tree | b9062e9886f1913a634e505755e284d7073f2eaa /app/assets/javascripts/line_highlighter.js | |
| parent | 152b292d0b566547875a44470c76e9a43cb28a36 (diff) | |
| parent | 538a6875d3b53f909e9b5b6ef396a457cbcae760 (diff) | |
| download | gitlab-ce-04dc2b76d7e382a6b6369576753cfc20928c99b8.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master: (181 commits)
Fixed adding to list bug
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
Fixed modal lists dropdown not updating when list is deleted
Fixed remove btn error after creating new issue in list
Removed duplicated test
Removed Masonry, instead uses groups of data
Uses mixins for repeated functions
Fixed up specs
Props use objects with required & type values
Removes labels instead of closing issue when clicking remove button
Fixed JS lint errors
Fixed issue card spec
Added webkit CSS properties
Fixed bug with empty state showing after search Fixed users href path being incorrect
Fixed bug where 2 un-selected issues would stay on selected tab
Fixed DB schema Changed how components are added in objects
Added remove button
Add optional id property to the issue schema
Fixed issue link href
Disabled add issues button if no lists exist
...
Diffstat (limited to 'app/assets/javascripts/line_highlighter.js')
| -rw-r--r-- | app/assets/javascripts/line_highlighter.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/line_highlighter.js b/app/assets/javascripts/line_highlighter.js index 28d962584d9..d7137ec63e4 100644 --- a/app/assets/javascripts/line_highlighter.js +++ b/app/assets/javascripts/line_highlighter.js @@ -171,7 +171,6 @@ require('vendor/jquery.scrollTo'); // This method is stubbed in tests. LineHighlighter.prototype.__setLocationHash__ = function(value) { return history.pushState({ - turbolinks: false, url: value // We're using pushState instead of assigning location.hash directly to // prevent the page from scrolling on the hashchange event |