Skip to content
Snippets Groups Projects
Commit f87f6480 authored by Douwe Maan's avatar Douwe Maan
Browse files

Use new routing helper

parent 1489d225
No related branches found
No related tags found
1 merge request!1260Clean up overlap between dashboard and explore
Pipeline #
Loading
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
Loading
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
   
path = path =
if current_user if current_user
dashboard_path dashboard_projects_path
else else
new_user_session_path new_user_session_path
end end
Loading
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
Loading
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
path = group_path(group) path = group_path(group)
else else
label = "who knows what" label = "who knows what"
path = dashboard_path path = dashboard_projects_path
end end
   
[label, path] [label, path]
Loading
Loading
Loading
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
Loading
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project.project_members.find_by(user_id: current_user).destroy @project.project_members.find_by(user_id: current_user).destroy
   
respond_to do |format| respond_to do |format|
format.html { redirect_to dashboard_path } format.html { redirect_to dashboard_projects_path }
format.js { render nothing: true } format.js { render nothing: true }
end end
end end
Loading
Loading
Loading
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
Loading
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
if request.referer.include?('/admin') if request.referer.include?('/admin')
redirect_to admin_namespaces_projects_path redirect_to admin_namespaces_projects_path
else else
redirect_to dashboard_path redirect_to dashboard_projects_path
end end
rescue Projects::DestroyService::DestroyError => ex rescue Projects::DestroyService::DestroyError => ex
redirect_to edit_project_path(@project), alert: ex.message redirect_to edit_project_path(@project), alert: ex.message
Loading
Loading
Loading
@@ -5,7 +5,7 @@
Loading
@@ -5,7 +5,7 @@
- if current_user - if current_user
%ul.nav.nav-pills.event_filter.pull-right %ul.nav.nav-pills.event_filter.pull-right
%li.pull-right %li.pull-right
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do = link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
%i.fa.fa-rss %i.fa.fa-rss
= render 'shared/event_filter' = render 'shared/event_filter'
   
Loading
Loading
Loading
@@ -68,7 +68,7 @@ module SharedPaths
Loading
@@ -68,7 +68,7 @@ module SharedPaths
# ---------------------------------------- # ----------------------------------------
   
step 'I visit dashboard page' do step 'I visit dashboard page' do
visit dashboard_path visit dashboard_projects_path
end end
   
step 'I visit dashboard activity page' do step 'I visit dashboard activity page' do
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
Loading
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
   
context "projects atom feed via private token" do context "projects atom feed via private token" do
it "should render projects atom feed" do it "should render projects atom feed" do
visit dashboard_path(:atom, private_token: user.private_token) visit dashboard_projects_path(:atom, private_token: user.private_token)
expect(body).to have_selector('feed title') expect(body).to have_selector('feed title')
end end
end end
Loading
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
Loading
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
project.team << [user, :master] project.team << [user, :master]
issue_event(issue, user) issue_event(issue, user)
note_event(note, user) note_event(note, user)
visit dashboard_path(:atom, private_token: user.private_token) visit dashboard_projects_path(:atom, private_token: user.private_token)
end end
   
it "should have issue opened event" do it "should have issue opened event" do
Loading
Loading
Loading
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
Loading
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
expect(page.current_path).to eq starred_dashboard_projects_path expect(page.current_path).to eq starred_dashboard_projects_path
   
click_link 'Your Projects' click_link 'Your Projects'
expect(page.current_path).to eq dashboard_path expect(page.current_path).to eq dashboard_projects_path
end end
end end
   
Loading
Loading
Loading
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
Loading
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
include AccessMatchers include AccessMatchers
   
describe "GET /dashboard" do describe "GET /dashboard" do
subject { dashboard_path } subject { dashboard_projects_path }
   
it { is_expected.to be_allowed_for :admin } it { is_expected.to be_allowed_for :admin }
it { is_expected.to be_allowed_for :user } it { is_expected.to be_allowed_for :user }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment