Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
8d6fae2c
Commit
8d6fae2c
authored
7 years ago
by
Phil Hughes
Browse files
Options
Download
Email Patches
Plain Diff
Removed user profile inline JavaScript
parent
48b976e0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
21 deletions
+12
-21
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-0
app/assets/javascripts/user_tabs.js
app/assets/javascripts/user_tabs.js
+6
-1
app/views/profiles/personal_access_tokens/index.html.haml
app/views/profiles/personal_access_tokens/index.html.haml
+1
-6
app/views/users/calendar.html.haml
app/views/users/calendar.html.haml
+1
-6
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-8
No files found.
app/assets/javascripts/dispatcher.js
View file @
8d6fae2c
...
...
@@ -409,6 +409,9 @@ import PerformanceBar from './performance_bar';
break
;
case
'
users:show
'
:
new
UserCallout
();
new
gl
.
User
({
action
:
document
.
querySelector
(
'
.js-user-profile
'
).
dataset
.
action
,
});
break
;
case
'
admin:conversational_development_index:show
'
:
new
UserCallout
();
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/user_tabs.js
View file @
8d6fae2c
/* eslint-disable max-len, space-before-function-paren, no-underscore-dangle, consistent-return, comma-dangle, no-unused-vars, dot-notation, no-new, no-return-assign, camelcase, no-param-reassign, class-methods-use-this */
/* global Calendar */
/*
UserTabs
...
...
@@ -147,7 +148,11 @@ export default class UserTabs {
return
;
}
const
$calendarWrap
=
this
.
$parentEl
.
find
(
'
.user-calendar
'
);
$calendarWrap
.
load
(
$calendarWrap
.
data
(
'
href
'
));
$calendarWrap
.
load
(
$calendarWrap
.
data
(
'
href
'
),
()
=>
{
const
calendarEl
=
document
.
querySelector
(
'
.calendar
'
);
return
new
Calendar
(
JSON
.
parse
(
calendarEl
.
dataset
.
dates
),
calendarEl
.
dataset
.
path
);
});
new
gl
.
Activities
();
return
this
.
loaded
[
'
activity
'
]
=
true
;
}
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/personal_access_tokens/index.html.haml
View file @
8d6fae2c
...
...
@@ -19,7 +19,7 @@
%h5
.prepend-top-0
Your New Personal Access Token
.form-group
=
text_field_tag
'created-personal-access-token'
,
flash
[
:personal_access_token
],
readonly:
true
,
class:
"form-control"
,
'aria-describedby'
=>
"created-personal-access-token-help-block"
=
text_field_tag
'created-personal-access-token'
,
flash
[
:personal_access_token
],
readonly:
true
,
class:
"form-control
js-select-on-focus
"
,
'aria-describedby'
=>
"created-personal-access-token-help-block"
=
clipboard_button
(
text:
flash
[
:personal_access_token
],
title:
"Copy personal access token to clipboard"
,
placement:
"left"
)
%span
#created-personal-access-token-help-block
.help-block.text-danger
Make sure you save it - you won't be able to access it again.
...
...
@@ -28,8 +28,3 @@
=
render
"shared/personal_access_tokens_form"
,
path:
profile_personal_access_tokens_path
,
impersonation:
false
,
token:
@personal_access_token
,
scopes:
@scopes
=
render
"shared/personal_access_tokens_table"
,
impersonation:
false
,
active_tokens:
@active_personal_access_tokens
,
inactive_tokens:
@inactive_personal_access_tokens
:javascript
$
(
"
#created-personal-access-token
"
).
click
(
function
()
{
this
.
select
();
});
This diff is collapsed.
Click to expand it.
app/views/users/calendar.html.haml
View file @
8d6fae2c
.clearfix.calendar
.clearfix.calendar
{
data:
{
dates:
@activity_dates
.
to_json
,
path:
user_calendar_activities_path
}
}
.js-contrib-calendar
.calendar-hint
Summary of issues, merge requests, push events, and comments
:javascript
new
Calendar
(
#{
@activity_dates
.
to_json
}
,
'
#{
user_calendar_activities_path
}
'
);
This diff is collapsed.
Click to expand it.
app/views/users/show.html.haml
View file @
8d6fae2c
...
...
@@ -9,7 +9,7 @@
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
user_url
(
@user
,
format: :atom
),
title:
"
#{
@user
.
name
}
activity"
)
.user-profile
.user-profile
.js-user-profile
{
data:
{
action:
controller
.
action_name
}
}
.cover-block.user-cover-block.layout-nav
.cover-controls
-
if
@user
==
current_user
...
...
@@ -129,10 +129,3 @@
.loading-status
=
spinner
:javascript
var
userProfile
;
userProfile
=
new
gl
.
User
({
action
:
"
#{
controller
.
action_name
}
"
});
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