Merge branch 'master' into rt/comments

Conflicts: app/assets/javascripts/editor.js
2015-08-31 19:23:53 +02:00
parent d1297609f8 43d2428ca1
commit e14ee6def3
6 changed files with 176 additions and 77 deletions
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@ -56,7 +56,7 @@ class SubmissionsController < ApplicationController
  end

  def index
-    @search = Submission.last(100).search(params[:q])
+    @search = Submission.search(params[:q])
    @submissions = @search.result.includes(:exercise, :user).paginate(page: params[:page])
    authorize!
  end