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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b1245604
Commit
b1245604
authored
Oct 26, 2018
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change param name for consistency
parent
e6a021f7
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/boards/components/project_select.vue
app/assets/javascripts/boards/components/project_select.vue
+1
-1
app/assets/javascripts/project_select.js
app/assets/javascripts/project_select.js
+2
-2
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+1
-1
app/views/shared/_new_project_item_select.html.haml
app/views/shared/_new_project_item_select.html.haml
+1
-1
lib/api/groups.rb
lib/api/groups.rb
+2
-2
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+1
-1
No files found.
app/assets/javascripts/boards/components/project_select.vue
View file @
b1245604
...
@@ -50,7 +50,7 @@ export default {
...
@@ -50,7 +50,7 @@ export default {
this
.
loading
=
true
;
this
.
loading
=
true
;
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
{
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
{
with_issues_enabled
:
true
,
with_issues_enabled
:
true
,
include
_shared
:
false
,
with
_shared
:
false
,
include_subgroups
:
true
include_subgroups
:
true
},
projects
=>
{
},
projects
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
...
...
app/assets/javascripts/project_select.js
View file @
b1245604
...
@@ -14,7 +14,7 @@ export default function projectSelect() {
...
@@ -14,7 +14,7 @@ export default function projectSelect() {
this
.
orderBy
=
$
(
select
).
data
(
'
orderBy
'
)
||
'
id
'
;
this
.
orderBy
=
$
(
select
).
data
(
'
orderBy
'
)
||
'
id
'
;
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
withIssuesEnabled
'
);
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
withIssuesEnabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
withMergeRequestsEnabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
withMergeRequestsEnabled
'
);
this
.
includeShared
=
$
(
select
).
data
(
'
includeShared
'
)
===
undefined
?
true
:
$
(
select
).
data
(
'
include
Shared
'
);
this
.
withShared
=
$
(
select
).
data
(
'
withShared
'
)
===
undefined
?
true
:
$
(
select
).
data
(
'
with
Shared
'
);
this
.
includeProjectsInSubgroups
=
$
(
select
).
data
(
'
includeProjectsInSubgroups
'
)
||
false
;
this
.
includeProjectsInSubgroups
=
$
(
select
).
data
(
'
includeProjectsInSubgroups
'
)
||
false
;
this
.
allowClear
=
$
(
select
).
data
(
'
allowClear
'
)
||
false
;
this
.
allowClear
=
$
(
select
).
data
(
'
allowClear
'
)
||
false
;
...
@@ -56,7 +56,7 @@ export default function projectSelect() {
...
@@ -56,7 +56,7 @@ export default function projectSelect() {
{
{
with_issues_enabled
:
_this
.
withIssuesEnabled
,
with_issues_enabled
:
_this
.
withIssuesEnabled
,
with_merge_requests_enabled
:
_this
.
withMergeRequestsEnabled
,
with_merge_requests_enabled
:
_this
.
withMergeRequestsEnabled
,
include_shared
:
_this
.
include
Shared
,
with_shared
:
_this
.
with
Shared
,
include_subgroups
:
_this
.
includeProjectsInSubgroups
,
include_subgroups
:
_this
.
includeProjectsInSubgroups
,
},
},
projectsCallback
,
projectsCallback
,
...
...
app/views/groups/issues.html.haml
View file @
b1245604
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
=
render
'shared/issuable/nav'
,
type: :issues
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.nav-controls
=
render
'shared/issuable/feed_buttons'
=
render
'shared/issuable/feed_buttons'
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
,
with_feature_enabled:
'issues'
,
include
_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
,
with_feature_enabled:
'issues'
,
with
_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/issuable/search_bar'
,
type: :issues
=
render
'shared/issuable/search_bar'
,
type: :issues
...
...
app/views/groups/merge_requests.html.haml
View file @
b1245604
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
render
'shared/issuable/nav'
,
type: :merge_requests
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
if
current_user
-
if
current_user
.nav-controls
.nav-controls
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
,
with_feature_enabled:
'merge_requests'
,
include
_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
,
with_feature_enabled:
'merge_requests'
,
with
_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
...
...
app/views/shared/_new_project_item_select.html.haml
View file @
b1245604
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
.project-item-select-holder.btn-group
.project-item-select-holder.btn-group
%a
.btn.btn-success.new-project-item-link.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
}
}
%a
.btn.btn-success.new-project-item-link.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
}
}
=
icon
(
'spinner spin'
)
=
icon
(
'spinner spin'
)
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
,
relative_path:
local_assigns
[
:path
],
include_shared:
local_assigns
[
:include
_shared
],
include_projects_in_subgroups:
local_assigns
[
:include_projects_in_subgroups
]
},
with_feature_enabled:
local_assigns
[
:with_feature_enabled
]
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
,
relative_path:
local_assigns
[
:path
],
with_shared:
local_assigns
[
:with
_shared
],
include_projects_in_subgroups:
local_assigns
[
:include_projects_in_subgroups
]
},
with_feature_enabled:
local_assigns
[
:with_feature_enabled
]
%button
.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
%button
.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
lib/api/groups.rb
View file @
b1245604
...
@@ -61,7 +61,7 @@ module API
...
@@ -61,7 +61,7 @@ module API
def
find_group_projects
(
params
)
def
find_group_projects
(
params
)
group
=
find_group!
(
params
[
:id
])
group
=
find_group!
(
params
[
:id
])
options
=
{
options
=
{
only_owned:
!
params
[
:
include
_shared
],
only_owned:
!
params
[
:
with
_shared
],
include_subgroups:
params
[
:include_subgroups
]
include_subgroups:
params
[
:include_subgroups
]
}
}
...
@@ -211,8 +211,8 @@ module API
...
@@ -211,8 +211,8 @@ module API
optional
:starred
,
type:
Boolean
,
default:
false
,
desc:
'Limit by starred status'
optional
:starred
,
type:
Boolean
,
default:
false
,
desc:
'Limit by starred status'
optional
:with_issues_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled issues feature'
optional
:with_issues_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled issues feature'
optional
:with_merge_requests_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled merge requests feature'
optional
:with_merge_requests_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled merge requests feature'
optional
:with_shared
,
type:
Boolean
,
default:
true
,
desc:
'Include projects shared to this group'
optional
:include_subgroups
,
type:
Boolean
,
default:
false
,
desc:
'Includes projects in subgroups of this group'
optional
:include_subgroups
,
type:
Boolean
,
default:
false
,
desc:
'Includes projects in subgroups of this group'
optional
:include_shared
,
type:
Boolean
,
default:
true
,
desc:
'Include projects shared to this group'
use
:pagination
use
:pagination
use
:with_custom_attributes
use
:with_custom_attributes
...
...
spec/requests/api/groups_spec.rb
View file @
b1245604
...
@@ -507,7 +507,7 @@ describe API::Groups do
...
@@ -507,7 +507,7 @@ describe API::Groups do
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
get
api
(
"/groups/
#{
group1
.
id
}
/projects"
,
user1
),
include
_shared:
false
get
api
(
"/groups/
#{
group1
.
id
}
/projects"
,
user1
),
with
_shared:
false
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
response
).
to
include_pagination_headers
...
...
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