diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:16:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:16:40 +0000 |
| commit | 2bf8345542dbdae17c3755ca7157cbaf70ffde41 (patch) | |
| tree | 48b9b82e6ae9ed2e12649b4ea4f95b6833948d3a /lib/api/issues.rb | |
| parent | 99edc15127d9d23475c94079d53e2893f58c042a (diff) | |
| parent | 20e9b32c96a5b08e3f61c8974b43977f98d8666e (diff) | |
| download | gitlab-ce-2bf8345542dbdae17c3755ca7157cbaf70ffde41.tar.gz | |
Merge branch 'master' into '42568-pipeline-empty-state'
# Conflicts:
# app/views/projects/jobs/show.html.haml
# lib/gitlab/ci/status/core.rb
Diffstat (limited to 'lib/api/issues.rb')
| -rw-r--r-- | lib/api/issues.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index f74b3b26802..88e7f46c92c 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -97,7 +97,7 @@ module API get ":id/issues" do group = find_group!(params[:id]) - issues = paginate(find_issues(group_id: group.id)) + issues = paginate(find_issues(group_id: group.id, include_subgroups: true)) options = { with: Entities::IssueBasic, |