diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-08 19:03:11 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-08 19:03:11 +0000 |
| commit | 57da2e87053aab72378da20432a4882ab30cf0ce (patch) | |
| tree | 34be40308c4369e283f659499db8473ca44c7dfb /config | |
| parent | 79304c6a7f4433b6c00a2eb3db13bfeb68a87ea1 (diff) | |
| parent | a87b229b5d6da23e12e34d899f824f1f7e2dc28a (diff) | |
| download | gitlab-ce-57da2e87053aab72378da20432a4882ab30cf0ce.tar.gz | |
Merge branch 'cs-cropper' into 'master'
Split Cropper.js from the main JavaScript manifest.
## What does this MR do?
Splits Cropper.js from the main JavaScript file.
## Are there points in the code the reviewer needs to double check?
That the avatar uploader works. (It did in my testing)
## Why was this MR needed?
Smaller JS payload.
## What are the relevant issue numbers?
#14372
## Does this MR meet the acceptance criteria?
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4978
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 2b0595ede2b..21e7cc7b6e8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -84,6 +84,7 @@ module Gitlab config.assets.precompile << "graphs/application.js" config.assets.precompile << "users/application.js" config.assets.precompile << "network/application.js" + config.assets.precompile << "profile/application.js" config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" |