Commits · 653f7a918186851eddbb40510c122076b3efe2d7 · nexedi / gitlab-ce

25 Oct, 2018 21 commits
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 653f7a91
  Filipa Lacerda authored Oct 25, 2018
```
CE upstream - 2018-10-25 12:21 UTC

See merge request gitlab-org/gitlab-ee!8083
```
  653f7a91
- Merge branch 'ee-53055-combine-date-util-functions' into 'master' · 75100705
  Filipa Lacerda authored Oct 25, 2018
```
EE Port: Combine all datetime library functions into `datetime_utility.js`

See merge request gitlab-org/gitlab-ee!8081
```
  75100705
- EE Port: Combine all datetime library functions into `datetime_utility.js` · c78607fa
  Kushal Pandya authored Oct 25, 2018
  
  c78607fa
- Resolve CE-to-EE conflicts for job page · 72d1817a
  Steve Azzopardi authored Oct 25, 2018
  
  72d1817a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 105e7de5
  GitLab Bot authored Oct 25, 2018
```
# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	spec/javascripts/jobs/store/getters_spec.js

[ci skip]
```
  105e7de5
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · b8275cdc
  🤖 GitLab Bot 🤖 authored Oct 25, 2018
```
CE upstream - 2018-10-25 11:21 UTC

See merge request gitlab-org/gitlab-ee!8082
```
  b8275cdc
- Merge branch 'ee-refactor_gitlab_kube_client' into 'master' · 143ced3c
  Kamil Trzciński authored Oct 25, 2018
```
Refactor Gitlab::KubeClient (EE)

See merge request gitlab-org/gitlab-ee!7831
```
  143ced3c
- Merge branch 'refactor_gitlab_kube_client' into 'master' · 9e6098a6
  Kamil Trzciński authored Oct 25, 2018
```
Refactor Gitlab::KubeClient

Closes #52131

See merge request gitlab-org/gitlab-ce!22073
```
  9e6098a6
- Merge branch 'ee-52202-consider-moving-isjobstuck-verification-to-backend' into 'master' · acefe12d
  Kamil Trzciński authored Oct 25, 2018
```
EE port of Move job stuck status to backend

See merge request gitlab-org/gitlab-ee!8015
```
  acefe12d
- Merge branch '52202-consider-moving-isjobstuck-verification-to-backend' into 'master' · a5412de5
  Kamil Trzciński authored Oct 25, 2018
```
Move job stuck status to backend

Closes #52202

See merge request gitlab-org/gitlab-ce!22442
```
  a5412de5
- Move job stuck status to backend · 50f703f9
  Steve Azzopardi authored Oct 25, 2018
  
  50f703f9
- Merge branch 'enable_store_sast_report_by_default' into 'master' · b3d51bd9
  Kamil Trzciński authored Oct 25, 2018
```
Enable store security reports by default

See merge request gitlab-org/gitlab-ee!8071
```
  b3d51bd9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · b759f9b7
  GitLab Bot authored Oct 25, 2018
  
  b759f9b7
- Merge branch 'jlenny-UpdateAndroidTemplate' into 'master' · 5726e51a
  Grzegorz Bizon authored Oct 25, 2018
```
Update Android.gitlab-ci.yml template to current Android SDK version

See merge request gitlab-org/gitlab-ce!22531
```
  5726e51a
- Merge branch '5851-extract-ee-specific-files-lines-for-app-mailers-emails' into 'master' · c9a17420
  Grzegorz Bizon authored Oct 25, 2018
```
Resolve "Extract EE specific files/lines for app/mailers/emails"

Closes #5851

See merge request gitlab-org/gitlab-ee!8050
```
  c9a17420
- Merge branch 'unleash-use-client-features' into 'master' · dbe79c49
  Grzegorz Bizon authored Oct 25, 2018
```
Support `/client/features` Unleash endpoint

Closes #8119

See merge request gitlab-org/gitlab-ee!8045
```
  dbe79c49
- Merge branch 'ce-to-ee-2018-10-25' into 'master' · 86f24489
  Phil Hughes authored Oct 25, 2018
```
CE upstream - 2018-10-25 01:22 UTC

Closes gitlab-org/release/tasks#483

See merge request gitlab-org/gitlab-ee!8078
```
  86f24489
- Merge branch '6108-geo_ha_doc-docs' into 'master' · 619bc37f
  Evan Read authored Oct 25, 2018
```
Geo: Clarify Geo HA documentation

Closes #6108

See merge request gitlab-org/gitlab-ee!7894
```
  619bc37f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25 · 16992141
  GitLab Bot authored Oct 25, 2018
  
  16992141
- Merge branch 'ce-to-ee-2018-10-24' into 'master' · 8a23167e
  Stan Hu authored Oct 25, 2018
```
CE upstream - 2018-10-24 16:21 UTC

Closes gitlab-ce#51859, #6875, and gitlab-org/release/framework#23

See merge request gitlab-org/gitlab-ee!8068
```
  8a23167e
- Resolve conflicts in doc/topics/autodevops/index.md · 71dce24e
  Stan Hu authored Oct 24, 2018
  
  71dce24e
24 Oct, 2018 19 commits
- Resolve conflicts in .gitlab-ci.yml · e98113d3
  Stan Hu authored Oct 24, 2018
  
  e98113d3
- Merge branch 'sh-bump-ruby-2.4.5' into 'master' · f5d71ad8
  Robert Speicher authored Oct 24, 2018
```
Upgrade to Ruby 2.4.5

See merge request gitlab-org/gitlab-ce!22484
```
  f5d71ad8
- Merge branch '6717_fix_sast_report_format_version' into 'master' · 60a2ca7a
  Kamil Trzciński authored Oct 24, 2018
```
Fix SAST report format version

See merge request gitlab-org/gitlab-ee!8067
```
  60a2ca7a
- Merge branch 'prettify-all-the-things-7' into 'master' · b0808af2
  Tim Zallmann authored Oct 24, 2018
```
Prettify all the things (part 7)

See merge request gitlab-org/gitlab-ce!22257
```
  b0808af2
- Prettify all the things (part 7) · dfb08243
  Mike Greiling authored Oct 24, 2018
  
  dfb08243
- Enable store security reports by default · e52073c3
  Olivier Gonzalez authored Oct 24, 2018
  
  e52073c3
- Merge branch '53070-fix-usage-ping-link' into 'master' · f8f1466a
  Stan Hu authored Oct 24, 2018
```
Fix usage ping link

Closes #53070

See merge request gitlab-org/gitlab-ce!22545
```
  f8f1466a
- Fix usage ping link · 1ceef5f6
  Anand authored Oct 24, 2018
  
  1ceef5f6
- Merge branch 'fix/secpick-ee' into 'master' · d6ef6c30
  Robert Speicher authored Oct 24, 2018
```
Fix secpick to use EE and guess branch name

Closes gitlab-org/release/tasks#483

See merge request gitlab-org/gitlab-ce!22517
```
  d6ef6c30
- Fix secpick to use EE and guess branch name · 4585df83
  James Lopez authored Oct 24, 2018
  
  4585df83
- Resolve conflict for doc/ci/yaml/README.md · 90e1b3ab
  Lin Jen-Shin authored Oct 24, 2018
  
  90e1b3ab
- Regenerate locale/gitlab.pot · c8d425d5
  Lin Jen-Shin authored Oct 24, 2018
  
  c8d425d5
- Resolve conflict for app/views/layouts/_page.html.haml · ff7f3ec5
  Lin Jen-Shin authored Oct 24, 2018
  
  ff7f3ec5
- Resolve conflict for app/helpers/groups_helper.rb · c8a77e38
  Lin Jen-Shin authored Oct 24, 2018
  
  c8a77e38
- Resolve conflict for .gitlab-ci.yml · 607b9f8c
  Lin Jen-Shin authored Oct 24, 2018
  
  607b9f8c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-24 · 4f418b41
  GitLab Bot authored Oct 24, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	app/helpers/groups_helper.rb
#	app/views/layouts/_page.html.haml
#	doc/ci/yaml/README.md
#	doc/topics/autodevops/index.md
#	locale/gitlab.pot

[ci skip]
```
  4f418b41
- Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into 'master' · 605e952e
  Annabel Dunstone Gray authored Oct 24, 2018
```
Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973

See merge request gitlab-org/gitlab-ce!22503
```
  605e952e
- Merge branch 'autodevops-docs-update' into 'master' · 9e76a434
  Mike Lewis authored Oct 24, 2018
```
clarify auto review apps deployment, jobs skipped by license, disabling at…

See merge request gitlab-org/gitlab-ce!22403
```
  9e76a434
- clarify auto review apps deployment, jobs skipped by license, disabling at… · 4f7f5c49
  Daniel Gruesso authored Oct 24, 2018
  
  4f7f5c49