diff --git a/app/controllers/ec_courses_controller.rb b/app/controllers/ec_courses_controller.rb index cec0f862..4363b0eb 100644 --- a/app/controllers/ec_courses_controller.rb +++ b/app/controllers/ec_courses_controller.rb @@ -347,15 +347,15 @@ class EcCoursesController < ApplicationController def search_courses user = User.where(:id => params[:user_id]).first if user.try(:admin?) || user.try(:business?) - courses = Course.where(:is_delete => 0) + courses = Course.where(:is_delete => 0).limit(20) else course_ids = Member.where("user_id = #{user.try(:id)} and course_id != -1").pluck(:course_id) - courses = Course.where(:is_delete => 0, :id => course_ids) + courses = Course.where(:is_delete => 0, :id => course_ids).limit(20) end if params[:search] && params[:search].strip != "" courses = courses.where("name like ?", "%#{params[:search].strip}%").reorder("created_at desc") else - courses = courses.reorder("created_at desc") + courses = courses.reorder("created_at desc").limit(20) end respond_to do |format| diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 8b3e10fa..fc7d50be 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -336,10 +336,6 @@ class PullRequestsController < ApplicationController def pull_request_changes @type = params[:type] @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes) - - - - @changes_count = @changes.count @limit = 10 @is_remote = true