diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:26:53 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 12:26:53 +0000 |
| commit | 812bb8b4388662e2c471dd689421a64daaededfb (patch) | |
| tree | 41dba64ef0e8d00d65857a36ad6b69f08c8b50c8 /app/views | |
| parent | 8e6fa5937be35b3b1c0907911ec9a961ccd23935 (diff) | |
| parent | ec8a25ba0b1b7cff6f432cb77574cfc181bea012 (diff) | |
| download | gitlab-ce-812bb8b4388662e2c471dd689421a64daaededfb.tar.gz | |
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
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/graphs/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/network/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/profiles/_head.html.haml b/app/views/profiles/_head.html.haml index 003884a5bd9..943ebdaeffe 100644 --- a/app/views/profiles/_head.html.haml +++ b/app/views/profiles/_head.html.haml @@ -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') diff --git a/app/views/projects/graphs/_head.html.haml b/app/views/projects/graphs/_head.html.haml index ca347406dfe..45e51389c00 100644 --- a/app/views/projects/graphs/_head.html.haml +++ b/app/views/projects/graphs/_head.html.haml @@ -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 diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index 091af4df4a1..b2ece44d966 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -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 } diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index db2b4885861..c7f39868e71 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -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 |