Merge branch 'master' of https://github.com/OWASP/railsgoat

Conflicts: Gemfile.lock
2015-02-26 09:13:15 -05:00
parent 716a16d514 b2c8e6cf8d
commit 9e7eb02cde
5 changed files with 15 additions and 3 deletions
@@ -22,5 +22,8 @@ class DashboardController < ApplicationController
     @user = current_user
     render :partial => "layouts/dashboard/dashboard_stats"
  end
-  
+
+  def doc
+    render "../../doc/" + params[:doc]
+  end 
 end