Merge branch 'rename-js-files' into 'master'
Replace namespace-specific application.js files with namespace-bundle.js files. Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file. This is pretty much just for the sake of clarity. cc: @alfredo1 See merge request !5221
This commit is contained in:
commit
812bb8b438
9 changed files with 8 additions and 8 deletions
|
@ -1,3 +1,3 @@
|
|||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_tag('lib/cropper.js')
|
||||
= page_specific_javascript_tag('profile/application.js')
|
||||
= page_specific_javascript_tag('profile/profile_bundle.js')
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_tag('lib/chart.js')
|
||||
= page_specific_javascript_tag('graphs/application.js')
|
||||
= page_specific_javascript_tag('graphs/graphs_bundle.js')
|
||||
= nav_link(action: :show) do
|
||||
= link_to 'Contributors', namespace_project_graph_path
|
||||
= nav_link(action: :commits) do
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- page_title "Network", @ref
|
||||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_tag('lib/raphael.js')
|
||||
= page_specific_javascript_tag('network/application.js')
|
||||
= page_specific_javascript_tag('network/network_bundle.js')
|
||||
= render "projects/commits/head"
|
||||
= render "head"
|
||||
%div{ class: container_class }
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
- page_description @user.bio
|
||||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_tag('lib/d3.js')
|
||||
= page_specific_javascript_tag('users/application.js')
|
||||
= page_specific_javascript_tag('users/users_bundle.js')
|
||||
- header_title @user.name, user_path(@user)
|
||||
- @no_container = true
|
||||
|
||||
|
|
|
@ -81,10 +81,10 @@ module Gitlab
|
|||
config.assets.precompile << "print.css"
|
||||
config.assets.precompile << "notify.css"
|
||||
config.assets.precompile << "mailers/*.css"
|
||||
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 << "graphs/graphs_bundle.js"
|
||||
config.assets.precompile << "users/users_bundle.js"
|
||||
config.assets.precompile << "network/network_bundle.js"
|
||||
config.assets.precompile << "profile/profile_bundle.js"
|
||||
config.assets.precompile << "lib/utils/*.js"
|
||||
config.assets.precompile << "lib/*.js"
|
||||
config.assets.precompile << "u2f.js"
|
||||
|
|
Loading…
Reference in a new issue