Commits · 08b70004399ce4bcc32a44b731e08aff254f92bb · nexedi / gitlab-ce

26 Jun, 2018 3 commits
- Merge branch 'add-proofreader' into 'master' · 08b70004
  Rémy Coutable authored Jun 26, 2018
```
Add Hiroyuki Sato as a Japanese proofreader

See merge request gitlab-org/gitlab-ce!20134
```
  08b70004
- Merge branch 'update_project_flash_error_message' into 'master' · d2bba30f
  Rémy Coutable authored Jun 26, 2018
```
Set flash error message only for current request when updating project

Closes #43772

See merge request gitlab-org/gitlab-ce!20126
```
  d2bba30f
- Merge branch 'docs-contributing-links' into 'master' · 701adc21
  Achilleas Pipinellis authored Jun 26, 2018
```
Update CONTRIBUTING.md to fix links

See merge request gitlab-org/gitlab-ce!19814
```
  701adc21
25 Jun, 2018 37 commits
- Merge branch 'existing-gcp-accounts' into 'master' · 73e84351
  Mike Greiling authored Jun 25, 2018
```
Add back copy for existing gcp accounts within offer banner

See merge request gitlab-org/gitlab-ce!20159
```
  73e84351
- Merge branch... · 0139c221
  Robert Speicher authored Jun 25, 2018
```
Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master'

Resolve "Sorting by name on explore projects page renders a 500 error when logged in"

Closes #48339

See merge request gitlab-org/gitlab-ce!20162
```
  0139c221
- Add CHANGELOG · b9b2060d
  Douglas Barbosa Alexandre authored Jun 25, 2018
  
  b9b2060d
- Merge branch 'changelog-code-style' into 'master' · 7d62da69
  Robert Speicher authored Jun 25, 2018
```
Improve shelling out in bin/changelog

See merge request gitlab-org/gitlab-ce!18977
```
  7d62da69
- Improve shelling out in bin/changelog · dcdcbfa4
  Jacob Vosmaer (GitLab) authored Jun 25, 2018
  
  dcdcbfa4
- Fix sorting by name on explore projects page · e8edf620
  Douglas Barbosa Alexandre authored Jun 25, 2018
  
  e8edf620
- Merge branch 'fix-alert-btn' into 'master' · 2ee1913f
  Mike Greiling authored Jun 25, 2018
```
Fix alert button styling so that they don't show up white

Closes #48407

See merge request gitlab-org/gitlab-ce!20163
```
  2ee1913f
- Do not style alert links that mimic buttons · 8951b6da
  Clement Ho authored Jun 25, 2018
  
  8951b6da
- Merge branch 'zj-exclude-geo-database-yaml' into 'master' · eb0416ae
  Robert Speicher authored Jun 25, 2018
```
Exclude Geo DB Yaml on CE too

See merge request gitlab-org/gitlab-ce!20143
```
  eb0416ae
- Merge branch '33886-resolve-fsevents-issues' into 'master' · 52ea9b26
  Clement Ho authored Jun 25, 2018
```
Resolve "100% CPU for webpack-dev-server running in GDK"

Closes #33886

See merge request gitlab-org/gitlab-ce!20113
```
  52ea9b26
- Resolve "100% CPU for webpack-dev-server running in GDK" · 70bf0807
  Mike Greiling authored Jun 25, 2018
  
  70bf0807
- Merge branch 'unify-api-boards_spec.rb' into 'master' · 45453c27
  Robert Speicher authored Jun 25, 2018
```
Unify spec/requests/api/boards_spec.rb

See merge request gitlab-org/gitlab-ce!20158
```
  45453c27
- Add back copy for existing gcp accounts within offer banner · 265aa433
  tauriedavis authored Jun 25, 2018
  
  265aa433
- Merge branch '46202-webide-file-states' into 'master' · d38eb9bb
  Mike Greiling authored Jun 25, 2018
```
Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"

Closes #46202

See merge request gitlab-org/gitlab-ce!19969
```
  d38eb9bb
- Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" · fe1203b5
  Paul Slaughter authored Jun 25, 2018
  
  fe1203b5
- Merge branch 'unify-some-projects-controllers' into 'master' · 8b13f236
  Robert Speicher authored Jun 25, 2018
```
Unify some projects controllers

See merge request gitlab-org/gitlab-ce!20157
```
  8b13f236
- Merge branch '34371-vue-components-tech-debt' into 'master' · c91957c6
  Mike Greiling authored Jun 25, 2018
```
Moves some issue boards components into `.vue` file

See merge request gitlab-org/gitlab-ce!20106
```
  c91957c6
- Bring changes from EE · 692db2e4
  Lin Jen-Shin authored Jun 26, 2018
  
  692db2e4
- Bring changes from EE · 74b5c4da
  Lin Jen-Shin authored Jun 26, 2018
  
  74b5c4da
- Merge branch 'jivl-update-gitlab-svg-package' into 'master' · dd949b0b
  Tim Zallmann authored Jun 25, 2018
```
Bumps gitlab-svg library version

See merge request gitlab-org/gitlab-ce!20153
```
  dd949b0b
- Merge branch 'fix-inconsistent-cancel-button' into 'master' · 3755d828
  Clement Ho authored Jun 25, 2018
```
Change button text to more specific "Discard draft"

Closes #47475

See merge request gitlab-org/gitlab-ce!20140
```
  3755d828
- Merge remote-tracking branch 'dev/master' · 6dd181da
  Alessio Caiazza authored Jun 25, 2018
  
  6dd181da
- Merge branch 'security-html_escape_branch_name' into 'master' · 43e7e080
  Alessio Caiazza authored Jun 25, 2018
```
[master] HTML escape branch name in project graphs page

See merge request gitlab/gitlabhq!2408
```
  43e7e080
- Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'master' · c7d80969
  Alessio Caiazza authored Jun 25, 2018
```
[master] Don't show internal info in public feed

See merge request gitlab/gitlabhq!2395
```
  c7d80969
- Merge branch 'security-html_escape_usernames' into 'master' · 8d18f219
  Alessio Caiazza authored Jun 25, 2018
```
[master] HTML escape the name of the user in ProjectsHelper#link_to_member

See merge request gitlab/gitlabhq!2401
```
  8d18f219
- Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' · 9d6499a5
  Alessio Caiazza authored Jun 25, 2018
```
[master] Fix xss for Markdown elements where [[_TOC_]] is enabled

See merge request gitlab/gitlabhq!2400
```
  9d6499a5
- Merge branch 'security-fj-bumping-sanitize-gem' into 'master' · 70c02bf3
  Alessio Caiazza authored Jun 25, 2018
```
[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability

See merge request gitlab/gitlabhq!2399
```
  70c02bf3
- Merge branch '45933-webide-fade-uneditable-area' into 'master' · da8b8fe3
  Phil Hughes authored Jun 25, 2018
```
Resolve "Guide users towards editing capabilities in review mode of Web IDE"

Closes #45933

See merge request gitlab-org/gitlab-ce!20008
```
  da8b8fe3
- Resolve "Guide users towards editing capabilities in review mode of Web IDE" · 166c4ee9
  Paul Slaughter authored Jun 25, 2018
  
  166c4ee9
- Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master' · 18565188
  Stan Hu authored Jun 25, 2018
```
Don't try to load omniauth if not enabled

Closes gitlab-ee#6591

See merge request gitlab-org/gitlab-ce!20132
```
  18565188
- Merge branch 'fl-fix-tech-debt' into 'master' · e69760b6
  Mike Greiling authored Jun 25, 2018
```
Moves remove_issue component into a .vue file

See merge request gitlab-org/gitlab-ce!20067
```
  e69760b6
- Merge branch 'feature/honor-saml-assurance-level' into 'master' · 203be787
  Douwe Maan authored Jun 25, 2018
```
Honor saml assurance level to allow 2FA bypassing

See merge request gitlab-org/gitlab-ce!19651
```
  203be787
- Honor saml assurance level to allow 2FA bypassing · 2efe27ba
  Roger Rüttimann authored Jun 25, 2018
  
  2efe27ba
- Merge branch 'zj-create-from-bundle-mandatory' into 'master' · 77fe4166
  Douwe Maan authored Jun 25, 2018
```
Moves CreateFromBundle RPC to mandatory

Closes gitaly#944

See merge request gitlab-org/gitlab-ce!20144
```
  77fe4166
- Merge branch 'unify-admin-controllers' into 'master' · 84bfaedf
  Douwe Maan authored Jun 25, 2018
```
Unify some admin controllers

See merge request gitlab-org/gitlab-ce!20147
```
  84bfaedf
- Merge branch 'zj-is-anchestor' into 'master' · fe03ff90
  Douwe Maan authored Jun 25, 2018
```
Ancestor check is Gitaly only now

Closes gitaly#789 and gitaly#308

See merge request gitlab-org/gitlab-ce!20095
```
  fe03ff90
- Merge branch 'zj-write-config' into 'master' · 246ce5b5
  Douwe Maan authored Jun 25, 2018
```
Write Config is mandatory

Closes gitaly#879

See merge request gitlab-org/gitlab-ce!20146
```
  246ce5b5