Commits · 92f2eafffa843d428cd06007bbdb6b5aeb0388c2 · nexedi / gitlab-ce

12 Feb, 2018 1 commit

Rename .scss files to use snake_case · 92f2eaff

Eric Eastwood authored Feb 08, 2018

See https://gitlab.com/gitlab-org/gitlab-ce/issues/42908

Conflicts:
	app/assets/stylesheets/framework.scss

92f2eaff

10 Feb, 2018 2 commits
- Merge branch 'ce-to-ee-2018-02-10' into 'master' · 5ceb0c6d
  Robert Speicher authored Feb 10, 2018
```
CE upstream - 2018-02-10 00:30 UTC

Closes gitlab-development-kit#321

See merge request gitlab-org/gitlab-ee!4478
```
  5ceb0c6d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-10 · 7ce720ec
  GitLab Bot authored Feb 10, 2018
  
  7ce720ec
09 Feb, 2018 37 commits
- Merge branch 'fix/encoding-to-unsupported-encodings' into 'master' · 498ade48
  Robert Speicher authored Feb 09, 2018
```
Return a warning string if we try to encode to unsupported encoding

Closes gitlab-development-kit#321

See merge request gitlab-org/gitlab-ce!17038
```
  498ade48
- Merge branch 'rs-pick-security-ee' into 'master' · 1646bff5
  Stan Hu authored Feb 09, 2018
```
[EE] Pick 10.4.3 fixes into master

See merge request gitlab-org/gitlab-ee!4470
```
  1646bff5
- Merge branch 'winh-remove-confirmation_input' into 'master' · 97a59cb7
  Clement Ho authored Feb 09, 2018
```
Remove confirmation_input component

See merge request gitlab-org/gitlab-ce!17046
```
  97a59cb7
- Return a warning string if we try to encode to unsupported encoding · 0d910737
  Ahmad Sherif authored Feb 09, 2018
```
Fixes gitlab-development-kit#321
```
  0d910737
- Merge branch 'rs-pick-security' into 'master' · 490aacf5
  Stan Hu authored Feb 09, 2018
```
Pick 10.4.3 fixes into master

See merge request gitlab-org/gitlab-ce!17040
```
  490aacf5
- Remove confirmation_input · 43876e5c
  Winnie Hellmann authored Feb 09, 2018
  
  43876e5c
- Resolve failures in GitHub-ish import controller specs · 9d11cb1b
  Robert Speicher authored Feb 09, 2018
  
  9d11cb1b
- Remove changelogs for already-released security patches · 4beb797e
  Robert Speicher authored Feb 09, 2018
  
  4beb797e
- Remove changelogs for already-released security patches · 59cfe8b7
  Robert Speicher authored Feb 09, 2018
  
  59cfe8b7
- Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' · d021e628
  Kamil Trzciński authored Jan 26, 2018
```
Fix using wildcards in protected tags to expose protected variables
```
  d021e628
- Merge branch 'fix/gh-namespace-issue' into 'security-10-4' · 886b3a63
  James Lopez authored Jan 26, 2018
```
[10.4] Fix GH namespace security issue
```
  886b3a63
- Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4' · 435dd018
  Robert Speicher authored Jan 18, 2018
```
Restrict Todo API mark_as_done endpoint to the user's todos only
```
  435dd018
- Merge branch 'sh-ldap-lock-down-api-admin-10-4' into 'security-10-4-ee' · c52d1453
  Robert Speicher authored Jan 31, 2018
```
Restrict LDAP API to admins only - 10.4 port
```
  c52d1453
- Merge branch 'fix-mermaid-xss' into 'security-10-4' · b0df5ac7
  Douwe Maan authored Jan 31, 2018
```
[10.4] Fix stored XSS in code blocks
```
  b0df5ac7
- Merge branch... · e820cff8
  Douwe Maan authored Jan 18, 2018
```
Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility
```
  e820cff8
- Resolve failures in GitHub-ish import controller specs · 56a41ceb
  Robert Speicher authored Feb 09, 2018
  
  56a41ceb
- Merge branch 'ce-to-ee-2018-02-09' into 'master' · d2d0aa4d
  Stan Hu authored Feb 09, 2018
```
CE upstream - 2018-02-09 18:24 UTC

Closes gitlab-qa#180

See merge request gitlab-org/gitlab-ee!4471
```
  d2d0aa4d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-09 · fcf944a9
  GitLab Bot authored Feb 09, 2018
  
  fcf944a9
- Remove changelogs for already-released security patches · 06e9faa3
  Robert Speicher authored Feb 09, 2018
  
  06e9faa3
- Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' · 02f93da8
  Kamil Trzciński authored Jan 26, 2018
```
Fix using wildcards in protected tags to expose protected variables
```
  02f93da8
- Merge branch 'fix/gh-namespace-issue' into 'security-10-4' · 68e31c09
  James Lopez authored Jan 26, 2018
```
[10.4] Fix GH namespace security issue
```
  68e31c09
- Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4' · fec9fb05
  Robert Speicher authored Jan 18, 2018
```
Restrict Todo API mark_as_done endpoint to the user's todos only
```
  fec9fb05
- Merge branch 'fix-mermaid-xss' into 'security-10-4' · 603fa7c1
  Douwe Maan authored Jan 31, 2018
```
[10.4] Fix stored XSS in code blocks
```
  603fa7c1
- Merge branch... · 5e9e5692
  Douwe Maan authored Jan 18, 2018
```
Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4'

[Port for security-10-4]: Makes SnippetFinder ensure feature visibility
```
  5e9e5692
- Merge branch 'doc-improve-side-effects-block' into 'master' · 721fab66
  Phil Hughes authored Feb 09, 2018
```
Improve docs about allowing some side effects on the constructor

See merge request gitlab-org/gitlab-ce!17027
```
  721fab66
- Merge branch 'sh-add-docker-build-qa' into 'master' · b8ee24e6
  Grzegorz Bizon authored Feb 09, 2018
```
Add documentation on how to build a QA Docker image

See merge request gitlab-org/gitlab-ce!17036
```
  b8ee24e6
- Merge branch '4845-update-sast-doc-and-example' into 'master' · e0e03b98
  Dmitriy Zaporozhets authored Feb 09, 2018
```
Resolve "Update SAST doc and example"

Closes #4845

See merge request gitlab-org/gitlab-ee!4426
```
  e0e03b98
- Resolve "Update SAST doc and example" · 19c1eaa2
  Fabien Catteau authored Feb 09, 2018
  
  19c1eaa2
- Merge branch 'jramsay-fix-incorrect-mirror-role-name' into 'master' · 3b0277fb
  Douwe Maan authored Feb 09, 2018
```
Fix incorrect role name in mirroring error

See merge request gitlab-org/gitlab-ee!4468
```
  3b0277fb
- Add documentation on how to build a QA Docker image · d42e6834
  Stan Hu authored Feb 09, 2018
  
  d42e6834
- Fix incorrect role name in mirroring error · 250f1cde
  James Ramsay authored Feb 09, 2018
  
  250f1cde
- Merge branch '4610-ee-edit' into 'master' · b69b71d6
  Clement Ho authored Feb 09, 2018
```
Resolve "EE-only js for project edit page"

Closes #4610

See merge request gitlab-org/gitlab-ee!4135
```
  b69b71d6
- Resolve "EE-only js for project edit page" · a35aa237
  Simon Knox authored Feb 09, 2018
  
  a35aa237
- Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master' · f7c662c7
  Robert Speicher authored Feb 09, 2018
```
Do not attach runner to a non-exsiting network in QA

Closes gitlab-qa#180

See merge request gitlab-org/gitlab-ce!17028
```
  f7c662c7
- Merge branch 'ce-to-ee-2018-02-09' into 'master' · a09b4eaf
  Douwe Maan authored Feb 09, 2018
```
CE upstream - 2018-02-09 00:24 UTC

Closes gitlab-qa#180

See merge request gitlab-org/gitlab-ee!4460
```
  a09b4eaf
- Move an EE-only spec into spec/ee/spec · 17c1d0ed
  Nick Thomas authored Feb 09, 2018
  
  17c1d0ed
- Hopefully fix some intermittent spec failures · 9a3217ef
  Nick Thomas authored Feb 09, 2018
  
  9a3217ef