summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-08 14:42:30 +0100
committerDouwe Maan <douwe@gitlab.com>2015-09-08 14:42:30 +0100
commitc258e97747f13cdc60ca2765789213292099c87a (patch)
treede95d9ebc5104eb8723c22301cbcb3fe02d5f887
parente0da2c352325c1cb2ede88a73434ed7afc037481 (diff)
downloadgitlab-ce-c258e97747f13cdc60ca2765789213292099c87a.tar.gz
Make Help accessible for guests.
-rw-r--r--app/controllers/help_controller.rb2
-rw-r--r--app/views/help/show.html.haml2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 71831c5380d..ad00948da51 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -1,4 +1,6 @@
class HelpController < ApplicationController
+ skip_before_action :authenticate_user!, :reject_blocked
+
layout 'help'
def index
diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml
index 8551496b98a..0398afb4c1d 100644
--- a/app/views/help/show.html.haml
+++ b/app/views/help/show.html.haml
@@ -1,3 +1,3 @@
- page_title @file.humanize, *@category.split("/").reverse.map(&:humanize)
.documentation.wiki
- = markdown @markdown.gsub('$your_email', current_user.email)
+ = markdown @markdown.gsub('$your_email', current_user.try(:email) || "email@example.com")