Commits · bb5187bb2a71f87b3ff49388f70dbcb27dfe4c6a · Boxiang Sun / gitlab-ce

04 Oct, 2017 40 commits
- Handle case where 2 matches in the same tree are found · bb5187bb
  Bob Van Landuyt authored Sep 10, 2017
  
  bb5187bb
- Allow filtering children for a group · 8f6dac49
  Bob Van Landuyt authored Sep 08, 2017
```
When fetching children for a group with a filter, we will search all
nested groups for results and render them in an expanded tree
```
  8f6dac49
- Merge group hierarchies when parents are shared · 518216c0
  Bob Van Landuyt authored Sep 07, 2017
  
  518216c0
- Don't break when building unions on empty collections · 530cf2a2
  Bob Van Landuyt authored Sep 07, 2017
  
  530cf2a2
- Add a concern to build hierarchies of groups · 438a0773
  Bob Van Landuyt authored Sep 06, 2017
  
  438a0773
- Find all children matching a query · 9f3995a0
  Bob Van Landuyt authored Sep 06, 2017
  
  9f3995a0
- Add pagination for children · 28c44004
  Bob Van Landuyt authored Sep 05, 2017
  
  28c44004
- Update `children` route to handle projects and groups · 80780018
  Bob Van Landuyt authored Sep 05, 2017
  
  80780018
- Render group children using the same entity · 648c082a
  Bob Van Landuyt authored Sep 05, 2017
  
  648c082a
- Add serializer for group children · d33e1557
  Bob Van Landuyt authored Sep 05, 2017
  
  d33e1557
- Remove the subgroups path on a group · 376a8c66
  Bob Van Landuyt authored Sep 05, 2017
  
  376a8c66
- Fetch children using new finder for the `show` of a group. · 2eac1537
  Bob Van Landuyt authored Sep 04, 2017
  
  2eac1537
- Add a `WithPagination` concern to reuse across serializers · ca538899
  Bob Van Landuyt authored Sep 04, 2017
  
  ca538899
- Add a separate finder for collecting children of groups · 063b5312
  Bob Van Landuyt authored Sep 04, 2017
  
  063b5312
- Merge branch 'winh-cleanup-select2-dropdowns' into 'master' · 283e13b8
  Annabel Dunstone Gray authored Oct 04, 2017
```
Cleanup Select2 dropdown styles

Closes #37279

See merge request gitlab-org/gitlab-ce!14557
```
  283e13b8
- Cleanup Select2 dropdown styles · 420360f8
  Winnie Hellmann authored Oct 04, 2017
  
  420360f8
- Merge branch 'mentions-in-comments' into 'master' · 2e5af6ff
  Annabel Dunstone Gray authored Oct 04, 2017
```
Makes `@mentions links` have a different styling for better separation

See merge request gitlab-org/gitlab-ce!14377
```
  2e5af6ff
- Makes `@mentions links` have a different styling for better separation · 7ecdfe31
  Dimitrie Hoekstra authored Oct 04, 2017
  
  7ecdfe31
- Merge branch 'update-unf_ext-0.0.7.4' into 'master' · 3e2f3c37
  Rémy Coutable authored Oct 04, 2017
```
Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368)

Closes #38368

See merge request gitlab-org/gitlab-ce!14601
```
  3e2f3c37
- Merge branch 'docs/openid-connect' into 'master' · 5f32a511
  Rémy Coutable authored Oct 04, 2017
```
Add link to OpenID Connect documentation

See merge request gitlab-org/gitlab-ce!14368
```
  5f32a511
- Merge branch 'tag-link-size' into 'master' · 7c5d5402
  Rémy Coutable authored Oct 04, 2017
```
Adjusts tag link to avoid underlining spaces

Closes #38122

See merge request gitlab-org/gitlab-ce!14544
```
  7c5d5402
- Merge branch 'master' into 'master' · 01852ee8
  Rémy Coutable authored Oct 04, 2017
```
Sidekiq::MemoryKiller: Add missing space in log message

See merge request gitlab-org/gitlab-ce!14553
```
  01852ee8
- Merge branch 'merge-request-doco' into 'master' · 502a3a29
  Rémy Coutable authored Oct 04, 2017
```
explain target_project_id vs project_id

Closes #38539

See merge request gitlab-org/gitlab-ce!14594
```
  502a3a29
- Merge branch 'fix-edit-project-service-cancel-button-position' into 'master' · 4155a62f
  Rémy Coutable authored Oct 04, 2017
```
Fix edit project service cancel button position

See merge request gitlab-org/gitlab-ce!14596
```
  4155a62f
- Merge branch 'fork-layout-cleanup' into 'master' · 6552ec3d
  Filipa Lacerda authored Oct 04, 2017
```
Cleanup the fork layout

See merge request gitlab-org/gitlab-ce!14617
```
  6552ec3d
- Merge branch '26890-fix-default-branches-sorting' into 'master' · 8ace5fc1
  Robert Speicher authored Oct 04, 2017
```
Fix the default branches sorting to actually be 'Last updated'

Closes #26890

See merge request gitlab-org/gitlab-ce!14295
```
  8ace5fc1
- Merge branch 'docs/images-update' into 'master' · f685c368
  Job van der Voort authored Oct 04, 2017
```
Update images

Closes #38487

See merge request gitlab-org/gitlab-ce!14655
```
  f685c368
- Update a bunch of docs images · da05687d
  Achilleas Pipinellis authored Oct 03, 2017
  
  da05687d
- Merge branch 'capture-rev-list-errors' into 'master' · 4a0f720a
  Sean McGivern authored Oct 04, 2017
```
Include RevList error messages in exceptions

See merge request gitlab-org/gitlab-ce!14658
```
  4a0f720a
- Merge branch 'gitaly-fetch-ref' into 'master' · 27e18f18
  Sean McGivern authored Oct 04, 2017
```
Let fetch_ref pull from Gitaly instead of from disk

Closes gitaly#585

See merge request gitlab-org/gitlab-ce!14588
```
  27e18f18
- Merge branch 'missing-exception-variable' into 'master' · 22bb4872
  Sean McGivern authored Oct 04, 2017
```
Add missing exception variable

See merge request gitlab-org/gitlab-ce!14677
```
  22bb4872
- Merge branch 'merge-request-notes-performance' into 'master' · b1050bfe
  Sean McGivern authored Oct 04, 2017
```
Use a UNION ALL for getting merge request notes

Closes #38508

See merge request gitlab-org/gitlab-ce!14620
```
  b1050bfe
- Merge branch 'js-load-specific-locales' into 'master' · b9f78eae
  Phil Hughes authored Oct 04, 2017
```
Load only the currently needed JS locale file

Closes #38470

See merge request gitlab-org/gitlab-ce!14533
```
  b9f78eae
- Load only the currently needed JS locale file · 412571a4
  Tim Zallmann authored Oct 04, 2017
  
  412571a4
- Merge branch 'fix_migration_with_fast_forward_option' into 'master' · 08678441
  Sean McGivern authored Oct 04, 2017
```
Fix AddFastForwardOptionToProject migration

See merge request gitlab-org/gitlab-ce!14676
```
  08678441
- Let fetch_ref pull from Gitaly instead of from disk · 147e2b21
  Jacob Vosmaer authored Sep 29, 2017
  
  147e2b21
- Add missing exception variable · 45c5311a
  Jacob Vosmaer authored Oct 04, 2017
  
  45c5311a
- Merge remote-tracking branch 'dev/master' · 4a4f8093
  Jarka Kadlecova authored Oct 04, 2017
  
  4a4f8093
- Add a new migration to make sure that fast forward column exists in projects table · e40b018b
  Valery Sizov authored Oct 04, 2017
  
  e40b018b
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · a7411f0d
  Jarka Kadlecova authored Oct 04, 2017
  
  a7411f0d