-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'js-content-for' into 'master'
Re-implement page-specific JS in a better way. ## What does this MR do? This rebuilds the way we do page-specific JavaScript assets for a few reasons: - The current implementation does not work with Subresource Integrity (!4808) - The current implementation doesn't allow caching of libraries because each page we hook up with this system will have a separate application.js. Meaning that for every page that uses Ace Editor, we'd have to load Ace Editor plus any GitLab-specific scripts in the same file, making local caching of just Ace Editor impossible. - The current implementation is rather hacky. ## Are there points in the code the reviewer needs to double check? That Sprockets doesn't choke on this when we use precompiled assets. ## What are the relevant issue numbers? #14372 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [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) cc: @jschatz1 @pavelloz Thanks to @pavelloz for his example implementation which was very useful. See merge request !4883
Showing
- app/assets/javascripts/application.js.coffee 1 addition, 1 deletionapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/graphs/application.js.coffee 0 additions, 1 deletionapp/assets/javascripts/graphs/application.js.coffee
- app/assets/javascripts/lib/chart.js.coffee 1 addition, 0 deletionsapp/assets/javascripts/lib/chart.js.coffee
- app/assets/javascripts/lib/d3.js.coffee 1 addition, 0 deletionsapp/assets/javascripts/lib/d3.js.coffee
- app/assets/javascripts/lib/raphael.js.coffee 3 additions, 0 deletionsapp/assets/javascripts/lib/raphael.js.coffee
- app/assets/javascripts/lib/utils/animate.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/animate.js.coffee
- app/assets/javascripts/lib/utils/common_utils.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/common_utils.js.coffee
- app/assets/javascripts/lib/utils/datetime_utility.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/datetime_utility.js.coffee
- app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb
- app/assets/javascripts/lib/utils/jquery.timeago.js 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/jquery.timeago.js
- app/assets/javascripts/lib/utils/md5.js 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/md5.js
- app/assets/javascripts/lib/utils/notify.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/notify.js.coffee
- app/assets/javascripts/lib/utils/text_utility.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/text_utility.js.coffee
- app/assets/javascripts/lib/utils/type_utility.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/type_utility.js.coffee
- app/assets/javascripts/lib/utils/url_utility.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/url_utility.js.coffee
- app/assets/javascripts/lib/utils/utf8_encode.js 0 additions, 0 deletionsapp/assets/javascripts/lib/utils/utf8_encode.js
- app/assets/javascripts/network/application.js.coffee 0 additions, 3 deletionsapp/assets/javascripts/network/application.js.coffee
- app/assets/javascripts/users/application.js.coffee 0 additions, 6 deletionsapp/assets/javascripts/users/application.js.coffee
- app/helpers/javascript_helper.rb 2 additions, 4 deletionsapp/helpers/javascript_helper.rb
- app/views/layouts/_head.html.haml 2 additions, 5 deletionsapp/views/layouts/_head.html.haml
Loading
Please register or sign in to comment