Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
16a97d64
Commit
16a97d64
authored
Oct 11, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed d3.js from the users and graphs bundle
parent
efeaf3bd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
7 deletions
+19
-7
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+0
-6
app/assets/javascripts/users/index.js
app/assets/javascripts/users/index.js
+7
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+3
-0
changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml
...-included-in-the-user_profile-and-graphs_show-bundles.yml
+6
-0
config/webpack.config.js
config/webpack.config.js
+3
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
16a97d64
...
@@ -634,12 +634,6 @@ import U2FAuthenticate from './u2f/authenticate';
...
@@ -634,12 +634,6 @@ import U2FAuthenticate from './u2f/authenticate';
shortcut_handler
=
new
ShortcutsNavigation
();
shortcut_handler
=
new
ShortcutsNavigation
();
}
}
break
;
break
;
case
'
users
'
:
const
action
=
path
[
1
];
import
(
/* webpackChunkName: 'user_profile' */
'
./users
'
)
.
then
(
user
=>
user
.
default
(
action
))
.
catch
(()
=>
{});
break
;
}
}
// If we haven't installed a custom shortcut handler, install the default one
// If we haven't installed a custom shortcut handler, install the default one
if
(
!
shortcut_handler
)
{
if
(
!
shortcut_handler
)
{
...
...
app/assets/javascripts/users/index.js
View file @
16a97d64
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
UserTabs
from
'
./user_tabs
'
;
import
UserTabs
from
'
./user_tabs
'
;
export
default
function
initUserProfile
(
action
)
{
function
initUserProfile
(
action
)
{
// place profile avatars to top
// place profile avatars to top
$
(
'
.profile-groups-avatars
'
).
tooltip
({
$
(
'
.profile-groups-avatars
'
).
tooltip
({
placement
:
'
top
'
,
placement
:
'
top
'
,
...
@@ -17,3 +17,9 @@ export default function initUserProfile(action) {
...
@@ -17,3 +17,9 @@ export default function initUserProfile(action) {
$
(
this
).
parents
(
'
.project-limit-message
'
).
remove
();
$
(
this
).
parents
(
'
.project-limit-message
'
).
remove
();
});
});
}
}
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
const
action
=
page
.
split
(
'
:
'
)[
1
];
initUserProfile
(
action
);
});
app/views/users/show.html.haml
View file @
16a97d64
...
@@ -4,6 +4,9 @@
...
@@ -4,6 +4,9 @@
-
page_description
@user
.
bio
-
page_description
@user
.
bio
-
header_title
@user
.
name
,
user_path
(
@user
)
-
header_title
@user
.
name
,
user_path
(
@user
)
-
@no_container
=
true
-
@no_container
=
true
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_d3'
=
webpack_bundle_tag
'users'
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
...
...
changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml
0 → 100644
View file @
16a97d64
---
title
:
Removed d3.js from the graph and users bundles and used the common_d3 bundle
instead
merge_request
:
14826
author
:
type
:
other
config/webpack.config.js
View file @
16a97d64
...
@@ -84,6 +84,7 @@ var config = {
...
@@ -84,6 +84,7 @@ var config = {
vue_merge_request_widget
:
'
./vue_merge_request_widget/index.js
'
,
vue_merge_request_widget
:
'
./vue_merge_request_widget/index.js
'
,
test
:
'
./test.js
'
,
test
:
'
./test.js
'
,
two_factor_auth
:
'
./two_factor_auth.js
'
,
two_factor_auth
:
'
./two_factor_auth.js
'
,
users
:
'
./users/index.js
'
,
performance_bar
:
'
./performance_bar.js
'
,
performance_bar
:
'
./performance_bar.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
},
},
...
@@ -215,7 +216,9 @@ var config = {
...
@@ -215,7 +216,9 @@ var config = {
name
:
'
common_d3
'
,
name
:
'
common_d3
'
,
chunks
:
[
chunks
:
[
'
graphs
'
,
'
graphs
'
,
'
graphs_show
'
,
'
monitoring
'
,
'
monitoring
'
,
'
users
'
,
],
],
}),
}),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment