Commits · 0db52ff7d720a9ad50e195e2f92912d1f3f4f62a · nexedi / gitlab-ce

29 Oct, 2018 4 commits
- Merge branch 'security-master-ee-xss-reports' into 'master' · 0db52ff7
  Jan Provaznik authored Oct 29, 2018
```
[master] Fix XSS in Security Reports and License Management

See merge request gitlab/gitlab-ee!688
```
  0db52ff7
- Merge branch 'security-2717-fix-issue-title-xss' into 'master' · 651009bc
  Jan Provaznik authored Oct 29, 2018
```
[master] Escape issue title while template rendering to prevent XSS

See merge request gitlab/gitlab-ee!696
```
  651009bc
- Merge branch 'security-unauth-protected-branch-delete' into 'master' · 38282323
  Jan Provaznik authored Oct 29, 2018
```
[master] Resolve "Unauthorized user can delete protected branch's merge access levels and push access levels"

See merge request gitlab/gitlab-ee!693
```
  38282323
- Merge branch 'sh-fix-hipchat-ssrf-ee' into 'master' · 462e919d
  Jan Provaznik authored Oct 29, 2018
```
[master] Prevent SSRF attacks in HipChat integration

See merge request gitlab/gitlab-ee!689
```
  462e919d
27 Oct, 2018 4 commits
- Update CHANGELOG.md for 11.2.7 · 83fd2a07
  GitLab Release Tools Bot authored Oct 27, 2018
```
[ci skip]
```
  83fd2a07
- Update CHANGELOG-EE.md for 11.2.7-ee · ea85a09c
  GitLab Release Tools Bot authored Oct 27, 2018
```
[ci skip]
```
  ea85a09c
- Update CHANGELOG.md for 11.3.8 · 27a28cde
  GitLab Release Tools Bot authored Oct 27, 2018
```
[ci skip]
```
  27a28cde
- Update CHANGELOG-EE.md for 11.3.8-ee · 9f9dbef6
  GitLab Release Tools Bot authored Oct 27, 2018
```
[ci skip]
```
  9f9dbef6
26 Oct, 2018 6 commits
- Update CHANGELOG.md for 11.4.3 · 93d7c0de
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  93d7c0de
- Update CHANGELOG-EE.md for 11.4.3-ee · 9f8db88a
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  9f8db88a
- Update CHANGELOG.md for 11.2.6 · dba93bc5
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  dba93bc5
- Update CHANGELOG-EE.md for 11.2.6-ee · 8aceabbe
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  8aceabbe
- Update CHANGELOG.md for 11.3.7 · 8f0f14fa
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  8f0f14fa
- Update CHANGELOG-EE.md for 11.3.7-ee · 18b0f385
  GitLab Release Tools Bot authored Oct 26, 2018
```
[ci skip]
```
  18b0f385
25 Oct, 2018 25 commits
- Merge remote-tracking branch 'origin/master' into dev-master · 8d87cd8b
  DJ Mountney authored Oct 25, 2018
  
  8d87cd8b
- Merge branch 'jej/group-saml-metadata-common-changes' into 'master' · 89571f3f
  Kamil Trzciński authored Oct 25, 2018
```
Extract SAML refactoring from metadata MR

See merge request gitlab-org/gitlab-ee!7997
```
  89571f3f
- 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
- Update CHANGELOG.md for 11.4.2 · cb130c3a
  GitLab Release Tools Bot authored Oct 25, 2018
```
[ci skip]
```
  cb130c3a
- Update CHANGELOG-EE.md for 11.4.2-ee · 0ad296a9
  GitLab Release Tools Bot authored Oct 25, 2018
```
[ci skip]
```
  0ad296a9
- 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 1 commit
- Resolve conflicts in .gitlab-ci.yml · e98113d3
  Stan Hu authored Oct 24, 2018
  
  e98113d3