Commits · 7fb33e32ec7d53f108596f439b1c5a72b1384332 · nexedi / gitlab-ce

21 Dec, 2018 40 commits
- Merge branch 'docs-serverless-samples' into 'master' · 7fb33e32
  Achilleas Pipinellis authored Dec 21, 2018
```
Docs serverless samples

Closes #55371

See merge request gitlab-org/gitlab-ce!23961
```
  7fb33e32
- Update verbiage for clarity · 3c88fb51
  danielgruesso authored Dec 21, 2018
  
  3c88fb51
- Change group-cluster beta to regular note · d21b8ef0
  Daniel Gruesso authored Dec 21, 2018
  
  d21b8ef0
- Change alpha states to use note instead of warning · 81d9752a
  Daniel Gruesso authored Dec 21, 2018
  
  81d9752a
- Update registry section. Update serverless.yaml formatting · c5b59a16
  danielgruesso authored Dec 21, 2018
  
  c5b59a16
- Clarify obtaining application URL · 53dba6e3
  danielgruesso authored Dec 20, 2018
  
  53dba6e3
- Merge branch 'revert-62d250ff' into 'master' · a9d02909
  Sean McGivern authored Dec 21, 2018
```
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"

Closes #55641

See merge request gitlab-org/gitlab-ce!23993
```
  a9d02909
- Merge branch '54781-store-disk-path-in-database-for-projects-on-legacy-storage' into 'master' · 7e454dcb
  Stan Hu authored Dec 21, 2018
```
Storage location for projects on legacy storage

See merge request gitlab-org/gitlab-ce!23917
```
  7e454dcb
- Merge branch 'support-gitaly-tls' into 'master' · 02878551
  Lin Jen-Shin authored Dec 21, 2018
```
Support tls communication in gitaly

See merge request gitlab-org/gitlab-ce!22602
```
  02878551
- Update storage location after a group has been renamed/transfered · 8a172ebd
  Douglas Barbosa Alexandre authored Dec 21, 2018
  
  8a172ebd
- Update storage location after a project has been transfered · 29527d21
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  29527d21
- Update storage location after a project has been renamed · 3962c725
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  3962c725
- Track storage location for legacy storage projects · a0222cf8
  Douglas Barbosa Alexandre authored Dec 18, 2018
  
  a0222cf8
- Revert "Merge branch 'winh-discussion-header-commented' into 'master'" · 0817c210
  Winnie Hellmann authored Dec 21, 2018
```
This reverts merge request !23622
```
  0817c210
- 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
- More tls gitaly docs · 907f0ce8
  Ahmad Hassan authored Dec 21, 2018
  
  907f0ce8
- 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
- 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
- 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
- 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 '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
- 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
- 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
- Support navbar tracking · f530d19c
  Martin Wortschack authored Dec 21, 2018
```
- Add tracking attributes to templates
```
  f530d19c
- Merge branch 'update-nokogiri' into 'master' · 12217c6f
  Lin Jen-Shin authored Dec 21, 2018
```
Update minimum version of nokogiri in Gemfile also

See merge request gitlab-org/gitlab-ce!23829
```
  12217c6f
- convert specs in javascripts/ and support/ to new syntax · bf735200
  Jasper Maes authored Dec 19, 2018
  
  bf735200
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 89b0be14
  John Jarvis authored Dec 21, 2018
  
  89b0be14
- Merge branch 'security-import-symlink' into 'master' · fbd4319a
  John Jarvis authored Dec 21, 2018
```
[master] Persistent Symlink in Project Import

See merge request gitlab/gitlabhq!2673
```
  fbd4319a
- Merge branch 'dm-note-email-image-diff-discussion' into 'master' · 0a0c9282
  Sean McGivern authored Dec 21, 2018
```
Fix notification email for image diff notes

See merge request gitlab-org/gitlab-ce!23958
```
  0a0c9282