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

Restore old order for MR lists. Fix failing tests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-21 16:26:09 +02:00
parent 4a137651ec
commit 99b6750e15
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/contexts/merge_requests_load_context.rb
View file

@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
end
merge_requests = merge_requests.page(params[:page]).per(20)
merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
merge_requests = merge_requests.includes(:author, :project).order("created_at desc")
# Filter by specific assignee_id (or lack thereof)?
if params[:assignee_id].present?

2
spec/features/notes_on_merge_requests_spec.rb
View file

@ -67,7 +67,7 @@ describe "On a merge request", js: true do
end
# note added
it { within(".js-main-target-form") { should have_content("This is awsome!") } }
it { should have_content("This is awsome!") }
# reset form
it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }

2
spec/features/notes_on_wall_spec.rb
View file

@ -66,7 +66,7 @@ describe "On the project wall", js: true do
end
# note added
it { within(".js-main-target-form") { should have_content("This is awsome!") } }
it { should have_content("This is awsome!") }
# reset form
it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }