BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
348e44ef
Unverified
Commit
348e44ef
authored
Feb 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont use avatars for user select if avatar is disabled
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0b0ba8be
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+3
-1
application_controller.rb
app/controllers/application_controller.rb
+1
-0
No files found.
app/assets/javascripts/users_select.js.coffee
View file @
348e44ef
...
@@ -2,10 +2,12 @@ $ ->
...
@@ -2,10 +2,12 @@ $ ->
userFormatResult
=
(
user
)
->
userFormatResult
=
(
user
)
->
if
user
.
avatar
if
user
.
avatar
avatar
=
user
.
avatar
.
url
avatar
=
user
.
avatar
.
url
else
else
if
gon
.
gravatar_enabled
avatar
=
gon
.
gravatar_url
avatar
=
gon
.
gravatar_url
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
else
avatar
=
gon
.
relative_url_root
+
"/assets/no_avatar.png"
"<div class='user-result'>
"<div class='user-result'>
<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>
<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>
...
...
app/controllers/application_controller.rb
View file @
348e44ef
...
@@ -171,6 +171,7 @@ class ApplicationController < ActionController::Base
...
@@ -171,6 +171,7 @@ class ApplicationController < ActionController::Base
gon
.
api_token
=
current_user
.
private_token
if
current_user
gon
.
api_token
=
current_user
.
private_token
if
current_user
gon
.
gravatar_url
=
request
.
ssl?
||
Gitlab
.
config
.
gitlab
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
gon
.
gravatar_url
=
request
.
ssl?
||
Gitlab
.
config
.
gitlab
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
gravatar_enabled
=
Gitlab
.
config
.
gravatar
.
enabled
end
end
def
check_password_expiration
def
check_password_expiration
...
...
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