diff options
| author | Phil Hughes <me@iamphill.com> | 2016-02-29 09:47:22 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-02-29 09:47:22 +0000 |
| commit | cb0e26d1f7cf44c1fb9341fc94c0c819e653a3f6 (patch) | |
| tree | 314116463dd1dde9f26f110056fac8a94d3b5616 /app/assets/javascripts | |
| parent | f838dbe4d13c55fc8796eadf33165f1406612662 (diff) | |
| download | gitlab-ce-removed-ngprogress.tar.gz | |
Removed NGProgressremoved-ngprogress
In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator
Ref #13820
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/logo.js.coffee | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 5463397f475..c17d2186e29 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -31,8 +31,6 @@ #= require ace/ace #= require ace/ext-searchbox #= require underscore -#= require nprogress -#= require nprogress-turbolinks #= require dropzone #= require mousetrap #= require mousetrap/pause diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee index 35b2fbbba07..d14b7139237 100644 --- a/app/assets/javascripts/logo.js.coffee +++ b/app/assets/javascripts/logo.js.coffee @@ -1,4 +1,4 @@ -NProgress.configure(showSpinner: false) +Turbolinks.enableProgressBar(); defaultClass = 'tanuki-shape' pieces = [ |