Commits · de645911f56f89fb7da69900651b6298259db356 · nexedi / gitlab-ce

16 Mar, 2018 12 commits
- 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 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-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
15 Mar, 2018 28 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
- 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
- Merge branch 'docs-new-fe-guide-style' into 'master' · 618b6dd4
  Jacob Schatz authored Mar 15, 2018
```
Rename style to style guide in new frontend guide

See merge request gitlab-org/gitlab-ce!17725
```
  618b6dd4
- Rename style to style guide in new frontend guide · 4161e1f1
  Clement Ho authored Mar 15, 2018
  
  4161e1f1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-15 · b86b8bc0
  GitLab Bot authored Mar 15, 2018
```
# Conflicts:
#	Gemfile.lock
#	app/models/ci/build.rb
#	lib/gitlab/slash_commands/command.rb

[ci skip]
```
  b86b8bc0
- Remove unnecessary ee project select vue file · f05a12c1
  Clement Ho authored Mar 15, 2018
  
  f05a12c1
- Merge branch 'ce-to-ee-2018-03-14' into 'master' · 603ac55e
  Stan Hu authored Mar 15, 2018
```
CE upstream - 2018-03-14 12:24 UTC

See merge request gitlab-org/gitlab-ee!4967
```
  603ac55e
- Merge branch 'fix-import-helper-spec' into 'master' · be52e4bb
  Stan Hu authored Mar 15, 2018
```
Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

See merge request gitlab-org/gitlab-ce!17776
```
  be52e4bb
- Merge branch 'fix-import-helper-spec' into 'master' · 770ba383
  Stan Hu authored Mar 15, 2018
```
Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

See merge request gitlab-org/gitlab-ce!17776
```
  770ba383
- Merge branch 'jivl-realtime-update-adding-file' into 'master' · 3e20b83b
  Phil Hughes authored Mar 15, 2018
```
Add realtime pipeline status component for files

Closes #42927

See merge request gitlab-org/gitlab-ce!17705
```
  3e20b83b
- Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into 'master' · 49d5c097
  Stan Hu authored Mar 15, 2018
```
Resolve "Reduce Redis usage from merge request diffs caching"

Closes #44191

See merge request gitlab-org/gitlab-ce!17746
```
  49d5c097
- Fix import helper spec when a previous spec stubs settings · 08f754c6
  Sean McGivern authored Mar 15, 2018
```
This should use stub_omniauth_setting, not do it manually.
```
  08f754c6
- Merge branch '44306-drop-jquery-rails' into 'master' · b53c4277
  Phil Hughes authored Mar 15, 2018
```
Drop jquery-rails gem from Gemfile

Closes #44306

See merge request gitlab-org/gitlab-ce!17771
```
  b53c4277
- Merge branch 'drop-jquery-rails' into 'master' · 8b4ed40e
  Phil Hughes authored Mar 15, 2018
```
Remove jquery-rails from Gemfile

See merge request gitlab-org/gitlab-ee!4982
```
  8b4ed40e
- Merge branch 'issue_41724' into 'master' · 332a9bc8
  Sean McGivern authored Mar 15, 2018
```
Add labeled issues seed

Closes #41724

See merge request gitlab-org/gitlab-ce!17754
```
  332a9bc8
- Remove jquery-rails from Gemfile · 0133998b
  Balasankar "Balu" C authored Mar 15, 2018
  
  0133998b
- Remove jquery-rails from Gemfile · a93662ff
  Balasankar "Balu" C authored Mar 15, 2018
  
  a93662ff
- Add labeled issues seed · 09de6daf
  Felipe Artur authored Mar 14, 2018
  
  09de6daf
- Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master' · 81d370d4
  Grzegorz Bizon authored Mar 15, 2018
```
Add slash command for moving an issue

See merge request gitlab-org/gitlab-ce!17691
```
  81d370d4
- Merge branch 'fix-42459-#-in-branch' into 'master' · e5e1b7c3
  Sean McGivern authored Mar 15, 2018
```
Manually escape '#' when building relative uris, closes #42459

Closes #42459

See merge request gitlab-org/gitlab-ce!17679
```
  e5e1b7c3
- Add slash command for moving an issue · d08fd2fe
  Sean McGivern authored Mar 12, 2018
```
Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857
```
  d08fd2fe
- Add slash command for moving an issue · 0fa139df
  Sean McGivern authored Mar 12, 2018
```
Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857
```
  0fa139df