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
30c193a0
Commit
30c193a0
authored
Sep 11, 2020
by
Fabio Pitino
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-dasboard' into 'master'
Fix dasboard to dashboard See merge request gitlab-org/gitlab!41440
parents
f6e2ac05
da742a5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
ee/changelogs/unreleased/fix-dasboard.yml
ee/changelogs/unreleased/fix-dasboard.yml
+5
-0
ee/config/routes/security.rb
ee/config/routes/security.rb
+1
-1
ee/spec/controllers/operations_controller_spec.rb
ee/spec/controllers/operations_controller_spec.rb
+1
-1
spec/factories/metrics/users_starred_dashboards.rb
spec/factories/metrics/users_starred_dashboards.rb
+0
-0
No files found.
ee/changelogs/unreleased/fix-dasboard.yml
0 → 100644
View file @
30c193a0
---
title
:
Fix dasboard to dashboard
merge_request
:
41440
author
:
type
:
fixed
ee/config/routes/security.rb
View file @
30c193a0
...
...
@@ -2,7 +2,7 @@
namespace
:security
do
root
to:
'dashboard#show'
get
'dasboard/settings'
,
to:
'dashboard#settings'
,
as: :settings_dashboard
get
'das
h
board/settings'
,
to:
'dashboard#settings'
,
as: :settings_dashboard
resources
:projects
,
only:
[
:index
,
:create
,
:destroy
]
resources
:vulnerabilities
,
only:
[
:index
]
...
...
ee/spec/controllers/operations_controller_spec.rb
View file @
30c193a0
...
...
@@ -660,7 +660,7 @@ RSpec.describe OperationsController do
project_b
.
add_developer
(
user
)
end
it
'adds projects to the dasboard'
do
it
'adds projects to the das
h
board'
do
post
:create
,
params:
{
project_ids:
[
project_a
.
id
,
project_b
.
id
.
to_s
]
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
...
...
spec/factories/metrics/users_starred_dasboards.rb
→
spec/factories/metrics/users_starred_das
h
boards.rb
View file @
30c193a0
File moved
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