summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-253-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] HTML escape the name of the user in ProjectsHelper#link_to_member See merge request gitlab/gitlabhq!2401
| | * | | | | | | | | | | | | HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-153-2/+15
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-253-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400
| | * | | | | | | | | | | | | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-163-1/+15
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-256-11/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-18174-762/+978
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.rails5.lock
| | * | | | | | | | | | | | | | | | Update Gemfile.rails5.lockDouwe Maan2018-06-181-4/+8
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add changelog itemDouwe Maan2018-06-181-0/+5
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-182-2/+13
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5Francisco Javier López2018-06-152-5/+9
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.7.6Alessio Caiazza2018-06-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.8.5Alessio Caiazza2018-06-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.0.1Alessio Caiazza2018-06-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch '45933-webide-fade-uneditable-area' into 'master'Phil Hughes2018-06-252-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE" Closes #45933 See merge request gitlab-org/gitlab-ce!20008
| * | | | | | | | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE"Paul Slaughter2018-06-252-2/+16
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-252-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to load omniauth if not enabled Closes gitlab-ee#6591 See merge request gitlab-org/gitlab-ce!20132
| * | | | | | | | | | | | | | | | | | Add changelog entry6591-dont-load-omniauth-if-not-enabledLin Jen-Shin2018-06-251-0/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master'Mike Greiling2018-06-256-129/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves remove_issue component into a .vue file See merge request gitlab-org/gitlab-ce!20067
| * | | | | | | | | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debtFilipa Lacerda2018-06-251-8/+8
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debtFilipa Lacerda2018-06-25361-2864/+10582
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (67 commits) (Part 1) Resolve "Recognise when a user is trying to validate a private SSH key" Fix auto_cancel_pending_pipelines check Resolve "2FA should not attempt to use U2F in unsupported browsers" Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB" Resolve "Help users find our contributing page" Docs broken links Refactor issue boards and get the EE changes to CE Adds test to cover the fix in #45575 Log push output on exception Update gitlab_chart.md Remove top margin for bootstrap popover headers Bump sprockets to 3.7.2 to address CVE-2018-3760 Bring changes from EE Bring changes from EE Simplify the decode secret step Cleanup ruby sampler metrics Raw diffs are served from Gitaly add inline badges to auto devops feature list Add more large tables to cop Bring changes from EE ...
| * | | | | | | | | | | | | | | | | | | Moves tabs.js component into a vue fileFilipa Lacerda2018-06-214-94/+96
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Moves remove_issue component into a .vue fileFilipa Lacerda2018-06-212-19/+19
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'feature/honor-saml-assurance-level' into 'master'Douwe Maan2018-06-2514-93/+435
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassing See merge request gitlab-org/gitlab-ce!19651
| * | | | | | | | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-2514-93/+435
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-254-41/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
| * | | | | | | | | | | | | | | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-254-41/+22
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* | | | | | | | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master'Douwe Maan2018-06-252-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify some admin controllers See merge request gitlab-org/gitlab-ce!20147
| * | | | | | | | | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-252-4/+4
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-253-369/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ancestor check is Gitaly only now Closes gitaly#789 and gitaly#308 See merge request gitlab-org/gitlab-ce!20095
| * | | | | | | | | | | | | | | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-252-353/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes closes another migration! And remotes tests around it, mostly due to stubbing this was needed. Also, these are tested on the Gitaly side too: - https://gitlab.com/gitlab-org/gitaly/issues/791 - https://gitlab.com/gitlab-org/gitaly/blob/6dd74543f6af8ebcf22aa10e39da004f388fdda5/internal/service/repository/fetch_remote_test.go Closes https://gitlab.com/gitlab-org/gitaly/issues/789
| * | | | | | | | | | | | | | | | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/308
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-252-40/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write Config is mandatory Closes gitaly#879 See merge request gitlab-org/gitlab-ce!20146
| * | | | | | | | | | | | | | | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-252-40/+24
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/879
* | | | | | | | | | | | | | | | | | | | Merge branch 'unify-delete_user_worker_spec.rb' into 'master'Douwe Maan2018-06-251-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer `expect_next_instance_of` over `expect_any_instance_of` See merge request gitlab-org/gitlab-ce!20141
| * | | | | | | | | | | | | | | | | | | | Prefer `expect_next_instance_of` over `expect_any_instance_of`unify-delete_user_worker_spec.rbLin Jen-Shin2018-06-251-4/+6
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Languages feature gate See merge request gitlab-org/gitlab-ce!20128
| * | | | | | | | | | | | | | | | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-252-98/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatory Closes gitaly#310 See merge request gitlab-org/gitlab-ce!20099
| * | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-252-98/+27
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/310
* | | | | | | | | | | | | | | | | | | | Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requests See merge request gitlab-org/gitlab-ce!20125
| * | | | | | | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-255-27/+52
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-2513-37/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make GFM Autocomplete configurable See merge request gitlab-org/gitlab-ce!20066
| * | | | | | | | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Update map name for default autocomplete configKushal Pandya2018-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add default autocomplete configKushal Pandya2018-06-255-28/+39
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/document-new-preview' into 'master'Rémy Coutable2018-06-252-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how the new automatic review apps for docs work See merge request gitlab-org/gitlab-ce!20149
| * | | | | | | | | | | | | | | | | | | | Document how the new automatic review apps for docs workAchilleas Pipinellis2018-06-252-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20130
* | | | | | | | | | | | | | | | | | | | | Merge branch '6165_project_security_dashboard-CE' into 'master'Filipa Lacerda2018-06-254-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project sidebar to work with EE feature Security Dashboard See merge request gitlab-org/gitlab-ce!20101
| * | | | | | | | | | | | | | | | | | | | | Update project sidebar to work with EE feature Security DashboardOlivier Gonzalez2018-06-254-7/+15
|/ / / / / / / / / / / / / / / / / / / / /