Commits · v11.4.11-ee · gitlab-cn / Gitlab

This project is mirrored from https://jihulab.com/gitlab-cn/gitlab.git. Pull mirroring updated 16 minutes ago.

Dec 13, 2018
- Update VERSION to 11.4.11-ee · 25cd3caf
  GitLab Release Tools Bot authored 6 years ago
  
  v11.4.11-ee
  
  25cd3caf
- Update CHANGELOG.md for 11.4.11 · ca14f9fc
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  ca14f9fc
- Update CHANGELOG-EE.md for 11.4.11-ee · e4f6fdc6
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  e4f6fdc6
- Merge branch '11-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 11-4-stable-ee · d5744e1d
  John Jarvis authored 6 years ago
  
  d5744e1d
- Merge branch 'security-2754-fix-lfs-import-11-4' into 'security-11-4' · 419a17a4
  John Jarvis authored 6 years ago
```
[11.4] Validate LFS hrefs before downloading them

See merge request gitlab/gitlabhq!2699
```
  419a17a4
Dec 06, 2018
- Update VERSION to 11.4.10 · 97fd4e2a
  GitLab Release Tools Bot authored 6 years ago
  
  97fd4e2a
- Update CHANGELOG.md for 11.4.10 · e4c78da2
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  e4c78da2
- Update VERSION to 11.4.10-ee · 828f4cc0
  GitLab Release Tools Bot authored 6 years ago
  
  v11.4.10-ee
  
  828f4cc0
- Update CHANGELOG.md for 11.4.10 · 895aaf28
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  895aaf28
- Update CHANGELOG-EE.md for 11.4.10-ee · 106669f9
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  106669f9
Dec 05, 2018
- Merge branch '11-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 11-4-stable-ee · 6d85d433
  Cindy Pallares authored 6 years ago
  
  6d85d433
- Merge branch 'security-54857-fix-templates-path-traversal-11-4' into 'security-11-4' · e2943aa7
  Cindy Pallares authored 6 years ago
```
[11.4] Prevent a path traversal attack on global file templates

See merge request gitlab/gitlabhq!2670
```
  e2943aa7
Dec 03, 2018
- Update VERSION to 11.4.9 · a7aa13bc
  GitLab Release Tools Bot authored 6 years ago
  
  a7aa13bc
- Update CHANGELOG.md for 11.4.9 · ab0c484b
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  ab0c484b
- Update VERSION to 11.4.9-ee · 985cc000
  GitLab Release Tools Bot authored 6 years ago
  
  v11.4.9-ee
  
  985cc000
- Update CHANGELOG.md for 11.4.9 · 84638745
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  84638745
- Update CHANGELOG-EE.md for 11.4.9-ee · a967f161
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  a967f161
- Merge branch '11-4-stable-patch-9' into '11-4-stable' · 265e3d39
  Steve Azzopardi authored 6 years ago
```
Prepare 11.4.9 release

See merge request gitlab-org/gitlab-ce!23473
```
  265e3d39
- Merge branch '11-4-stable-ee-patch-9' into '11-4-stable-ee' · efa2a346
  Steve Azzopardi authored 6 years ago
```
Prepare 11.4.9-ee release

See merge request gitlab-org/gitlab-ee!8654
```
  efa2a346
- Merge branch '11-4-stable-patch-9' of gitlab.com:gitlab-org/gitlab-ce into 11-4-stable-ee-patch-9 · 413a551d
  Steve Azzopardi authored 6 years ago
  
  413a551d
- Remove `ee` directory for `ce` repo · 9d12bc1a
  Steve Azzopardi authored 6 years ago
  
  9d12bc1a
Nov 30, 2018
- Remove QA/ElementWithPattern · 576eecff
  Jan Provaznik authored 6 years ago
```
This check is not present in 11.4
```
  576eecff
- Remove QA/ElementWithPattern · 43a07cdb
  Jan Provaznik authored 6 years ago
```
This check is not present in 11.4
```
  43a07cdb
- Merge branch '11-4-stable-patch-9' of gitlab.com:gitlab-org/gitlab-ce into 11-4-stable-ee-patch-9 · e3620481
  Steve Azzopardi authored 6 years ago
  
  e3620481
- Merge branch 'if-53347_fix_impersonation_tokens' into 'master' · 89f5ff11
  Stan Hu authored 6 years ago
```
Display impersonation token value only after creation

See merge request gitlab-org/gitlab-ce!22916
```
  89f5ff11
- Merge branch '53763-fix-encrypt-columns-data-loss' into 'master' · a25d8857
  Stan Hu authored 6 years ago
```
Correctly handle data-loss scenarios when encrypting columns

Closes #53763

See merge request gitlab-org/gitlab-ce!23306

(cherry picked from commit 1524a193)

6ddefe7c Correctly handle data-loss scenarios when encrypting columns
```
  a25d8857
Nov 27, 2018
- Update VERSION to 11.4.8 · bdfeff3c
  GitLab Release Tools Bot authored 6 years ago
  
  bdfeff3c
- Update CHANGELOG.md for 11.4.8 · 427a30c0
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  427a30c0
- Update VERSION to 11.4.8-ee · 966cce5b
  GitLab Release Tools Bot authored 6 years ago
  
  v11.4.8-ee
  
  966cce5b
- Update CHANGELOG.md for 11.4.8 · 799502ab
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  799502ab
- Update CHANGELOG-EE.md for 11.4.8-ee · cb9877c9
  GitLab Release Tools Bot authored 6 years ago
```
[ci skip]
```
  cb9877c9
- Merge branch 'ce-to-ee-2018-11-26-11-4-stable' into '11-4-stable-ee' · 19734c7a
  Steve Azzopardi authored 6 years ago
```
SECURITY: Ce to ee 2018 11 26 11 4 stable

See merge request gitlab/gitlab-ee!736
```
  19734c7a
- Merge branch 'sh-fix-issue-8448-ce' into 'master' · 6a54856c
  Steve Azzopardi authored 6 years ago
```
Stub Rails.application.env_config to prevent spec failures

Closes gitlab-ee#8488

See merge request gitlab-org/gitlab-ce!23222
```
  6a54856c
Nov 26, 2018
- Fixing `#normalize_create_params` for epics notes a bit more · 5b8a51a9
  Mario de la Ossa authored 6 years ago
  
  5b8a51a9
- Fix issuable_helper_spec wrong markdown version · 3b0f0d62
  Mario de la Ossa authored 6 years ago
  
  3b0f0d62
- Fix #normalize_create_params for epics · 42b154d4
  Mario de la Ossa authored 6 years ago
  
  42b154d4
- Fix db/schema.rb · 510fd200
  Steve Azzopardi authored 6 years ago
```
We had an outdated db/schema.rb
```
  510fd200
- Resolve conflicts in `project_spec.rb` · 898b0460
  Bob Van Landuyt authored 6 years ago
  
  898b0460
- Resolve conflicts in `application_controller.rb` · 2c01df54
  Bob Van Landuyt authored 6 years ago
  
  2c01df54
- Resolve conflicts in _commit.html.haml · 1d678c67
  Bob Van Landuyt authored 6 years ago
  
  1d678c67