Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
0213bbc0
Commit
0213bbc0
authored
Jan 23, 2016
by
Steffen van Bergerem
Committed by
Dennis Schubert
Jan 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add podmin email to 500 error page
closes #6652
parent
ebfb901b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
Changelog.md
Changelog.md
+1
-0
app/views/errors/error_500.haml
app/views/errors/error_500.haml
+8
-0
No files found.
Changelog.md
View file @
0213bbc0
...
...
@@ -8,6 +8,7 @@
## Features
*
Keyboard shortcuts now do work on profile pages as well
[
#6647
](
https://github.com/diaspora/diaspora/pull/6647/files
)
*
Add the podmin email address to 500 errors
[
#6652
](
https://github.com/diaspora/diaspora/pull/6652
)
# 0.5.6.1
...
...
app/views/errors/error_500.haml
View file @
0213bbc0
...
...
@@ -8,3 +8,11 @@
500: Internal server error.
%h3
Our bad! Sorry about that. :(
-
if
AppConfig
.
admins
.
podmin_email?
%p
Drop us an email to
<a
href=
"mailto:
#{
AppConfig
.
admins
.
podmin_email
}
"
>
#{
AppConfig
.
admins
.
podmin_email
}
</a>
.
%p
%a
{
href:
"javascript:history.back()"
}
Go Back?
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