Commits · 6477096525e16af05aa2357f3e73e690ea06dd8d · nexedi / gitlab-ce

18 Dec, 2018 40 commits
- Automatic merge of gitlab-org/gitlab-ce master · 64770965
  GitLab Bot authored Dec 18, 2018
  
  64770965
- Merge branch 'reduce-imports_controller-diff-with-ce' into 'master' · 257a61e8
  Lin Jen-Shin authored Dec 18, 2018
```
Make Projects::ImportsController EE-compatible

See merge request gitlab-org/gitlab-ce!23883
```
  257a61e8
- Merge branch 'ee-reduce-imports_controller-diff-with-ce' into 'master' · c8e7b39d
  Lin Jen-Shin authored Dec 18, 2018
```
Reduce diff with CE in Projects::ImportsController

See merge request gitlab-org/gitlab-ee!8894
```
  c8e7b39d
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee · 0ae053a1
  GitLab Release Tools Bot authored Dec 18, 2018
  
  0ae053a1
- Automatic merge of gitlab-org/gitlab-ce master · fdd0b11c
  GitLab Bot authored Dec 18, 2018
  
  fdd0b11c
- Merge branch '51226-check-yarn-lock' into 'master' · 9e26728c
  Rémy Coutable authored Dec 18, 2018
```
Add danger check for duplicate yarn dependencies

Closes #51226

See merge request gitlab-org/gitlab-ce!21591
```
  9e26728c
- Reduce diff with CE in Projects::ImportsController · 17b65a0e
  Rémy Coutable authored Dec 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  17b65a0e
- Automatic merge of gitlab-org/gitlab-ce master · 1aab689d
  GitLab Bot authored Dec 18, 2018
  
  1aab689d
- Merge branch 'deprecated-actiondispatch-paramsparser' into 'master' · be38173b
  Rémy Coutable authored Dec 18, 2018
```
Remove deprecated ActionDispatch::ParamsParser

See merge request gitlab-org/gitlab-ee!8897
```
  be38173b
- Merge branch 'deprecated-directly-inheriting-migration' into 'master' · 7a143215
  Rémy Coutable authored Dec 18, 2018
```
Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated.

See merge request gitlab-org/gitlab-ce!23884
```
  7a143215
- Merge branch 'deprecated-alias-method-chain' into 'master' · 3146bb5c
  Rémy Coutable authored Dec 18, 2018
```
Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead

See merge request gitlab-org/gitlab-ce!23887
```
  3146bb5c
- Merge branch '51485-new-issue-labels-note' into 'master' · f3d80159
  Rémy Coutable authored Dec 18, 2018
```
Run CommonSystemNotesService on issuable create

Closes #51485

See merge request gitlab-org/gitlab-ce!23859
```
  f3d80159
- Merge branch 'ee-51485-new-issue-labels-note' into 'master' · 4fd4ec12
  Rémy Coutable authored Dec 18, 2018
```
EE port of 51485-new-issue-labels-note

See merge request gitlab-org/gitlab-ee!8873
```
  4fd4ec12
- Automatic merge of gitlab-org/gitlab-ce master · 2c5fbd87
  GitLab Bot authored Dec 18, 2018
  
  2c5fbd87
- Merge branch '55036-add-manual-assets-compile-job-qa' into 'master' · c516c801
  Rémy Coutable authored Dec 18, 2018
```
Compile assets needed by QA tests

Closes #55036

See merge request gitlab-org/gitlab-ce!23752
```
  c516c801
- 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