diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-11-18 00:17:47 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-11-18 00:17:47 -0800 |
| commit | d622a8c5689072fad3dc667323933dd02dd72a7f (patch) | |
| tree | 21d5b907ef3d17acde595d2ecbb426dde4a0598d | |
| parent | 63beaa32dd38057c98eeffd4b593c944d67cae25 (diff) | |
| parent | 6675bab59944bf075579bfb84cb1dd26cada39e9 (diff) | |
| download | gitlab-ce-40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use.tar.gz | |
Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | doc/api/groups.md | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/user/discussions/img/image_resolved_discussion.png | bin | 48234 -> 48234 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | doc/user/discussions/img/onion_skin_view.png | bin | 45053 -> 45053 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | doc/user/discussions/img/swipe_view.png | bin | 16483 -> 16483 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | doc/user/discussions/img/two_up_view.png | bin | 61759 -> 61759 bytes |
6 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba19d69745c..19b831e9426 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -475,7 +475,7 @@ migration:path-mysql: <<: *pull-cache stage: test script: - - bundle exec rake db:rollback STEP=120 + - bundle exec rake db:rollback STEP=119 - bundle exec rake db:migrate db:rollback-pg: diff --git a/doc/api/groups.md b/doc/api/groups.md index 6a6e94195a7..c1b5737c247 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -82,6 +82,8 @@ GET /groups?custom_attributes[key]=value&custom_attributes[other_key]=other_valu ## List a groups's subgroups +> [Introduced][ce-15142] in GitLab 10.3. + Get a list of visible direct subgroups in this group. When accessed without authentication, only public groups are returned. @@ -513,3 +515,5 @@ And to switch pages add: ``` /groups?per_page=100&page=2 ``` + +[ce-15142]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15142 diff --git a/doc/user/discussions/img/image_resolved_discussion.png b/doc/user/discussions/img/image_resolved_discussion.png Binary files differindex ed00b5c77fe..ed00b5c77fe 100755..100644 --- a/doc/user/discussions/img/image_resolved_discussion.png +++ b/doc/user/discussions/img/image_resolved_discussion.png diff --git a/doc/user/discussions/img/onion_skin_view.png b/doc/user/discussions/img/onion_skin_view.png Binary files differindex 91c3b396844..91c3b396844 100755..100644 --- a/doc/user/discussions/img/onion_skin_view.png +++ b/doc/user/discussions/img/onion_skin_view.png diff --git a/doc/user/discussions/img/swipe_view.png b/doc/user/discussions/img/swipe_view.png Binary files differindex 82d6e52173c..82d6e52173c 100755..100644 --- a/doc/user/discussions/img/swipe_view.png +++ b/doc/user/discussions/img/swipe_view.png diff --git a/doc/user/discussions/img/two_up_view.png b/doc/user/discussions/img/two_up_view.png Binary files differindex d9e90708e87..d9e90708e87 100755..100644 --- a/doc/user/discussions/img/two_up_view.png +++ b/doc/user/discussions/img/two_up_view.png |
