diff options
author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-10-29 06:03:43 +0300 |
---|---|---|
committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-11-13 10:27:42 +0300 |
commit | 91f235df08a08d45ec716ddca652ccba226abb5d (patch) | |
tree | 4353850575c8c50e450a884dfc64b4701e6905b9 /app/controllers | |
parent | ee4a7811a0cdb349e4a304f01db58292ebeedbdf (diff) |
Fix tests
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/dashboard_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/root_controller.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 714f0c0b545..5076c3da324 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -5,6 +5,9 @@ class DashboardController < Dashboard::ApplicationController include MergeRequestsAction FILTER_PARAMS = [ + # author_id and assignee_id are kept so old RSS links still work + :author_id, + :assignee_id, :author_username, :assignee_username, :milestone_title, diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index ebf70f25bda..7b6657e1196 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -45,9 +45,9 @@ class RootController < Dashboard::ProjectsController when 'todos' redirect_to(dashboard_todos_path) when 'issues' - redirect_to(issues_dashboard_path(assignee_id: current_user.id)) + redirect_to(issues_dashboard_path(assignee_username: current_user.username)) when 'merge_requests' - redirect_to(merge_requests_dashboard_path(assignee_id: current_user.id)) + redirect_to(merge_requests_dashboard_path(assignee_username: current_user.username)) end end |