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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
591d3d35
Commit
591d3d35
authored
Nov 28, 2018
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change start date and due date default order
parent
3814bcf3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/views/shared/epic/_sort_dropdown.html.haml
ee/app/views/shared/epic/_sort_dropdown.html.haml
+2
-2
ee/spec/controllers/groups/roadmap_controller_spec.rb
ee/spec/controllers/groups/roadmap_controller_spec.rb
+4
-4
No files found.
ee/app/views/shared/epic/_sort_dropdown.html.haml
View file @
591d3d35
...
...
@@ -9,6 +9,6 @@
%li
=
sortable_item
(
sort_title_created_date
,
page_filter_path
(
sort:
sort_value_recently_created
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_recently_updated
,
page_filter_path
(
sort:
sort_value_recently_updated
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_start_date
,
page_filter_path
(
sort:
sort_value_start_date_
later
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_end_date
,
page_filter_path
(
sort:
sort_value_end_date
_later
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_start_date
,
page_filter_path
(
sort:
sort_value_start_date_
soon
,
label:
true
),
sorted_by
)
=
sortable_item
(
sort_title_end_date
,
page_filter_path
(
sort:
sort_value_end_date
,
label:
true
),
sorted_by
)
=
sort_order_button
(
@sort
)
ee/spec/controllers/groups/roadmap_controller_spec.rb
View file @
591d3d35
...
...
@@ -31,8 +31,8 @@ describe Groups::RoadmapController do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
end
context
'when
user is logged in
'
do
it
'stores sorting param in a cookie'
do
context
'when
there is no logged user
'
do
it
'stores
epics
sorting param in a cookie'
do
group
.
update!
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PUBLIC
)
sign_out
(
user
)
...
...
@@ -43,8 +43,8 @@ describe Groups::RoadmapController do
end
end
context
'when there is
no
user logged in'
do
it
'stores
sorting param in a cooki
e'
do
context
'when there is
a
user logged in'
do
it
'stores
epics sorting param in user preferenc
e'
do
get
:show
,
group_id:
group
,
sort:
'start_date_asc'
expect
(
response
).
to
have_gitlab_http_status
(
200
)
...
...
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