summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removed middleware and explicitly setting the workhorse headerfj-clean-content-headersFrancisco Javier López2018-11-285-90/+3
* Applied review commentsFrancisco Javier López2018-11-274-9/+9
* Fixed some specsFrancisco Javier López2018-11-219-11/+11
* Added more specsFrancisco Javier López2018-11-209-21/+99
* Changing comment [ci skip]Francisco Javier López2018-11-201-2/+2
* Fixed specsFrancisco Javier López2018-11-208-340/+73
* Add feature flag to enable workhorse content type changesFrancisco Javier López2018-11-2013-88/+574
* Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master'Douwe Maan2018-11-203-1/+68
|\
| * saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses1151002018-10-253-1/+68
* | Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'Douwe Maan2018-11-2011-6/+182
|\ \
| * | Creates /create_merge_request quickaction40085-add-a-create_merge_request-quick-actionJacopo2018-11-1411-6/+182
* | | Merge branch '3062-improve-project-cache' into 'master'Douwe Maan2018-11-205-16/+42
|\ \ \
| * | | Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cacheGabriel Mazetto2018-11-162-2/+28
| * | | Change specs to accept new cache keys for projectsGabriel Mazetto2018-11-161-11/+11
| * | | Change project pipeline status cache key to follow project conventionGabriel Mazetto2018-11-161-1/+1
| * | | Change project cache key to depend on ID instead of full pathGabriel Mazetto2018-11-161-2/+2
* | | | Merge branch 'osw-mention-when-ff-revert-should-be-picked' into 'master'Robert Speicher2018-11-201-0/+6
|\ \ \ \
| * | | | Improve FF "pick after the 7th" docsosw-mention-when-ff-revert-should-be-pickedOswaldo Ferreira2018-11-191-0/+6
* | | | | Merge branch 'gt-externalize-app-views-projects-environments' into 'master'Kushal Pandya2018-11-2011-34/+70
|\ \ \ \ \
| * | | | | Externalize strings from `/app/views/projects/environments`George Tsiolis2018-11-1911-34/+70
* | | | | | Merge branch 'gt-externalize-app-views-u2f' into 'master'Kushal Pandya2018-11-203-16/+52
|\ \ \ \ \ \
| * | | | | | Externalize strings from `/app/views/u2f`George Tsiolis2018-11-203-16/+52
| |/ / / / /
* | | | | | 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
|/ / / / / / / / / / / / / /