Fix: fix wrong rebase

eballance · Sep 16, 2014 · d90eaf0 · d90eaf0
1 parent 4f6333d
commit d90eaf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -86,8 +86,8 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    highline (1.6.21)
     hashie (3.3.1)
+    highline (1.6.21)
     hike (1.2.3)
     httparty (0.13.1)
       json (~> 1.8)
@@ -220,7 +220,7 @@ PLATFORMS
 DEPENDENCIES
   better_errors
   binding_of_caller
-  bootstrap-sass (~> 3.1.1)
+  bootstrap-sass
   capistrano (~> 2.0)
   capistrano-ext
   capybara

diff --git a/app/controllers/entries_controller.rb b/app/controllers/entries_controller.rb
@@ -3,19 +3,14 @@ class EntriesController < ApplicationController
 
   def index
     @entry_finder = Entry::Finder.new(finder_params)
-    @entry_form ||= EntryForm.new
+    @entry_form ||= EntryForm.new(current_user)
 
     respond_to do |format|
       format.html
       format.pdf do
         send_pdf_data('entries/index.pdf.slim', 'report.pdf')
       end
     end
-
-    @total = @entries.sum(:minutes)
-
-    @entry_form ||= EntryForm.new(current_user)
-
   end
 
   def new