Commit 99b6750e1586d7d5195a064e9b5226db7c64d276
1 parent
4a137651
Exists in
master
and in
4 other branches
Restore old order for MR lists. Fix failing tests
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/contexts/merge_requests_load_context.rb
| @@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext | @@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext | ||
| 14 | end | 14 | end |
| 15 | 15 | ||
| 16 | merge_requests = merge_requests.page(params[:page]).per(20) | 16 | merge_requests = merge_requests.page(params[:page]).per(20) |
| 17 | - merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc") | 17 | + merge_requests = merge_requests.includes(:author, :project).order("created_at desc") |
| 18 | 18 | ||
| 19 | # Filter by specific assignee_id (or lack thereof)? | 19 | # Filter by specific assignee_id (or lack thereof)? |
| 20 | if params[:assignee_id].present? | 20 | if params[:assignee_id].present? |
spec/features/notes_on_merge_requests_spec.rb
| @@ -67,7 +67,7 @@ describe "On a merge request", js: true do | @@ -67,7 +67,7 @@ describe "On a merge request", js: true do | ||
| 67 | end | 67 | end |
| 68 | 68 | ||
| 69 | # note added | 69 | # note added |
| 70 | - it { within(".js-main-target-form") { should have_content("This is awsome!") } } | 70 | + it { should have_content("This is awsome!") } |
| 71 | 71 | ||
| 72 | # reset form | 72 | # reset form |
| 73 | it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } | 73 | it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } |
spec/features/notes_on_wall_spec.rb
| @@ -66,7 +66,7 @@ describe "On the project wall", js: true do | @@ -66,7 +66,7 @@ describe "On the project wall", js: true do | ||
| 66 | end | 66 | end |
| 67 | 67 | ||
| 68 | # note added | 68 | # note added |
| 69 | - it { within(".js-main-target-form") { should have_content("This is awsome!") } } | 69 | + it { should have_content("This is awsome!") } |
| 70 | 70 | ||
| 71 | # reset form | 71 | # reset form |
| 72 | it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } | 72 | it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } |