Merge branch 'remove-jquery-cookie-from-dashboard-spec' into 'master'
Replaced jquery.cookie with js.cookie ## What does this MR do? Fixes currently failing `teaspoon` build by replacing the last reference to `jquery.cookie` with `js.cookie`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `master` failing. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7160
This commit is contained in:
commit
51821e1ee4
1 changed files with 1 additions and 1 deletions
|
@ -1,7 +1,7 @@
|
||||||
/* eslint-disable */
|
/* eslint-disable */
|
||||||
/*= require sidebar */
|
/*= require sidebar */
|
||||||
/*= require jquery */
|
/*= require jquery */
|
||||||
/*= require jquery.cookie */
|
/*= require js.cookie */
|
||||||
/*= require lib/utils/text_utility */
|
/*= require lib/utils/text_utility */
|
||||||
|
|
||||||
((global) => {
|
((global) => {
|
||||||
|
|
Loading…
Reference in a new issue