Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
99b6750e
Commit
99b6750e
authored
Feb 21, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore old order for MR lists. Fix failing tests
parent
4a137651
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/contexts/merge_requests_load_context.rb
app/contexts/merge_requests_load_context.rb
+1
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+1
-1
spec/features/notes_on_wall_spec.rb
spec/features/notes_on_wall_spec.rb
+1
-1
No files found.
app/contexts/merge_requests_load_context.rb
View file @
99b6750e
...
@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
...
@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
end
end
merge_requests
=
merge_requests
.
page
(
params
[
:page
]).
per
(
20
)
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)?
# Filter by specific assignee_id (or lack thereof)?
if
params
[
:assignee_id
].
present?
if
params
[
:assignee_id
].
present?
...
...
spec/features/notes_on_merge_requests_spec.rb
View file @
99b6750e
...
@@ -67,7 +67,7 @@ describe "On a merge request", js: true do
...
@@ -67,7 +67,7 @@ describe "On a merge request", js: true do
end
end
# note added
# note added
it
{
within
(
".js-main-target-form"
)
{
should
have_content
(
"This is awsome!"
)
}
}
it
{
should
have_content
(
"This is awsome!"
)
}
# reset form
# reset form
it
{
within
(
".js-main-target-form"
)
{
should
have_no_field
(
"note[note]"
,
with:
"This is awesome!"
)
}
}
it
{
within
(
".js-main-target-form"
)
{
should
have_no_field
(
"note[note]"
,
with:
"This is awesome!"
)
}
}
...
...
spec/features/notes_on_wall_spec.rb
View file @
99b6750e
...
@@ -66,7 +66,7 @@ describe "On the project wall", js: true do
...
@@ -66,7 +66,7 @@ describe "On the project wall", js: true do
end
end
# note added
# note added
it
{
within
(
".js-main-target-form"
)
{
should
have_content
(
"This is awsome!"
)
}
}
it
{
should
have_content
(
"This is awsome!"
)
}
# reset form
# reset form
it
{
within
(
".js-main-target-form"
)
{
should
have_no_field
(
"note[note]"
,
with:
"This is awesome!"
)
}
}
it
{
within
(
".js-main-target-form"
)
{
should
have_no_field
(
"note[note]"
,
with:
"This is awesome!"
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment