BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1298fbe1
Commit
1298fbe1
authored
May 29, 2018
by
Toon Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix small typos
parent
60722592
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
shared_projects_controller.rb
app/controllers/groups/shared_projects_controller.rb
+1
-1
shared_projects_controller_spec.rb
spec/controllers/groups/shared_projects_controller_spec.rb
+4
-4
No files found.
app/controllers/groups/shared_projects_controller.rb
View file @
1298fbe1
...
@@ -21,7 +21,7 @@ module Groups
...
@@ -21,7 +21,7 @@ module Groups
def
finder_params
def
finder_params
@finder_params
||=
begin
@finder_params
||=
begin
# Make the `search` param consitent for the frontend,
# Make the `search` param consi
s
tent for the frontend,
# which will be using `filter`.
# which will be using `filter`.
params
[
:search
]
||=
params
[
:filter
]
if
params
[
:filter
]
params
[
:search
]
||=
params
[
:filter
]
if
params
[
:filter
]
params
.
permit
(
:sort
,
:search
)
params
.
permit
(
:sort
,
:search
)
...
...
spec/controllers/groups/shared_projects_controller_spec.rb
View file @
1298fbe1
...
@@ -13,9 +13,9 @@ describe Groups::SharedProjectsController do
...
@@ -13,9 +13,9 @@ describe Groups::SharedProjectsController do
).
execute
(
group
)
).
execute
(
group
)
end
end
l
et
(
:group
)
{
create
(
:group
)
}
s
et
(
:group
)
{
create
(
:group
)
}
l
et
(
:user
)
{
create
(
:user
)
}
s
et
(
:user
)
{
create
(
:user
)
}
let!
(
:shared_project
)
do
set
(
:shared_project
)
do
shared_project
=
create
(
:project
,
namespace:
user
.
namespace
)
shared_project
=
create
(
:project
,
namespace:
user
.
namespace
)
share_project
(
shared_project
)
share_project
(
shared_project
)
...
@@ -37,7 +37,7 @@ describe Groups::SharedProjectsController do
...
@@ -37,7 +37,7 @@ describe Groups::SharedProjectsController do
expect
(
json_project_ids
).
to
contain_exactly
(
shared_project
.
id
)
expect
(
json_project_ids
).
to
contain_exactly
(
shared_project
.
id
)
end
end
it
'allows fi
tl
ering shared projects'
do
it
'allows fi
lt
ering shared projects'
do
project
=
create
(
:project
,
:archived
,
namespace:
user
.
namespace
,
name:
"Searching for"
)
project
=
create
(
:project
,
:archived
,
namespace:
user
.
namespace
,
name:
"Searching for"
)
share_project
(
project
)
share_project
(
project
)
...
...
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