Commits · 6095de47d7b20fbf148c8edeeec6e8588e1f1426 · nexedi / gitlab-ce

18 Dec, 2018 32 commits
- Automatic merge of gitlab-org/gitlab-ce master · 6095de47
  GitLab Bot authored Dec 18, 2018
  
  6095de47
- Merge branch 'mk/keep-last-remaining-event' into 'master' · 32563183
  Kamil Trzciński authored Dec 18, 2018
```
Geo: Keep the minimum cursor last event

See merge request gitlab-org/gitlab-ee!8832
```
  32563183
- Merge branch '6954_remove_feature_flag' into 'master' · db42a531
  Kamil Trzciński authored Dec 18, 2018
```
Remove FF for group security dashboard history

See merge request gitlab-org/gitlab-ee!8853
```
  db42a531
- Merge branch 'rs-except-deprecation' into 'master' · a3049115
  Sean McGivern authored Dec 18, 2018
```
Change deprecated `except!` usages

Closes #54094

See merge request gitlab-org/gitlab-ce!23844
```
  a3049115
- Automatic merge of gitlab-org/gitlab-ce master · 0cd97628
  GitLab Bot authored Dec 18, 2018
  
  0cd97628
- Merge branch 'suggest-diff-line-change-documentation' into 'master' · eb15869f
  Achilleas Pipinellis authored Dec 18, 2018
```
Suggest diff line change documentation

See merge request gitlab-org/gitlab-ce!23474
```
  eb15869f
- Suggest diff line change documentation · 862c5635
  Jacques Erasmus authored Dec 18, 2018
  
  862c5635
- Merge branch 'ee-suggest-diff-line-change-documentation' into 'master' · 49d3ea9c
  Achilleas Pipinellis authored Dec 18, 2018
```
[EE] Suggest diff line change documentation

See merge request gitlab-org/gitlab-ee!8898
```
  49d3ea9c
- Merge branch 'blackst0ne-improve-encoding-helper-spec' into 'master' · aa343d54
  Rémy Coutable authored Dec 18, 2018
```
Update specs to exclude possible false positive pass

Closes #55403

See merge request gitlab-org/gitlab-ce!23893
```
  aa343d54
- Merge branch... · 34b20737
  Sean McGivern authored Dec 18, 2018
```
Merge branch '8814-reorder-gitlab-elastic-index-rake-tasks-to-ensure-wikis-and-database-are-completed-even-if-projects-error-out-2' into 'master'

Resolve "Reorder gitlab:elastic:index rake tasks to ensure wikis and database are completed even if projects error out"

Closes #8814

See merge request gitlab-org/gitlab-ee!8852
```
  34b20737
- Merge branch 'sh-carrierwave-patch-google-acl' into 'master' · 651d1264
  Sean McGivern authored Dec 18, 2018
```
Fix object storage not working properly with Google S3 compatibility

Closes #53846

See merge request gitlab-org/gitlab-ce!23858
```
  651d1264
- Merge branch 'bvl-hide-confidential-events-take2' into 'master' · 41a942be
  Sean McGivern authored Dec 18, 2018
```
Hide confidential events in ruby

Closes #51791

See merge request gitlab-org/gitlab-ce!23746
```
  41a942be
- Merge branch 'fj-fix-action-name-jobscontroller' into 'master' · 37e6863e
  Rémy Coutable authored Dec 18, 2018
```
Fixed action name in JobsController

See merge request gitlab-org/gitlab-ce!23888
```
  37e6863e
- Automatic merge of gitlab-org/gitlab-ce master · cf073207
  GitLab Bot authored Dec 18, 2018
  
  cf073207
- Merge branch 'qa-issue-suggestions' into 'master' · 7fa35300
  Sanad Liaquat authored Dec 18, 2018
```
Issue Suggestions E2E Tests

See merge request gitlab-org/gitlab-ce!23417
```
  7fa35300
- Issue Suggestions E2E Tests · 17f1cc20
  Ramya Authappan authored Dec 18, 2018
  
  17f1cc20
- Automatic merge of gitlab-org/gitlab-ce master · 7d7d3295
  GitLab Bot authored Dec 18, 2018
  
  7d7d3295
- Merge branch 'patch-35' into 'master' · fe01846a
  Evan Read authored Dec 18, 2018
```
Fix typo for after_script in README.md

See merge request gitlab-org/gitlab-ce!23890
```
  fe01846a
- Merge branch 'patch-29' into 'master' · 980b0964
  Evan Read authored Dec 18, 2018
```
docs: link to improved Uploads Migrate Rake Task

See merge request gitlab-org/gitlab-ce!23828
```
  980b0964
- docs: link to improved Uploads Migrate Rake Task · 1e508a82
  Ben Bodenmiller authored Dec 18, 2018
  
  1e508a82
- Automatic merge of gitlab-org/gitlab-ce master · 5eb5c9fe
  GitLab Bot authored Dec 18, 2018
  
  5eb5c9fe
- Merge branch 'docs/frontmatter-delimiters' into 'master' · 662e55d7
  Evan Read authored Dec 18, 2018
```
Add docs for frontmatter delimiters

See merge request gitlab-org/gitlab-ce!23876
```
  662e55d7
- Add docs for frontmatter delimiters · 91192264
  Achilleas Pipinellis authored Dec 18, 2018
  
  91192264
- Automatic merge of gitlab-org/gitlab-ce master · 7b31fa1c
  GitLab Bot authored Dec 18, 2018
  
  7b31fa1c
- Merge branch 'docs-group-level-clusters-update' into 'master' · 95d4e979
  Evan Read authored Dec 18, 2018
```
Add unavailable features section to group-level cluster page.

See merge request gitlab-org/gitlab-ce!23896
```
  95d4e979
- Add unavailable features section to the end of the page. · 5ee9b242
  danielgruesso authored Dec 17, 2018
  
  5ee9b242
- Formatting fixes · e3507178
  danielgruesso authored Dec 17, 2018
  
  e3507178
- Add unavailable features section to group-level cluster page. · 355678a1
  danielgruesso authored Dec 17, 2018
  
  355678a1
- Automatic merge of gitlab-org/gitlab-ce master · eb499f45
  GitLab Bot authored Dec 18, 2018
  
  eb499f45
- Merge branch 'none-syntax-highlighting' into 'master' · 399713b1
  Fatih Acet authored Dec 18, 2018
```
Add "none" syntax highlighting "color" scheme

Closes #32109

See merge request gitlab-org/gitlab-ce!20170
```
  399713b1
- Add "none" syntax highlighting "color" scheme · 3a97bc9a
  khm authored Dec 18, 2018
  
  3a97bc9a
- Automatic merge of gitlab-org/gitlab-ce master · f0a83dd6
  GitLab Bot authored Dec 18, 2018
  
  f0a83dd6
17 Dec, 2018 8 commits
- Merge branch '8765-geo-gitlab-geo-should-not-serialize-activerecord-objects' into 'master' · 18c78901
  Stan Hu authored Dec 17, 2018
```
Change SafeRequestStore#write to accept an options hash

See merge request gitlab-org/gitlab-ce!23891
```
  18c78901
- Merge branch 'add-new-nginx-metrics' into 'master' · 41b4f9fe
  Mike Greiling authored Dec 17, 2018
```
Add NGINX 0.16.0 and above metrics

Closes #50431

See merge request gitlab-org/gitlab-ce!22133
```
  41b4f9fe
- Add NGINX 0.16.0 and above metrics · 3b9ab3f5
  Joshua Lambert authored Dec 17, 2018
  
  3b9ab3f5
- Port suggestions feature documentation to EE · aea75a3b
  Oswaldo Ferreira authored Dec 17, 2018
```
This was ported from
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23474
in order to avoid conflicts.
```
  aea75a3b
- Adding changelog entry · 6a9f6e1f
  astrachan authored Dec 18, 2018
  
  6a9f6e1f
- Update specs to exclude possible false positive pass · 236876f2
  blackst0ne authored Dec 18, 2018
  
  236876f2
- Automatic merge of gitlab-org/gitlab-ce master · 87d0f47d
  GitLab Bot authored Dec 17, 2018
  
  87d0f47d
- Merge branch 'docs-customizing-autodevops' into 'master' · 735d24f3
  Evan Read authored Dec 17, 2018
```
Fix anchor link to customizing AutoDevops yaml file

See merge request gitlab-org/gitlab-ce!22962
```
  735d24f3