Commits · d5a1910f0ce24cf88bc7f0279904a8d5088e2ffa · nexedi / gitlab-ce

26 Jun, 2018 1 commit
- Port Namespace#root_ancestor to CE · d5a1910f
  Lin Jen-Shin authored Jun 26, 2018
  
  d5a1910f
25 Jun, 2018 39 commits
- Bring changes from EE · 2024522b
  Lin Jen-Shin authored Jun 26, 2018
  
  2024522b
- 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 · 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
- Merge branch 'unify-delete_user_worker_spec.rb' into 'master' · 0edc12b3
  Douwe Maan authored Jun 25, 2018
```
Prefer `expect_next_instance_of` over `expect_any_instance_of`

See merge request gitlab-org/gitlab-ce!20141
```
  0edc12b3
- Merge branch 'zj-missing-part-linguist' into 'master' · 51f047aa
  Douwe Maan authored Jun 25, 2018
```
Remove Languages feature gate

See merge request gitlab-org/gitlab-ce!20128
```
  51f047aa
- Merge branch 'zj-tree-entry-mandatory' into 'master' · c73ecd32
  Douwe Maan authored Jun 25, 2018
```
Gitaly tree entry is mandatory

Closes gitaly#310

See merge request gitlab-org/gitlab-ce!20099
```
  c73ecd32
- Merge branch '6598-notify-only-open-unmergeable-mr' into 'master' · d9446b28
  Sean McGivern authored Jun 25, 2018
```
Notify conflict only for opened/locked merge requests

See merge request gitlab-org/gitlab-ce!20125
```
  d9446b28
- Notify conflict only for opened/locked merge requests · ea25fbb8
  Mark Chao authored Jun 25, 2018
  
  ea25fbb8
- Fix localized button string · 5aff2bdb
  Andreas Kämmerle authored Jun 25, 2018
  
  5aff2bdb
- Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master' · 6938335c
  Phil Hughes authored Jun 25, 2018
```
Make GFM Autocomplete configurable

See merge request gitlab-org/gitlab-ce!20066
```
  6938335c
- Merge branch 'docs/document-new-preview' into 'master' · fbbbd326
  Rémy Coutable authored Jun 25, 2018
```
Document how the new automatic review apps for docs work

See merge request gitlab-org/gitlab-ce!20149
```
  fbbbd326
- Merge branch '6165_project_security_dashboard-CE' into 'master' · 381a7aa6
  Filipa Lacerda authored Jun 25, 2018
```
Update project sidebar to work with EE feature Security Dashboard

See merge request gitlab-org/gitlab-ce!20101
```
  381a7aa6
- Update project sidebar to work with EE feature Security Dashboard · a2e641a6
  Olivier Gonzalez authored Jun 25, 2018
  
  a2e641a6
- Merge branch '46571-webhooks-nil-password' into 'master' · 0003af6c
  Rémy Coutable authored Jun 25, 2018
```
Resolve "WebHookService doesn't handle user info with nil passwords"

Closes #46571

See merge request gitlab-org/gitlab-ce!19945
```
  0003af6c
- Resolve "WebHookService doesn't handle user info with nil passwords" · 1345968e
  Jan Beckmann authored Jun 25, 2018
  
  1345968e
- update gitlab-svg version · f97c679d
  Jose authored Jun 25, 2018
  
  f97c679d
- Document how the new automatic review apps for docs work · e0af4c19
  Achilleas Pipinellis authored Jun 25, 2018
```
This was missed from
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20130
```
  e0af4c19
- Merge branch 'ide-tab-active-click-fix' into 'master' · 7da7af3a
  Filipa Lacerda authored Jun 25, 2018
```
Fixed the IDE commit list item loosing its active state

Closes #48125

See merge request gitlab-org/gitlab-ce!20138
```
  7da7af3a