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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a68a2306
Commit
a68a2306
authored
6 years ago
by
Constance Okoghenun
Committed by
Jacob Schatz
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Webpack bundle tag for users:show
parent
975dc69e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
17 deletions
+7
-17
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+0
-5
app/assets/javascripts/pages/users/activity_calendar.js
app/assets/javascripts/pages/users/activity_calendar.js
+0
-0
app/assets/javascripts/pages/users/index.js
app/assets/javascripts/pages/users/index.js
+2
-0
app/assets/javascripts/pages/users/show/index.js
app/assets/javascripts/pages/users/show/index.js
+0
-3
app/assets/javascripts/pages/users/user_tabs.js
app/assets/javascripts/pages/users/user_tabs.js
+5
-5
app/views/users/show.html.haml
app/views/users/show.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
a68a2306
...
@@ -467,11 +467,6 @@ var Dispatcher;
...
@@ -467,11 +467,6 @@ var Dispatcher;
.
then
(
callDefault
)
.
then
(
callDefault
)
.
catch
(
fail
);
.
catch
(
fail
);
break
;
break
;
case
'
users:show
'
:
import
(
'
./pages/users/show
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
admin:conversational_development_index:show
'
:
case
'
admin:conversational_development_index:show
'
:
import
(
'
./pages/admin/conversational_development_index/show
'
)
import
(
'
./pages/admin/conversational_development_index/show
'
)
.
then
(
callDefault
)
.
then
(
callDefault
)
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/users/activity_calendar.js
→
app/assets/javascripts/
pages/
users/activity_calendar.js
View file @
a68a2306
File moved
This diff is collapsed.
Click to expand it.
app/assets/javascripts/users/index.js
→
app/assets/javascripts/
pages/
users/index.js
View file @
a68a2306
import
UserCallout
from
'
~/user_callout
'
;
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
UserTabs
from
'
./user_tabs
'
;
import
UserTabs
from
'
./user_tabs
'
;
...
@@ -22,4 +23,5 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -22,4 +23,5 @@ document.addEventListener('DOMContentLoaded', () => {
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
const
action
=
page
.
split
(
'
:
'
)[
1
];
const
action
=
page
.
split
(
'
:
'
)[
1
];
initUserProfile
(
action
);
initUserProfile
(
action
);
new
UserCallout
();
// eslint-disable-line no-new
});
});
This diff is collapsed.
Click to expand it.
app/assets/javascripts/pages/users/show/index.js
deleted
100644 → 0
View file @
975dc69e
import
UserCallout
from
'
~/user_callout
'
;
export
default
()
=>
new
UserCallout
();
This diff is collapsed.
Click to expand it.
app/assets/javascripts/users/user_tabs.js
→
app/assets/javascripts/
pages/
users/user_tabs.js
View file @
a68a2306
import
axios
from
'
../lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
Activities
from
'
../activities
'
;
import
Activities
from
'
~/activities
'
;
import
{
localTimeAgo
}
from
'
~/lib/utils/datetime_utility
'
;
import
{
__
}
from
'
~/locale
'
;
import
flash
from
'
~/flash
'
;
import
ActivityCalendar
from
'
./activity_calendar
'
;
import
ActivityCalendar
from
'
./activity_calendar
'
;
import
{
localTimeAgo
}
from
'
../lib/utils/datetime_utility
'
;
import
{
__
}
from
'
../locale
'
;
import
flash
from
'
../flash
'
;
/**
/**
* UserTabs
* UserTabs
...
...
This diff is collapsed.
Click to expand it.
app/views/users/show.html.haml
View file @
a68a2306
...
@@ -4,9 +4,6 @@
...
@@ -4,9 +4,6 @@
-
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"
)
...
...
This diff is collapsed.
Click to expand it.
config/webpack.config.js
View file @
a68a2306
...
@@ -99,7 +99,6 @@ var config = {
...
@@ -99,7 +99,6 @@ 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
'
,
webpack_runtime
:
'
./webpack.js
'
,
webpack_runtime
:
'
./webpack.js
'
,
},
},
...
...
This diff is collapsed.
Click to expand it.
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