Skip to content
Snippets Groups Projects
Commit e4bcc90d authored by Michael Kozono's avatar Michael Kozono
Browse files

Add “project moved” flash message on redirect

parent 0c866f4a
No related branches found
No related tags found
No related merge requests found
Loading
@@ -5,6 +5,7 @@ module RoutableActions
Loading
@@ -5,6 +5,7 @@ module RoutableActions
return unless request.get? return unless request.get?
   
if routable.full_path != requested_path if routable.full_path != requested_path
flash[:notice] = 'This project has moved to this location. Please update your links and bookmarks.'
redirect_to request.original_url.sub(requested_path, routable.full_path) redirect_to request.original_url.sub(requested_path, routable.full_path)
end end
end end
Loading
Loading
Loading
@@ -65,6 +65,7 @@ describe GroupsController do
Loading
@@ -65,6 +65,7 @@ describe GroupsController do
get :issues, id: redirect_route.path get :issues, id: redirect_route.path
   
expect(response).to redirect_to(issues_group_path(group.to_param)) expect(response).to redirect_to(issues_group_path(group.to_param))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
@@ -108,6 +109,7 @@ describe GroupsController do
Loading
@@ -108,6 +109,7 @@ describe GroupsController do
get :merge_requests, id: redirect_route.path get :merge_requests, id: redirect_route.path
   
expect(response).to redirect_to(merge_requests_group_path(group.to_param)) expect(response).to redirect_to(merge_requests_group_path(group.to_param))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
Loading
Loading
@@ -226,6 +226,7 @@ describe ProjectsController do
Loading
@@ -226,6 +226,7 @@ describe ProjectsController do
get :show, namespace_id: 'foo', id: 'bar' get :show, namespace_id: 'foo', id: 'bar'
   
expect(response).to redirect_to(public_project) expect(response).to redirect_to(public_project)
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
@@ -471,6 +472,7 @@ describe ProjectsController do
Loading
@@ -471,6 +472,7 @@ describe ProjectsController do
get :refs, namespace_id: 'foo', id: 'bar' get :refs, namespace_id: 'foo', id: 'bar'
   
expect(response).to redirect_to(refs_namespace_project_path(namespace_id: public_project.namespace, id: public_project)) expect(response).to redirect_to(refs_namespace_project_path(namespace_id: public_project.namespace, id: public_project))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
Loading
Loading
@@ -82,6 +82,7 @@ describe UsersController do
Loading
@@ -82,6 +82,7 @@ describe UsersController do
get :show, username: redirect_route.path get :show, username: redirect_route.path
   
expect(response).to redirect_to(user) expect(response).to redirect_to(user)
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
   
Loading
@@ -159,6 +160,7 @@ describe UsersController do
Loading
@@ -159,6 +160,7 @@ describe UsersController do
get :calendar, username: redirect_route.path get :calendar, username: redirect_route.path
   
expect(response).to redirect_to(user_calendar_path(user)) expect(response).to redirect_to(user_calendar_path(user))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
@@ -211,6 +213,7 @@ describe UsersController do
Loading
@@ -211,6 +213,7 @@ describe UsersController do
get :calendar_activities, username: redirect_route.path get :calendar_activities, username: redirect_route.path
   
expect(response).to redirect_to(user_calendar_activities_path(user)) expect(response).to redirect_to(user_calendar_activities_path(user))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
@@ -263,6 +266,7 @@ describe UsersController do
Loading
@@ -263,6 +266,7 @@ describe UsersController do
get :snippets, username: redirect_route.path get :snippets, username: redirect_route.path
   
expect(response).to redirect_to(user_snippets_path(user)) expect(response).to redirect_to(user_snippets_path(user))
expect(controller).to set_flash[:notice].to(/moved/)
end end
end end
end end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment