summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bug where ID is not setrevert-fd6e3781Zeger-Jan van de Weg2018-11-203-6/+29
* Revert "Merge branch 'revert-e2aa2177' into 'master'"Zeger-Jan van de Weg2018-11-2018-1275/+756
* Merge branch 'gt-externalize-app-views-projects-diffs' into 'master'Phil Hughes2018-11-2015-22/+53
|\
| * Externalize strings from `/app/views/projects/diffs`George Tsiolis2018-11-2015-22/+53
* | Merge branch 'improve_migrations_docs' into 'master'Yorick Peterse2018-11-201-3/+3
|\ \
| * | Correct inaccurate phrase related to disable_ddl_transaction modeimprove_migrations_docsNikolay2018-08-141-3/+3
* | | Merge branch 'docs/post-merge-pipelines' into 'master'Marcia Ramos2018-11-202-0/+28
|\ \ \
| * | | Add docs on post-merge pipelinesdocs/post-merge-pipelinesAchilleas Pipinellis2018-11-202-2/+30
* | | | Merge branch 'docs/direct-link-review-apps' into 'master'Marcia Ramos2018-11-203-8/+26
|\ \ \ \
| * | | | Add docs for linking in changed pages from MR widgetdocs/direct-link-review-appsAchilleas Pipinellis2018-11-163-8/+26
* | | | | Merge branch 'revert-e2aa2177' into 'master'Sean McGivern2018-11-2018-756/+1275
|\ \ \ \ \
| * | | | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177Sean McGivern2018-11-2018-756/+1275
* | | | | | Merge branch 'project_identicon_fix' into 'master'Kushal Pandya2018-11-202-1/+6
|\ \ \ \ \ \
| * | | | | | Add changelog item for changes.Harry Kiselev2018-11-191-0/+5
| * | | | | | Fix a project icon in home panel view, #51157.Harry Kiselev2018-11-171-1/+1
* | | | | | | Merge branch 'gt-change-breadcrumb-title-for-contribution-charts' into 'master'Kushal Pandya2018-11-204-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Change breadcrumb title for contribution chartsGeorge Tsiolis2018-11-144-3/+13
* | | | | | | | Merge branch 'image-diff-size-fix' into 'master'Filipa Lacerda2018-11-204-35/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed the dimensions of image diffsPhil Hughes2018-11-204-35/+12
* | | | | | | | | Merge branch 'docs/minor-aws-fixes' into 'master'Achilleas Pipinellis2018-11-202-17/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes to AWS documentationBrendan O'Leary 🐢2018-11-202-17/+22
|/ / / / / / / / /
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |