Commits · 371de4d977668f0b4effa0dd002813e6c02cb7db · nexedi / gitlab-ce

16 Mar, 2018 26 commits
- Merge branch 'docs-refactor-dev-guides-ee' into 'master' · 371de4d9
  Achilleas Pipinellis authored Mar 16, 2018
```
Docs: refactor doc general guidelines and style guidelines

See merge request gitlab-org/gitlab-ee!4750
```
  371de4d9
- Docs: refactor doc general guidelines and style guidelines · f6cb2c11
  Marcia Ramos authored Mar 16, 2018
  
  f6cb2c11
- Merge branch 'da-geo-replicate-ssh-keys-docs' into 'master' · 195ee821
  Stan Hu authored Mar 16, 2018
```
Resolve "Geo docs: Second SSH restart only considers ‘ssh’ not ‘sshd’"

Closes #5263

See merge request gitlab-org/gitlab-ee!4990
```
  195ee821
- Merge branch 'docs-update_code_quality_example-ee' into 'master' · 47161b7d
  Achilleas Pipinellis authored Mar 16, 2018
```
Update Code Quality example documentation

See merge request gitlab-org/gitlab-ee!4991
```
  47161b7d
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · a728289d
  Achilleas Pipinellis authored Mar 16, 2018
```
CE upstream - 2018-03-16 12:24 UTC

See merge request gitlab-org/gitlab-ee!4998
```
  a728289d
- Merge branch '4986-isolate-elasticsearch-specs' into 'master' · 1a294f8e
  Sean McGivern authored Mar 16, 2018
```
Resolve "Isolate elasticsearch-using specs"

Closes #4986

See merge request gitlab-org/gitlab-ee!4983
```
  1a294f8e
- Resolve CE to EE merge conflicts on documentation · e7ebeee8
  Olivier Gonzalez authored Mar 16, 2018
  
  e7ebeee8
- Merge branch 'sh-cache-column-exists-cache' into 'master' · de645911
  Yorick Peterse authored Mar 16, 2018
```
Cache column_exists? for Elasticsearch columns

Closes gitlab-ce#43355

See merge request gitlab-org/gitlab-ee!4987
```
  de645911
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · 3870d7b3
  GitLab Bot authored Mar 16, 2018
```
# Conflicts:
#	doc/ci/examples/README.md
#	doc/ci/examples/sast_docker.md
#	doc/topics/autodevops/index.md

[ci skip]
```
  3870d7b3
- Fix a number of specs to take account of the new :elastic rspec filter · f319b555
  Nick Thomas authored Mar 15, 2018
  
  f319b555
- Migrate elasticsearch-using spinach features to rspec · 90760c1d
  Nick Thomas authored Mar 15, 2018
  
  90760c1d
- Merge branch 'mr-sticky-tabs-perf-bar' into 'master' · 79aa0032
  Filipa Lacerda authored Mar 16, 2018
```
Fixes merge request bar styling when performance bar is visible

See merge request gitlab-org/gitlab-ce!17778
```
  79aa0032
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · 5ea0fbfc
  James Lopez authored Mar 16, 2018
```
CE upstream - 2018-03-16 09:25 UTC

See merge request gitlab-org/gitlab-ee!4996
```
  5ea0fbfc
- Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning' into 'master' · a63d7470
  Achilleas Pipinellis authored Mar 16, 2018
```
Rename SAST for Docker to Container Scanning in documentation

See merge request gitlab-org/gitlab-ce!17769
```
  a63d7470
- Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning-ee' into 'master' · 6e89fae6
  Achilleas Pipinellis authored Mar 16, 2018
```
Rename SAST for Docker to Container Scanning in EE documentation

See merge request gitlab-org/gitlab-ee!4981
```
  6e89fae6
- Rename SAST for Docker to Container Scanning in EE documentation · df5802d7
  Olivier Gonzalez authored Mar 16, 2018
  
  df5802d7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · 9ea96cbf
  GitLab Bot authored Mar 16, 2018
  
  9ea96cbf
- Merge branch 'revert-feb95ce3' into 'master' · 3c1dd234
  Grzegorz Bizon authored Mar 16, 2018
```
Revert "Merge branch 'update-httparty' into 'master'"

See merge request gitlab-org/gitlab-ce!17789
```
  3c1dd234
- Merge branch 'ee-adamco/gitlab-ce-move-issue-command' into 'master' · 75690134
  Grzegorz Bizon authored Mar 16, 2018
```
Add slash command for moving an issue

See merge request gitlab-org/gitlab-ee!4979
```
  75690134
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · 0a5876ed
  Stan Hu authored Mar 16, 2018
```
CE upstream - 2018-03-16 06:40 UTC

See merge request gitlab-org/gitlab-ee!4993
```
  0a5876ed
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · d12be953
  GitLab Bot authored Mar 16, 2018
  
  d12be953
- Merge branch 'ce-to-ee-2018-03-15' into 'master' · aceacd63
  Stan Hu authored Mar 16, 2018
```
CE upstream - 2018-03-15 19:01 UTC

Closes #5303

See merge request gitlab-org/gitlab-ee!4986
```
  aceacd63
- Revert "Merge branch 'update-httparty' into 'master'" · 36a70603
  Stan Hu authored Mar 15, 2018
```
This reverts commit feb95ce3, reversing
changes made to 1b1475cb.
```
  36a70603
- Revert "Merge branch 'update-httparty' into 'master'" · 6886f64e
  Stan Hu authored Mar 16, 2018
```
This reverts merge request !17737
```
  6886f64e
- Update Code Quality example documentation · 5e7dd27a
  Olivier Gonzalez authored Mar 16, 2018
  
  5e7dd27a
- Update docs for SSH host keys replication step · c51b9d6f
  Douglas Barbosa Alexandre authored Mar 15, 2018
  
  c51b9d6f
15 Mar, 2018 14 commits
- Update CHANGELOG.md for 10.5.5 · 16d92de1
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  16d92de1
- Update CHANGELOG.md for 10.5.5 · e8354564
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  e8354564
- Update CHANGELOG-EE.md for 10.5.5-ee · 30640f58
  Ian Baum authored Mar 15, 2018
```
[ci skip]
```
  30640f58
- Move EE-only elasticsearch specs in spec/services/search/group_service_spec.rb · c43e0cf7
  Nick Thomas authored Mar 15, 2018
  
  c43e0cf7
- Move EE-only elasticsearch specs in ee/spec/helpers/search_helper_spec.rb · 741e0b23
  Nick Thomas authored Mar 15, 2018
  
  741e0b23
- Move EE-only elasticsearch specs in spec/requests/api/search_spec.rb · c174fadc
  Nick Thomas authored Mar 15, 2018
  
  c174fadc
- Move EE-only elasticsearch specs in spec/models/project_spec.rb · 5a7a3f42
  Nick Thomas authored Mar 15, 2018
  
  5a7a3f42
- Move EE-only elasticsearch specs in spec/models/repository_spec.rb · 6bec7c2a
  Nick Thomas authored Mar 15, 2018
  
  6bec7c2a
- .gitlab-ci.yml: only add the elasticsearch service to EE-only tests · a102d09a
  Nick Thomas authored Mar 15, 2018
  
  a102d09a
- Resolve conflicts in lib/gitlab/slash_commands/command.rb · 12068787
  Stan Hu authored Mar 15, 2018
  
  12068787
- Resolve conflict in app/models/ci/build.rb · 7183fac8
  Stan Hu authored Mar 15, 2018
  
  7183fac8
- Resolve conflicts in Gemfile.lock · 4d8df34a
  Stan Hu authored Mar 15, 2018
  
  4d8df34a
- Cache column_exists? for Elasticsearch columns · 65be69cf
  Stan Hu authored Mar 15, 2018
```
Any time a searchable object (e.g. issue, merge request, project, etc.)
is updated, the `after_commit` hook checks whetether two Elasticsearch
columns are present in the application_settings table. This leads to
unnecessary queries in production as the value can just be cached by
connection.

Closes gitlab-org/gitlab-ce#43355
```
  65be69cf
- Merge branch 'remove-unnecessary-ee-project-select' into 'master' · 60ee289c
  Fatih Acet authored Mar 15, 2018
```
Remove unnecessary ee project select vue file

See merge request gitlab-org/gitlab-ee!4985
```
  60ee289c