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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1489d225
Commit
1489d225
authored
Sep 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move partial to right place and fix tests.
parent
5d785457
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/controllers/snippets_controller.rb
app/controllers/snippets_controller.rb
+1
-1
app/views/dashboard/projects/_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+0
-0
spec/controllers/root_controller_spec.rb
spec/controllers/root_controller_spec.rb
+4
-4
spec/routing/routing_spec.rb
spec/routing/routing_spec.rb
+3
-3
No files found.
app/controllers/groups_controller.rb
View file @
1489d225
...
@@ -15,7 +15,7 @@ class GroupsController < Groups::ApplicationController
...
@@ -15,7 +15,7 @@ class GroupsController < Groups::ApplicationController
layout
:determine_layout
layout
:determine_layout
def
index
def
index
redirect_to
(
current_user
?
dashboard_groups_path
:
explore_groups_path
)
redirect_to
(
current_user
?
dashboard_groups_path
:
explore_groups_path
)
end
end
def
new
def
new
...
...
app/controllers/projects_controller.rb
View file @
1489d225
...
@@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
...
@@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
layout
:determine_layout
layout
:determine_layout
def
index
def
index
redirect_to
(
current_user
?
root_path
:
explore_root_path
)
redirect_to
(
current_user
?
root_path
:
explore_root_path
)
end
end
def
new
def
new
...
...
app/controllers/snippets_controller.rb
View file @
1489d225
...
@@ -26,7 +26,7 @@ class SnippetsController < ApplicationController
...
@@ -26,7 +26,7 @@ class SnippetsController < ApplicationController
render
'index'
render
'index'
else
else
redirect_to
(
current_user
?
dashboard_snippets_path
:
explore_snippets_path
)
redirect_to
(
current_user
?
dashboard_snippets_path
:
explore_snippets_path
)
end
end
end
end
...
...
app/views/dashboard/_zero_authorized_projects.html.haml
→
app/views/dashboard/
projects/
_zero_authorized_projects.html.haml
View file @
1489d225
File moved
spec/controllers/root_controller_spec.rb
View file @
1489d225
require
'spec_helper'
require
'spec_helper'
describe
RootController
do
describe
RootController
do
describe
'GET
show
'
do
describe
'GET
index
'
do
context
'with a user'
do
context
'with a user'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
...
@@ -16,15 +16,15 @@ describe RootController do
...
@@ -16,15 +16,15 @@ describe RootController do
end
end
it
'redirects to their specified dashboard'
do
it
'redirects to their specified dashboard'
do
get
:
show
get
:
index
expect
(
response
).
to
redirect_to
starred_dashboard_projects_path
expect
(
response
).
to
redirect_to
starred_dashboard_projects_path
end
end
end
end
context
'who uses the default dashboard setting'
do
context
'who uses the default dashboard setting'
do
it
'renders the default dashboard'
do
it
'renders the default dashboard'
do
get
:
show
get
:
index
expect
(
response
).
to
render_template
'dashboard/
show
'
expect
(
response
).
to
render_template
'dashboard/
projects/index
'
end
end
end
end
end
end
...
...
spec/routing/routing_spec.rb
View file @
1489d225
...
@@ -206,7 +206,7 @@ end
...
@@ -206,7 +206,7 @@ end
# dashboard_merge_requests GET /dashboard/merge_requests(.:format) dashboard#merge_requests
# dashboard_merge_requests GET /dashboard/merge_requests(.:format) dashboard#merge_requests
describe
DashboardController
,
"routing"
do
describe
DashboardController
,
"routing"
do
it
"to #index"
do
it
"to #index"
do
expect
(
get
(
"/dashboard"
)).
to
route_to
(
'dashboard
#show
'
)
expect
(
get
(
"/dashboard"
)).
to
route_to
(
'dashboard
/projects#index
'
)
end
end
it
"to #issues"
do
it
"to #issues"
do
...
@@ -220,8 +220,8 @@ end
...
@@ -220,8 +220,8 @@ end
# root / root#show
# root / root#show
describe
RootController
,
'routing'
do
describe
RootController
,
'routing'
do
it
'to #
show
'
do
it
'to #
index
'
do
expect
(
get
(
'/'
)).
to
route_to
(
'root#
show
'
)
expect
(
get
(
'/'
)).
to
route_to
(
'root#
index
'
)
end
end
end
end
...
...
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