Merge branch 'develop' into help_develop

3 files changed, 6 insertions, 15 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 693bd86..be7aa1f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,5 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  helper_method :current_user
-
-  private
-  def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
-  end
+  ActiveSupport.run_load_hooks(:application_controller, self)
 end
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 34fb201..9e68674 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -8,4 +8,4 @@ Try to create a
 
 %p
 See all 
-= link_to "tickets", tickets_path
\ No newline at end of file
+= link_to "tickets", tickets_path
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 04d2356..b75eed7 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,10 +1,6 @@
 = link_to "Leap Web", root_path, :class => 'brand'
 %ul.nav
-  - if current_user
-    %li
-      = link_to t(:logout), logout_path
-  - else
-    %li
-      = link_to t(:login), login_path
-    %li
-      = link_to t(:signup), signup_path
+  // = render '/tickets/nav'
+
+%ul.nav.pull-right
+  = render '/sessions/nav'