Commits · 061b27146cb2b17cfcf3a4e04a72d7fb3df0cae8 · nexedi / gitlab-ce

03 Jul, 2017 5 commits
- Merge branch '2525-ee-kubernetes' into 'master' · 061b2714
  Kamil Trzciński authored Jul 03, 2017
```
Move some EE-only KubernetesService code to a prepended module

Closes #2525

See merge request !2168
```
  061b2714
- Merge branch 'ce-to-ee-2017-06-30' into 'master' · 8aaa2a00
  Dmitriy Zaporozhets authored Jul 03, 2017
```
CE upstream: Friday

Closes #225, gitaly#201, and gitlab-ce#33172

See merge request !2313
```
  8aaa2a00
- Don't resolve fork relationships for projects pending delete · dd69efa8
  Nick Thomas authored Jul 03, 2017
  
  dd69efa8
- Merge branch 'improve-mirroring-documentation-and-force-update-button-transparency' into 'master' · 27a22281
  Grzegorz Bizon authored Jul 03, 2017
```
Improves mirror force update button transparency

See merge request !2299
```
  27a22281
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-30 · a8153625
  Nick Thomas authored Jul 03, 2017
  
  a8153625
30 Jun, 2017 35 commits
- Merge branch 'ee-experimental-breadcrumbs' into 'master' · 87a822e6
  Annabel Dunstone Gray authored Jun 30, 2017
```
Port of experimental-breadcrumbs to EE

See merge request !2314
```
  87a822e6
- Mirrors should not attempt to sync while pending delete · 9b351e31
  Nick Thomas authored Jun 30, 2017
  
  9b351e31
- Merge branch 'speed-up-issue-counting-for-a-project' into 'master' · 530166fc
  Rémy Coutable authored Jun 30, 2017
```
Speed up issue counting for a project

See merge request !2310
```
  530166fc
- Merge branch '1874-ie-approvers-undefined-json-request' into 'master' · 33d058c8
  Jacob Schatz authored Jun 30, 2017
```
Fix approvals request throwing 400 in IE 11

Closes #1874

See merge request !2306
```
  33d058c8
- Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12346 to EE · 3ae39766
  Phil Hughes authored Jun 30, 2017
  
  3ae39766
- Fix typo in IssuesFinder comment · d47e7439
  Sean McGivern authored Jun 30, 2017
```
[ci skip]
```
  d47e7439
- Fix a merge conflict in app/views/projects/merge_requests/index.html.haml · 43214fd0
  Nick Thomas authored Jun 30, 2017
  
  43214fd0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-30 · c57898aa
  Nick Thomas authored Jun 30, 2017
  
  c57898aa
- Fix bad merge in app/assets/stylesheets/pages/issuable.scss · 7ffc1f89
  Nick Thomas authored Jun 30, 2017
  
  7ffc1f89
- Revert double CHANGELOG rake task adding 'No Changes' · 074b1086
  James Edwards-Jones authored Jun 30, 2017
  
  074b1086
- Fix merge conflicts in views · e6f5ca7c
  Nick Thomas authored Jun 30, 2017
  
  e6f5ca7c
- Fix conflicts in specs · 33879d1a
  Nick Thomas authored Jun 30, 2017
  
  33879d1a
- Fix conflicts in services · 9c5283de
  Nick Thomas authored Jun 30, 2017
  
  9c5283de
- Fix conflicts in policies · b6aa0b98
  Nick Thomas authored Jun 30, 2017
  
  b6aa0b98
- Fix model conflicts · 571e9fdd
  Nick Thomas authored Jun 30, 2017
  
  571e9fdd
- Resolve conflicts in controllers · 1f65c326
  Nick Thomas authored Jun 30, 2017
  
  1f65c326
- Fix conflicts in library code · f9ba4c54
  Nick Thomas authored Jun 30, 2017
  
  f9ba4c54
- Fix SCSS conflicts · 6f8406ae
  Nick Thomas authored Jun 30, 2017
  
  6f8406ae
- Fix JS conflicts · f4c5ce68
  Nick Thomas authored Jun 30, 2017
  
  f4c5ce68
- Fix doc merge conflicts · b700da19
  Nick Thomas authored Jun 30, 2017
  
  b700da19
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-30 · 859b693f
  Nick Thomas authored Jun 30, 2017
  
  859b693f
- Update CHANGELOG.md for 9.3.3 · 1a449b24
  James Edwards-Jones authored Jun 30, 2017
```
[ci skip]
```
  1a449b24
- Merge branch 'ce-to-ee-2017-06-28' into 'master' · 49d2d4be
  Rémy Coutable authored Jun 30, 2017
```
CE upstream - Wednesday

See merge request !2293
```
  49d2d4be
- Merge branch '33861-more-actions-dropdown-hidden-by-end-of-diff' into 'master' · 8e249e71
  Annabel Dunstone Gray authored Jun 30, 2017
```
Resolve "More actions dropdown hidden by end of diff"

Closes #33861

See merge request !12380
```
  8e249e71
- Resolve "More actions dropdown hidden by end of diff" · 2d52a628
  Luke "Jared" Bennett authored Jun 30, 2017
  
  2d52a628
- Make issuables_count_for_state helper public · f590f9ff
  Sean McGivern authored Jun 30, 2017
  
  f590f9ff
- Clarify counter caching for users without project access · d54ed686
  Sean McGivern authored Jun 29, 2017
  
  d54ed686
- Make finders responsible for counter cache keys · 723c6b04
  Sean McGivern authored Jun 29, 2017
  
  723c6b04
- Update CHANGELOG.md for 9.3.3 · 33241621
  James Edwards-Jones authored Jun 30, 2017
```
[ci skip]
```
  33241621
- Update CHANGELOG-EE.md for 9.3.3-ee · 0bd0ad20
  James Edwards-Jones authored Jun 30, 2017
```
[ci skip]
```
  0bd0ad20
- Improves documentation regarding the pull mirror feature · e0635c39
  Tiago Botelho authored Jun 29, 2017
  
  e0635c39
- Improves mirror force update button transparency · 214470ca
  Tiago Botelho authored Jun 29, 2017
  
  214470ca
- Add changelog entry for issue / MR tab counting optimisations · b060775f
  Sean McGivern authored Jun 26, 2017
  
  b060775f
- Don't count any confidential issues for non-project-members · 5768fea4
  Sean McGivern authored Jun 23, 2017
  
  5768fea4
- Cache total issue / MR counts for project by user type · 9cc015cb
  Sean McGivern authored Jun 22, 2017
```
This runs a slightly slower query to get the issue and MR counts in the
navigation, but caches by user type (can see all / none confidential issues) for
two minutes.
```
  9cc015cb