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
ad2f0fe9
Commit
ad2f0fe9
authored
May 18, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GeoAwareAvatar#avatar_url signature
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
2c27ee95
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/ee/geo_aware_avatar.rb
app/models/ee/geo_aware_avatar.rb
+1
-1
No files found.
app/models/ee/geo_aware_avatar.rb
View file @
ad2f0fe9
...
...
@@ -4,7 +4,7 @@ module EE
# This module is intended to encapsulate Geo-specific logic
# and be **prepended** in the `Group`, `User`, `Project` models
module
GeoAwareAvatar
def
avatar_url
(
size
=
nil
,
scale
=
2
)
def
avatar_url
(
**
args
)
if
::
Gitlab
::
Geo
.
secondary?
&&
self
[
:avatar
].
present?
File
.
join
(
::
Gitlab
::
Geo
.
primary_node
.
url
,
avatar
.
url
)
else
...
...
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