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

Conflicts:
	Gemfile.lock

Gemfile

@@ -10,6 +10,7 @@ ruby '2.1.5'
 
 gem 'sqlite3'
 gem 'foreman'
+gem 'crack', '0.3.1'
 
 # Pry for Rails, not in dev group in case running via prod/staging @ a training
 gem 'pry-rails'

Gemfile.lock

@@ -70,7 +70,12 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
+<<<<<<< HEAD
     coffee-script-source (1.9.0)
+=======
+    coffee-script-source (1.8.0)
+    crack (0.3.1)
+>>>>>>> b2c8e6cf8dbbaf33b548b62aba99aa9512322da9
     cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -308,6 +313,7 @@ DEPENDENCIES
   bundler-audit
   capybara
   coffee-rails
+  crack (= 0.3.1)
   database_cleaner
   execjs
   foreman

app/controllers/dashboard_controller.rb

@@ -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

app/views/dashboard/home.html.erb

@@ -27,13 +27,15 @@
 		        </div>
 			  </div>
 			</div>	
-
+			<center><b>Need help using this portal? Check out the <a href="doc?doc=README_FOR_APP">Readme</a></b></center>
         </div> <!-- end span12 -->
     </div>
   </div>
 </div>
 
 
+
+
 <script type="text/javascript">
 
 function makeActive(){

config/routes.rb

@@ -6,7 +6,7 @@ Railsgoat::Application.routes.draw do
   get "forgot_password" => "password_resets#forgot_password"
   get "password_resets" => "password_resets#confirm_token"
   post "password_resets" => "password_resets#reset_password"
-
+  get "dashboard/doc" => "dashboard#doc"
 
   resources :sessions do
   end