Commits · e4637d685d30ed1a9a3b8efb37461dbe487e6159 · nexedi / gitlab-ce

21 Dec, 2018 40 commits
- Automatic merge of gitlab-org/gitlab-ce master · e4637d68
  GitLab Bot authored Dec 21, 2018
  
  e4637d68
- Merge branch 'gitlab-ui-1.18.0' into 'master' · a9049532
  Phil Hughes authored Dec 21, 2018
```
Updates gitlab ui to v1.18.0

See merge request gitlab-org/gitlab-ce!23983
```
  a9049532
- Merge branch 'dz-fix-ee-master' into 'master' · 36e58cc4
  Dmitriy Zaporozhets authored Dec 21, 2018
```
Fix broken EE master

See merge request gitlab-org/gitlab-ee!8946
```
  36e58cc4
- Merge branch '8850-fix-related-issues-id-wrapping' into 'master' · 2ce3f5df
  Annabel Dunstone Gray authored Dec 21, 2018
```
Fix issue ID wrapping and avatar counter shrinking in Related Issues list

Closes #8850

See merge request gitlab-org/gitlab-ee!8854
```
  2ce3f5df
- Merge branch 'docs-ha-repmgr' into 'master' · eccd6086
  Achilleas Pipinellis authored Dec 21, 2018
```
Updating HA repmgr docs to suggest 3 nodes

See merge request gitlab-org/gitlab-ee!8659
```
  eccd6086
- Updating HA repmgr docs to suggest 3 nodes · 838c17e7
  Aric Buerer authored Dec 21, 2018
  
  838c17e7
- Automatic merge of gitlab-org/gitlab-ce master · fd696d95
  GitLab Bot authored Dec 21, 2018
  
  fd696d95
- Update VERSION to 11.7.0-pre · c64f08ca
  GitLab Release Tools Bot authored Dec 21, 2018
  
  c64f08ca
- Update CHANGELOG.md for 11.6.0 · d55bb0af
  GitLab Release Tools Bot authored Dec 21, 2018
```
[ci skip]
```
  d55bb0af
- Update CHANGELOG.md for 11.6.0 · b06926b8
  GitLab Release Tools Bot authored Dec 21, 2018
```
[ci skip]
```
  b06926b8
- Update CHANGELOG-EE.md for 11.6.0-ee · a8e9b4b1
  GitLab Release Tools Bot authored Dec 21, 2018
```
[ci skip]
```
  a8e9b4b1
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · a32ccaba
  John Jarvis authored Dec 21, 2018
  
  a32ccaba
- Fix broken EE master by regenerating locale · f0fc0868
  Dmitriy Zaporozhets authored Dec 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f0fc0868
- Automatic merge of gitlab-org/gitlab-ce master · 8788d9fb
  GitLab Bot authored Dec 21, 2018
  
  8788d9fb
- Merge branch 'gt-rename-cluster-platform-configure-worker' into 'master' · 6f7b87d0
  Douglas Barbosa Alexandre authored Dec 21, 2018
```
Rename `ClusterPlatformConfigureWorker`

Closes #54863

See merge request gitlab-org/gitlab-ce!23754
```
  6f7b87d0
- Rename `ClusterPlatformConfigureWorker` · ac5fe450
  George Tsiolis authored Dec 21, 2018
  
  ac5fe450
- Merge branch 'markdown-toolbar-btn-fix' into 'master' · 82772caf
  Filipa Lacerda authored Dec 21, 2018
```
Fixes the markdown toolbar buttons

Closes #55618

See merge request gitlab-org/gitlab-ce!23979
```
  82772caf
- Automatic merge of gitlab-org/gitlab-ce master · 03a28e36
  GitLab Bot authored Dec 21, 2018
  
  03a28e36
- Merge branch 'feature/option-to-make-variables-protected' into 'master' · 6749ef30
  Grzegorz Bizon authored Dec 21, 2018
```
Option to make variables protected by default

Closes #51822

See merge request gitlab-org/gitlab-ce!22744
```
  6749ef30
- Automatic merge of gitlab-org/gitlab-ce master · bd7ca7d7
  GitLab Bot authored Dec 21, 2018
  
  bd7ca7d7
- Merge branch '55639-releases' into 'master' · 7f334fdf
  Phil Hughes authored Dec 21, 2018
```
Resolve "Wrong API call on releases page"

Closes #55639

See merge request gitlab-org/gitlab-ce!23978
```
  7f334fdf
- Resolve "Wrong API call on releases page" · 61dd5946
  Filipa Lacerda authored Dec 21, 2018
  
  61dd5946
- Merge branch 'ee-55639-releases' into 'master' · 353dc0bf
  Phil Hughes authored Dec 21, 2018
```
[EE Port] Resolve "Wrong API call on releases page"

See merge request gitlab-org/gitlab-ee!8943
```
  353dc0bf
- [EE Port] Resolve "Wrong API call on releases page" · b1bc6762
  Filipa Lacerda authored Dec 21, 2018
  
  b1bc6762
- Automatic merge of gitlab-org/gitlab-ce master · afda6ff5
  GitLab Bot authored Dec 21, 2018
  
  afda6ff5
- Merge branch '55293-split-bio-into-individual-line-in-extended-user-tooltips' into 'master' · 84655c3f
  Filipa Lacerda authored Dec 21, 2018
```
Resolve "Split bio into individual line in extended user tooltips"

Closes #55293

See merge request gitlab-org/gitlab-ce!23940
```
  84655c3f
- Updates gitlab ui to v1.18.0 · 7655596b
  samdbeckham authored Dec 21, 2018
  
  7655596b
- Merge branch '53933-include-dates-in-milestone-change-email' into 'master' · 1567f179
  Lin Jen-Shin authored Dec 21, 2018
```
Add date range to milestone changed emails

Closes #53933

See merge request gitlab-org/gitlab-ce!23762
```
  1567f179
- Merge branch 'docs/k8s-apps-navigation' into 'master' · 3a401448
  Achilleas Pipinellis authored Dec 21, 2018
```
Clarify where the k8s applications can be found

Closes #42262

See merge request gitlab-org/gitlab-ce!23914
```
  3a401448
- Automatic merge of gitlab-org/gitlab-ce master · f7f4d01d
  GitLab Bot authored Dec 21, 2018
  
  f7f4d01d
- Merge branch '7427-track-navbar-clicks-on-gitlab-com' into 'master' · 23b2b5df
  Phil Hughes authored Dec 21, 2018
```
Resolve "Track navbar clicks on GitLab.com"

Closes #7427

See merge request gitlab-org/gitlab-ee!7787
```
  23b2b5df
- Merge branch 'ce-7427-track-navbar-clicks-on-gitlab-com' into 'master' · e242c8cd
  Phil Hughes authored Dec 21, 2018
```
(CE-Port) Support navbar tracking

See merge request gitlab-org/gitlab-ce!23975
```
  e242c8cd
- Fixes the markdown toolbar buttons · 3019a567
  Phil Hughes authored Dec 21, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55618
```
  3019a567
- Split bio into individual line in extended user tooltips · 63307ade
  Martin Wortschack authored Dec 21, 2018
```
- Remove leading 'at' in organzation info
- Update karma tests
```
  63307ade
- Automatic merge of gitlab-org/gitlab-ce master · 500cac94
  GitLab Bot authored Dec 21, 2018
  
  500cac94
- Add changelog entry · a412bcff
  Heinrich Lee Yu authored Dec 12, 2018
  
  a412bcff
- Add date range to milestone changed emails · 51ac77af
  Heinrich Lee Yu authored Dec 12, 2018
```
Also refactored issues and MRs to use the same email template file
```
  51ac77af
- Merge branch 'specs-positional-arguments' into 'master' · a509bacf
  Lin Jen-Shin authored Dec 21, 2018
```
Rails5: convert specs in javascripts/ and support/ to new spec syntax

See merge request gitlab-org/gitlab-ce!23947
```
  a509bacf
- Automatic merge of gitlab-org/gitlab-ce master · 3e496c21
  GitLab Bot authored Dec 21, 2018
  
  3e496c21
- Support navbar tracking · f530d19c
  Martin Wortschack authored Dec 21, 2018
```
- Add tracking attributes to templates
```
  f530d19c