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
Léo-Paul Géneau
gitlab-ce
Commits
8887c245
Commit
8887c245
authored
Jun 27, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added canary conditional to status_entity.rb
parent
ed316249
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
app/serializers/status_entity.rb
app/serializers/status_entity.rb
+6
-1
No files found.
app/serializers/status_entity.rb
View file @
8887c245
...
@@ -8,7 +8,12 @@ class StatusEntity < Grape::Entity
...
@@ -8,7 +8,12 @@ class StatusEntity < Grape::Entity
expose
:favicon
do
|
status
|
expose
:favicon
do
|
status
|
dir
=
'ci_favicons'
dir
=
'ci_favicons'
dir
=
File
.
join
(
dir
,
'dev'
)
if
Rails
.
env
.
development?
if
ENV
[
'CANARY'
]
dir
=
File
.
join
(
dir
,
'canary'
)
elsif
Rails
.
env
.
development?
dir
=
File
.
join
(
dir
,
'dev'
)
end
ActionController
::
Base
.
helpers
.
image_path
(
File
.
join
(
dir
,
"
#{
status
.
favicon
}
.ico"
))
ActionController
::
Base
.
helpers
.
image_path
(
File
.
join
(
dir
,
"
#{
status
.
favicon
}
.ico"
))
end
end
...
...
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