diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
| commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
| tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /spec/javascripts | |
| parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
| parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/project_title_spec.js.coffee | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee index 3d8de2ff989..1cf34d4d2d3 100644 --- a/spec/javascripts/project_title_spec.js.coffee +++ b/spec/javascripts/project_title_spec.js.coffee @@ -1,5 +1,6 @@ #= require bootstrap #= require select2 +#= require lib/type_utility #= require gl_dropdown #= require api #= require project_select |