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

Gemfile

@@ -10,6 +10,10 @@ 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'
 
 group :development, :mysql do
   gem 'brakeman'

Gemfile.lock

@@ -75,6 +75,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
+    crack (0.3.1)
     cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -184,6 +185,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-rails (0.3.3)
+      pry (>= 0.9.10)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -312,6 +315,7 @@ DEPENDENCIES
   bundler-audit
   capybara
   coffee-rails
+  crack (= 0.3.1)
   database_cleaner
   execjs
   foreman
@@ -328,6 +332,7 @@ DEPENDENCIES
   poltergeist
   powder
   pry
+  pry-rails
   rack-livereload
   rails (= 3.2.21)
   rb-fsevent

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(){

app/views/users/new.html.erb

@@ -5,32 +5,26 @@
           <div class="span4 offset4">
             <div class="signup">
       <%= form_for @user, :html => {:id => "account_edit", :class=> "signup-wrapper"} do |f| %>
-
           <div class="header">
-                    <h2>Sign Up</h2>
+            <h2>Sign Up</h2>
-                    <p>Fill out the form below to login</p>
+            <p>Fill out the form below to login</p>
-                  </div>
+           </div>
-
           <div class="content">
-                <%= f.text_field :email, {:class => "input input-block-level", :placeholder => "Email"} %>
+            <%= f.text_field :email, {:class => "input input-block-level", :placeholder => "Email"} %>
-
+            <%= f.text_field :first_name, {:class => "input input-block-level", :placeholder => "First Name"} %>
-                <%= f.text_field :first_name, {:class => "input input-block-level", :placeholder => "First Name"} %>
+            <%= f.text_field :last_name, {:class => "input input-block-level", :placeholder => "Last Name"} %>
-
+            <div class="control-group">
-                <%= f.text_field :last_name, {:class => "input input-block-level", :placeholder => "Last Name"} %>
+              <%= f.password_field :password, {:class => "input input-block-level", :placeholder => "Password"}%>
-
+            </div>
-                  <div class="control-group">
+            <div class="control-group">
-                  <%= f.password_field :password, {:class => "input input-block-level", :placeholder => "Password"}%>
+                <%= f.password_field :password_confirmation, {:class => "input input-block-level", :placeholder => "Confirm Password"}%>
-              </div>
+            </div>
-              <div class="control-group">
-                  <%= f.password_field :password_confirmation, {:class => "input input-block-level", :placeholder => "Confirm Password"}%>
-              </div>
           </div>
-
           <div class="actions">
             <%= f.submit "Submit", {:id => 'submit_button', :class => "btn btn-info btn-large pull-right"} %>
           </div>
           <div class="clearfix"></div>
-        <% end %>
+      <% end %>
 
             </div>
           </div>

config/environments/test.rb

@@ -22,7 +22,7 @@ Railsgoat::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection    = true
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

config/routes.rb

@@ -6,7 +6,7 @@ Railsgoat::Application.routes.draw do
   match "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