Commits · 2c25a7ae3453e72ad6cab504255e327c17df0a95 · Boxiang Sun / gitlab-ce

12 Oct, 2017 4 commits
- Nest the group_children_path inside the canonical group path · 2c25a7ae
  Bob Van Landuyt authored Oct 11, 2017
  
  2c25a7ae
- Use Arel to build preloaded counts · d8e504a8
  Bob Van Landuyt authored Oct 11, 2017
  
  d8e504a8
- Pass `archived:` as a keyword argument · 18907efb
  Bob Van Landuyt authored Oct 11, 2017
  
  18907efb
- Use polymorphism for common attributes in `GroupChildEntity` · 8cde1e32
  Bob Van Landuyt authored Oct 11, 2017
  
  8cde1e32
11 Oct, 2017 3 commits
- Fix spinach features · bd8943f5
  Bob Van Landuyt authored Oct 11, 2017
```
And several other failures
```
  bd8943f5
- Always use the same order specs for `MultiCollectionPaginator` · 2c6c2ed6
  Bob Van Landuyt authored Oct 11, 2017
  
  2c6c2ed6
- Handle archived projects in the `GroupDescendantsFinder` · 5a903149
  Bob Van Landuyt authored Oct 11, 2017
  
  5a903149
10 Oct, 2017 33 commits
- Add a text to the leave group confirmation · 99c76e9f
  Bob Van Landuyt authored Oct 10, 2017
  
  99c76e9f
- Merge branch 'master' into bvl-group-trees · 741fb493
  Bob Van Landuyt authored Oct 10, 2017
  
  741fb493
- Merge branch 'fix-resolved-discussion' into 'master' · 9ac5338b
  Filipa Lacerda authored Oct 10, 2017
```
Fix unable to expand text diff discussion comments

Closes #38940

See merge request gitlab-org/gitlab-ce!14792
```
  9ac5338b
- Fix unable to expand text diff discussion comments · eff96b8c
  Clement Ho authored Oct 10, 2017
  
  eff96b8c
- Merge branch 'gitaly-0.45.1' into 'master' · 97ece0ba
  Rémy Coutable authored Oct 10, 2017
```
Use Gitaly 0.45.1 and gitaly-proto 0.41.0

See merge request gitlab-org/gitlab-ce!14787
```
  97ece0ba
- Use the `GroupProjectsFinder` to find direct children · e678f312
  Bob Van Landuyt authored Oct 10, 2017
  
  e678f312
- Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master' · c98a3c49
  Rémy Coutable authored Oct 10, 2017
```
Stop using `branch_names.include?` and use `branch_exists?`

See merge request gitlab-org/gitlab-ce!14778
```
  c98a3c49
- Stop using `branch_names.include?` and use `branch_exists?` · 47d19c2d
  Andrew Newdigate authored Oct 10, 2017
  
  47d19c2d
- Don't preload all memberships for a user · b9c12be5
  Bob Van Landuyt authored Oct 10, 2017
  
  b9c12be5
- Adjust wording on the Group-show page · 6f5a2276
  Bob Van Landuyt authored Oct 10, 2017
  
  6f5a2276
- Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy` · 9d54da23
  Bob Van Landuyt authored Oct 10, 2017
  
  9d54da23
- Return `self` from `GroupChildSerializer#expand_hierarchy` · e55886b3
  Bob Van Landuyt authored Oct 10, 2017
  
  e55886b3
- Move the `ancestors_upto` to `Project` and `Namespace` · 9d1348d6
  Bob Van Landuyt authored Oct 10, 2017
  
  9d1348d6
- Some cleanup in the GroupDescendantFinder · 7611e6a0
  Bob Van Landuyt authored Oct 10, 2017
  
  7611e6a0
- Don't load unneeded elements in GroupsController#show · aee5691d
  Bob Van Landuyt authored Oct 10, 2017
  
  aee5691d
- Merge branch '38869-u2f' into 'master' · 900dd7fa
  Phil Hughes authored Oct 10, 2017
```
Remove u2f from global namespace

See merge request gitlab-org/gitlab-ce!14776
```
  900dd7fa
- Merge branch 'flash-es6-module' into 'master' · e4e8e0fc
  Filipa Lacerda authored Oct 10, 2017
```
Flash is now a ES6 module

See merge request gitlab-org/gitlab-ce!14626
```
  e4e8e0fc
- Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master' · 1fb4215b
  Rémy Coutable authored Oct 10, 2017
```
Fix a liniting error introduced by !14652

See merge request gitlab-org/gitlab-ce!14790
```
  1fb4215b
- Fix a liniting error introduced by !14652 · 03f3cee0
  Ahmad Sherif authored Oct 10, 2017
  
  03f3cee0
- Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' · 36ae3bf1
  Douwe Maan authored Oct 10, 2017
```
Resolve "Private Avatars are not CDN compatible"

Closes #38245 and gitlab-com/support-forum#2476

See merge request gitlab-org/gitlab-ce!14443
```
  36ae3bf1
- Merge branch '38941-lock-note-fix' into 'master' · b7120853
  Sean McGivern authored Oct 10, 2017
```
Fix text for the merge request lock system note

Closes #38941

See merge request gitlab-org/gitlab-ce!14779
```
  b7120853
- Merge branch 'acet-fix-paste-on-comment-form' into 'master' · 9f1c9b3d
  Filipa Lacerda authored Oct 10, 2017
```
Trigger change event of the markdown textarea to allow Vue catch the programmatic changes.

Closes #38441

See merge request gitlab-org/gitlab-ce!14539
```
  9f1c9b3d
- Merge branch 'fix-timestampz-cop' into 'master' · c47b33ad
  Grzegorz Bizon authored Oct 10, 2017
```
Also warn on timestamp in datetime migration cop

See merge request gitlab-org/gitlab-ce!14784
```
  c47b33ad
- Use `GroupFinder` to check if a user can read a group · 3fe7f31a
  Bob Van Landuyt authored Oct 10, 2017
  
  3fe7f31a
- Use `EXISTS` instead of `WHERE id IN (...)` for authorized groups · deb45634
  Bob Van Landuyt authored Oct 10, 2017
  
  deb45634
- Fix mysterious rubocop failure · 9e601088
  Jacob Vosmaer authored Oct 10, 2017
  
  9e601088
- Ignore existing Migration/Datetime cop offenders · 264be20d
  Sean McGivern authored Oct 10, 2017
  
  264be20d
- Run bundle · 5ada58d3
  Jacob Vosmaer authored Oct 10, 2017
  
  5ada58d3
- Use gitaly-proto 0.41.0 · 46f6b75f
  Jacob Vosmaer authored Oct 10, 2017
  
  46f6b75f
- Use Gitaly 0.45.1 · 31f60fb6
  Jacob Vosmaer authored Oct 10, 2017
  
  31f60fb6
- Merge branch '38869-ci-global' into 'master' · 4261d07b
  Phil Hughes authored Oct 10, 2017
```
Remove Build code from global namespace

See merge request gitlab-org/gitlab-ce!14744
```
  4261d07b
- Remove Build code from global namespace · b5029214
  Filipa Lacerda authored Oct 10, 2017
  
  b5029214
- Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into 'master' · 377c10b4
  Robert Speicher authored Oct 10, 2017
```
Migrate Workhorse Send{Diff,Patch} to Gitaly

See merge request gitlab-org/gitlab-ce!14652
```
  377c10b4