diff options
| author | Steve Halasz <stevehalasz@gmail.com> | 2016-10-27 17:43:25 -0400 |
|---|---|---|
| committer | Steve Halasz <stevehalasz@gmail.com> | 2016-10-27 17:43:25 -0400 |
| commit | af1936def9f03200be3b84748e67d7935c30d7fd (patch) | |
| tree | 280a653b52c09e437a70b70ca242b79817be6fec | |
| parent | 32e46d35024ec394e3513910c2dc65f98dedda5a (diff) | |
| parent | 51821e1ee4533843a3abd03f8395fa89086e640c (diff) | |
| download | gitlab-ce-af1936def9f03200be3b84748e67d7935c30d7fd.tar.gz | |
Merge branch 'master' into 5905-duplicate-email-errors
Get fix for teaspoon tests
| -rw-r--r-- | spec/javascripts/dashboard_spec.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/dashboard_spec.js.es6 b/spec/javascripts/dashboard_spec.js.es6 index f54794634c1..93f73fa0e9a 100644 --- a/spec/javascripts/dashboard_spec.js.es6 +++ b/spec/javascripts/dashboard_spec.js.es6 @@ -1,7 +1,7 @@ /* eslint-disable */ /*= require sidebar */ /*= require jquery */ -/*= require jquery.cookie */ +/*= require js.cookie */ /*= require lib/utils/text_utility */ ((global) => { |