summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Look for #as/to_json_for_cache when writing cache59208-upgrading-to-11-9-0-results-in-a-error-500-on-every-page-when-active-broadcast-message-presentAsh McKenzie2019-03-203-9/+85
* Add #as_json_for_cache to BroadcastMessageAsh McKenzie2019-03-202-0/+35
* Merge branch '58410-change-pixel-size-of-instance-header-footer-message-to-16...Filipa Lacerda2019-03-203-2/+7
|\
| * Reduce height of instance system messageDennis Tang2019-03-053-2/+7
* | Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'Kushal Pandya2019-03-204-85/+162
|\ \
| * | Add getJSONFixture() helper to JestWinnie Hellmann2019-03-113-3/+27
| * | Increase timeout for gfm_auto_complete_spec.jsWinnie Hellmann2019-03-111-0/+4
| * | Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'Phil Hughes2019-03-114-85/+134
* | | Merge branch 'do-not-force-2fa' into 'master'James Lopez2019-03-205-22/+60
|\ \ \
| * | | Add additional link to 2fa pageGosia Ksionek2019-03-205-22/+60
|/ / /
* | | Merge branch 'docs-enable-disable-auto-devops-group-level' into 'master'Evan Read2019-03-191-2/+19
|\ \ \
| * | | Add documentation about Auto Devops at group levelMayra Cabrera2019-03-191-2/+19
|/ / /
* | | Merge branch 'winh-remove-static-fixtures' into 'master'Mike Greiling2019-03-1945-210/+373
|\ \ \
| * | | Do not delete files in spec/javascripts/fixtures/static/Winnie Hellmann2019-03-191-4/+0
| * | | Remove static HAML fixtures from frontend testing guideWinnie Hellmann2019-03-192-6/+6
| * | | Remove static JavaScript HAML fixturesWinnie Hellmann2019-03-1942-200/+367
* | | | Merge branch 'only-counted-active-milestones-as-started' into 'master'Kamil Trzciński2019-03-195-2/+11
|\ \ \ \
| * | | | Only count active milestones as startedSean McGivern2019-03-195-2/+11
* | | | | Merge branch 'docs_group_cluster_applications' into 'master'Evan Read2019-03-192-3/+17
|\ \ \ \ \
| * | | | | Add cert-manager to group cluster docsThong Kuah2019-03-192-3/+17
|/ / / / /
* | | | | Merge branch 'sh-create-branch-as-project-owner-for-github-import' into 'master'Douglas Barbosa Alexandre2019-03-193-1/+11
|\ \ \ \ \
| * | | | | GitHub import: Create new branches as project ownerStan Hu2019-03-193-1/+11
* | | | | | Merge branch 'sh-reject-info-refs-head-requests' into 'master'Douglas Barbosa Alexandre2019-03-193-0/+25
|\ \ \ \ \ \
| * | | | | | Reject HEAD requests to info/refs endpointStan Hu2019-03-193-0/+25
| |/ / / / /
* | | | | | Merge branch 'nfriend-update-pipeline-detail-view' into 'master'Kamil Trzciński2019-03-1910-16/+363
|\ \ \ \ \ \
| * | | | | | Update pipeline detail view to accommodate post-merge pipelinesShinya Maeda2019-03-1910-16/+363
* | | | | | | Merge branch 'send-columns-to-sentry-on-missingattributeerror' into 'master'Stan Hu2019-03-192-1/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Send schema cache to Sentry on MissingAttributeErrorSean McGivern2019-03-192-1/+16
* | | | | | | Merge branch '6354-clusters-show' into 'master'Phil Hughes2019-03-191-0/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Removes EE differences for clusters/showFilipa Lacerda2019-03-191-0/+2
* | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Clement Ho2019-03-1914-25/+22
|\ \ \ \ \ \ \
| * | | | | | | Fix failing testsBrandon Labuschagne2019-03-1812-20/+17
| * | | | | | | Update dependency @gitlab/ui to ^2.3.0Lukas 'Eipi' Eipert2019-03-142-5/+5
* | | | | | | | Merge branch '58844-follow-up-from-don-t-create-ee-specific-files-when-creati...Lin Jen-Shin2019-03-194-49/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify the JavaScriptFixturesHelpers moduleRémy Coutable2019-03-194-49/+32
* | | | | | | | | Merge branch 'sh-fix-ssh-pull-mirorrs-ce' into 'master'Nick Thomas2019-03-192-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport EE JavaScript changes for SSH pull mirrorsStan Hu2019-03-192-0/+9
* | | | | | | | | | Merge branch '59113-review-apps-initial-seeding-is-broken-due-to-runners_regi...Nick Thomas2019-03-192-11/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the .review-deploy-base job so that env variables are passedRémy Coutable2019-03-192-11/+13
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/registry2.7-delete-auth' into 'master'Dmitriy Zaporozhets2019-03-192-1/+94
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add support for deleting images in registry 2.7Peter Bábics2019-03-182-1/+94
* | | | | | | | | | | Merge branch 'doc-git-object-dedup' into 'master'Achilleas Pipinellis2019-03-192-0/+262
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document how Git object deduplication works in GitLabJacob Vosmaer2019-03-192-0/+262
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-html-style-guide' into 'master'Marcia Ramos2019-03-191-16/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Docs: Bring HTML Style Guide in line with docs standardsMarcel Amirault2019-03-191-16/+12
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '53139-hide-tree-single-file' into 'master'Filipa Lacerda2019-03-196-8/+88
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Collapse diff tree is only one file is presentPhil Hughes2019-03-196-8/+88
* | | | | | | | | | | | Merge branch '56089-merge-gitlab-keys' into 'master'Nick Thomas2019-03-199-263/+724
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Integrate Gitlab::Keys with Gitlab::ShellPatrick Bajao2019-03-199-263/+724
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'revert-b24c0c8d' into 'master'Lin Jen-Shin2019-03-194-36/+3
|\ \ \ \ \ \ \ \ \ \ \