deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove critical status from Issue. Move sort instead

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-06-27 21:30:35 +03:00
parent 1b1e77c728
commit 50fdb2e7df
12 changed files with 30 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View file

@ -140,7 +140,7 @@ class IssuesController < ApplicationController
@issues = @issues.where(:assignee_id => params[:assignee_id]) if params[:assignee_id].present?
@issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present?
@issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
@issues = @issues.includes(:author, :project).order("critical, updated_at")
@issues = @issues.includes(:author, :project).order("updated_at")
@issues
end
end

2
app/controllers/merge_requests_controller.rb
View file

@ -30,7 +30,7 @@ class MergeRequestsController < ApplicationController
else @merge_requests.opened
end.page(params[:page]).per(20)
@merge_requests = @merge_requests.includes(:author, :project).order("created_at desc")
@merge_requests = @merge_requests.includes(:author, :project).order("closed, created_at desc")
end
def show