summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make Pages visibility list clearerdocs/pages-access-controlAchilleas Pipinellis2018-11-203-15/+14
* Merge branch 'master' into docs/pages-access-controlAchilleas Pipinellis2018-11-20437-2475/+3608
|\
| * Merge branch 'drop-default-value-status-deployments' into 'master'Kamil TrzciƄski2018-11-203-2/+21
| |\
| | * Merge branch 'master-ce' into drop-default-value-status-deploymentsShinya Maeda2018-11-20129-1227/+1429
| | |\
| | * | Remove unnecessary codedrop-default-value-status-deploymentsShinya Maeda2018-11-191-4/+0
| | * | Add changelogShinya Maeda2018-11-191-0/+5
| | * | Merge branch 'master-ce' into drop-default-value-status-deploymentsShinya Maeda2018-11-19605-3309/+6386
| | |\ \
| | * | | Fix nilShinya Maeda2018-11-191-1/+1
| | * | | Remove unnecessary line in schema.rbShinya Maeda2018-11-131-1/+0
| | * | | Drop default value on status column in deployments tableShinya Maeda2018-11-132-2/+21
| * | | | Merge branch 'docs/dangerfile' into 'master'Achilleas Pipinellis2018-11-201-18/+9
| |\ \ \ \
| | * | | | Make the table of tech writers and stages more compactdocs/dangerfileAchilleas Pipinellis2018-11-161-18/+9
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-208-11/+90
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'sh-fix-issue-54189' into 'master'Steve Azzopardi2018-11-204-1/+37
| | |\ \ \ \ \
| | | * | | | | Prevent templated services from being importedStan Hu2018-11-194-1/+37
| | * | | | | | Merge branch 'security-2717-xss-username-autocomplete' into 'master'Steve Azzopardi2018-11-203-10/+39
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Add changelog entryKushal Pandya2018-11-121-0/+5
| | | * | | | | Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-122-10/+34
| | * | | | | | Update CHANGELOG.md for 11.4.6GitLab Release Tools Bot2018-11-181-0/+7
| | * | | | | | Update CHANGELOG.md for 11.3.10GitLab Release Tools Bot2018-11-181-0/+7
| * | | | | | | Merge branch '53290-incorrect-project-list-order-select-default-label' into '...Grzegorz Bizon2018-11-203-1/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Fix default sorting for subgroups and projects list53290-incorrect-project-list-order-select-default-labelJacopo2018-11-143-1/+13
| * | | | | | | | Merge branch '52712-further-ui-improvements-to-profile-overview-tab' into 'ma...Phil Hughes2018-11-208-106/+98
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve "Further UI improvements to Profile "Overview" tab"Martin Wortschack2018-11-208-106/+98
| |/ / / / / / / /
| * | | | | | | | Merge branch 'sh-fix-issue-8448-ce' into 'master'Steve Azzopardi2018-11-201-1/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stub Rails.application.env_config to prevent spec failuressh-fix-issue-8448-ceStan Hu2018-11-191-1/+8
| * | | | | | | | | Merge branch 'docs/fix-booklist-link' into 'master'Achilleas Pipinellis2018-11-201-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Change link to help broken link checkerdocs/fix-booklist-linkEvan Read2018-11-201-1/+1
| * | | | | | | | | | Merge branch '54015-Markdown-Editor-improve-Cursor-placement' into 'master'Kushal Pandya2018-11-203-9/+38
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refine cursor positioning in Markdown Editor for wrap tags.Johann Hubert Sonntagbauer2018-11-203-9/+38
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'remove-unused-partial' into 'master'Sean McGivern2018-11-201-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove unused partialHeinrich Lee Yu2018-11-191-5/+0
| * | | | | | | | | | Merge branch 'zj-improve-gitaly-pb' into 'master'Sean McGivern2018-11-2018-1275/+756
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove duplicate tests for GitalyZeger-Jan van de Weg2018-11-1914-1152/+741
| | * | | | | | | | | Show what RPC is called in the performance barZeger-Jan van de Weg2018-11-164-123/+15
| * | | | | | | | | | Merge branch '53595-allow-requests-to-local-network-requirement-yaml-include-...Evan Read2018-11-201-0/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update docs for include to mention 'allow requests to local network' requirementDaniel Fernau2018-11-201-0/+5
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'frozen-string-lib-gitlab-even-even-more' into 'master'Stan Hu2018-11-20103-3/+213
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Enable even more frozen string for lib/gitlabgfyoung2018-11-16103-3/+213
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'sh-bump-gems-security' into 'master'Douglas Barbosa Alexandre2018-11-194-16/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-194-16/+21
| * | | | | | | | | | Merge branch 'sh-bump-ruby-parser' into 'master'Douglas Barbosa Alexandre2018-11-192-6/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibilityStan Hu2018-11-192-6/+6
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'rails5-active-record-class-value' into 'master'Stan Hu2018-11-198-10/+15
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Rails5: Passing a class as a value in an Active Record query is deprecatedJasper Maes2018-11-178-10/+15
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'qa-staging-15-use-existing-users-ce' into 'master'Mark Lapierre2018-11-193-1/+28
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | CE port of "qa-staging-15-use-existing-users-ee"Sanad Liaquat2018-11-193-1/+28
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'docs-runbook-guide' into 'master'Mike Lewis2018-11-199-3/+91
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | resize guide imagesdocs-runbook-guidedanielgruesso2018-11-195-0/+0
| | * | | | | | | | | Delete jupyter-start.pngDaniel Gruesso2018-11-121-0/+0