Commits · 57fab4c6e928e022d42549b9567067666740ea36 · nexedi / gitlab-ce

29 May, 2018 2 commits
- Merge branch 'security-access-dropdown-user-escape' into 'master' · 57fab4c6
  Mayra Cabrera authored May 29, 2018
```
: [master] Escape user names in access dropdowns

See merge request gitlab/gitlab-ee!626
```
  57fab4c6
- Merge branch 'security-approvers-security-fix-master' into 'master' · 88280301
  Mayra Cabrera authored May 29, 2018
```
[master] Escape username in appovers dropdown

See merge request gitlab/gitlab-ee!618
```
  88280301
28 May, 2018 14 commits
- Update CHANGELOG.md for 10.8.2 · 9255697c
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  9255697c
- Update CHANGELOG-EE.md for 10.8.2-ee · 80501744
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  80501744
- Update CHANGELOG.md for 10.7.5 · 405d0c37
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  405d0c37
- Update CHANGELOG-EE.md for 10.7.5-ee · 45dcf88b
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  45dcf88b
- Update CHANGELOG.md for 10.6.6 · 4a38a0bd
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  4a38a0bd
- Update CHANGELOG-EE.md for 10.6.6-ee · 0bae9195
  Filipa Lacerda authored May 28, 2018
```
[ci skip]
```
  0bae9195
- Merge branch 'ce-to-ee-2018-05-28' into 'master' · 44df8a18
  Dmitriy Zaporozhets authored May 28, 2018
```
CE upstream - 2018-05-28 09:23 UTC

See merge request gitlab-org/gitlab-ee!5867
```
  44df8a18
- Merge branch 'rs-burndown-spec-performance' into 'master' · 63b54108
  Rémy Coutable authored May 28, 2018
```
Improve performance of ee/spec/models/burndown_spec.rb

Closes #6156

See merge request gitlab-org/gitlab-ee!5827
```
  63b54108
- Merge branch 'revert-incoming-email-patch-for-gitlab-com' into 'master' · 99ba247c
  Douwe Maan authored May 28, 2018
```
Revert incoming email patch for GitLab.com

See merge request gitlab-org/gitlab-ee!5376
```
  99ba247c
- Merge branch 'rs-committer-verified-email' into 'master' · f7c22b83
  Douwe Maan authored May 28, 2018
```
Fix typo in `push_rule_committer_not_verified` interpolation

Closes #6186

See merge request gitlab-org/gitlab-ee!5843
```
  f7c22b83
- Merge branch '45190-create-notes-diff-files-ee' into 'master' · 2b3d1fe4
  Douwe Maan authored May 28, 2018
```
[CE port] Persist truncated note diffs on a new table

See merge request gitlab-org/gitlab-ee!5813
```
  2b3d1fe4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-28 · f7cc9f2b
  GitLab Bot authored May 28, 2018
  
  f7cc9f2b
- Merge branch 'zj-internal-repo-path' into 'master' · cfdd80ec
  Grzegorz Bizon authored May 28, 2018
```
Don't pass the repository path to Gitlab Shell

See merge request gitlab-org/gitlab-ce!19011
```
  cfdd80ec
- Merge branch 'update-unicode-display_width-1.3.2' into 'master' · bee339ad
  Stan Hu authored May 28, 2018
```
Fix failing static-analysis pipeline

Closes #46859

See merge request gitlab-org/gitlab-ce!19174
```
  bee339ad
27 May, 2018 5 commits
- Merge branch 'docs-fe-accessibility' into 'master' · 014f5f6a
  Tim Zallmann authored May 27, 2018
```
Add docs for frontend accessibility

See merge request gitlab-org/gitlab-ce!17624
```
  014f5f6a
- Add docs for frontend accessibility · dfd8826c
  Clement Ho authored May 27, 2018
  
  dfd8826c
- Merge branch 'docs-vue-guide-update' into 'master' · 4561ce85
  Tim Zallmann authored May 27, 2018
```
Update Frontend documentation regarding Vue and Icons/Illustrations

See merge request gitlab-org/gitlab-ce!18995
```
  4561ce85
- Update Frontend documentation regarding Vue and Icons/Illustrations · 8f57de81
  Lukas Eipert authored May 27, 2018
  
  8f57de81
- Update unicode-display_width from 1.3.0 to 1.3.2 · 1637faac
  Lukas Eipert authored May 27, 2018
  
  1637faac
26 May, 2018 9 commits
- Merge branch 'ce-to-ee-2018-05-26' into 'master' · 99b65a12
  Stan Hu authored May 26, 2018
```
CE upstream - 2018-05-26 12:23 UTC

See merge request gitlab-org/gitlab-ee!5863
```
  99b65a12
- Merge branch '3912-transparently-proxy-http-git-push-from-secondary-to-primary' into 'master' · 60309ca5
  Nick Thomas authored May 26, 2018
```
Resolve "Transparently proxy HTTP Git push from secondary to primary"

Closes #3912

See merge request gitlab-org/gitlab-ee!5785
```
  60309ca5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-26 · 2feba562
  GitLab Bot authored May 26, 2018
  
  2feba562
- Merge branch 'ce-to-ee-bootstrap4' into 'master' · 8e72417d
  Dmitriy Zaporozhets authored May 26, 2018
```
Ce to ee bootstrap4

See merge request gitlab-org/gitlab-ee!5860
```
  8e72417d
- fix failing karma test in `spec/javascripts/boards/issue_spec.js` · 76c5abca
  Lukas Eipert authored May 26, 2018
  
  76c5abca
- Fix lint in `app/views/profiles/keys/_key_details.html.haml` · 182b3acb
  Lukas Eipert authored May 26, 2018
  
  182b3acb
- resolve conflict in `app/assets/javascripts/jobs/components/sidebar_details_block.vue` · 530f2cda
  Lukas Eipert authored May 26, 2018
  
  530f2cda
- Geo: Update docs on push to secondary current limitations · 258796c4
  Ash McKenzie authored May 26, 2018
  
  258796c4
- Geo: Redirect secondary HTTP git push to primary · 8f71ff07
  Ash McKenzie authored May 26, 2018
  
  8f71ff07
25 May, 2018 10 commits
- Fix conflict in yarn.lock · 0b75b130
  Clement Ho authored May 25, 2018
  
  0b75b130
- Fix conflict in app/views/shared/runners/_form.html.haml · d1e6e6c9
  Clement Ho authored May 25, 2018
  
  d1e6e6c9
- Fix conflict in app/views/shared/milestones/_sidebar.html.haml · e635a46f
  Clement Ho authored May 25, 2018
  
  e635a46f
- Fix conflict in app/views/shared/milestones/_issuables.html.haml · 837c502f
  Clement Ho authored May 25, 2018
  
  837c502f
- Fix conflict in app/views/shared/members/_requests.html.haml · 99c9fd31
  Clement Ho authored May 25, 2018
  
  99c9fd31
- Fix conflict in app/views/shared/members/_member.html.haml · 46daeba9
  Clement Ho authored May 25, 2018
  
  46daeba9
- Fix conflict in app/views/shared/issuable/form/_title.html.haml · 812da130
  Clement Ho authored May 25, 2018
  
  812da130
- Fix conflict in app/views/shared/issuable/form/_merge_params.html.haml · 74719490
  Clement Ho authored May 25, 2018
  
  74719490
- Fix conflict in app/views/shared/issuable/_sidebar.html.haml · bbdaf15e
  Clement Ho authored May 25, 2018
  
  bbdaf15e
- Fix conflict in app/views/shared/deploy_keys/_form.html.haml · 59d00287
  Clement Ho authored May 25, 2018
  
  59d00287