summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelogdrop-gcp-cluster-tableShinya Maeda2018-10-311-0/+5
* Drop gcp_clusters tableShinya Maeda2018-10-312-33/+54
* Merge branch '52992-absorb-qa-product-qa' into 'master'Douglas Barbosa Alexandre2018-10-3115-165/+55
|\
| * CE: Absorb product into factoryLin Jen-Shin2018-10-3115-165/+55
|/
* Merge branch 'docs/refactor-backup' into 'master'Evan Read2018-10-311-91/+224
|\
| * Refactor the backup/restore docsdocs/refactor-backupAchilleas Pipinellis2018-10-301-91/+224
* | Merge branch 'docs-add-existing-k8s-integration-info' into 'master'Evan Read2018-10-301-0/+8
|\ \
| * | Added periods and modified numberingdocs-add-existing-k8s-integration-infoJason Colyer2018-10-301-4/+4
| * | Added Evan's suggestionsJason Colyer2018-10-241-12/+7
| * | Updated commands and order from MR recomendationsJason Colyer2018-10-111-4/+4
| * | Added info on getting k8s integration for existing clusterJason Colyer2018-09-171-0/+13
* | | Merge branch '53052-mg-fix-broken-ie11' into 'master'Clement Ho2018-10-303-5/+10
|\ \ \
| * | | Add changelog entry for !2269553052-mg-fix-broken-ie11Mike Greiling2018-10-301-0/+5
| * | | Upgrade gitlab-ui to latestMike Greiling2018-10-302-5/+5
* | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-3028-125/+289
|\ \ \ \
| * | | | Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
| * | | | Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
| * | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-307-31/+46
| * | | | Move :plain option to Highlight classMark Chao2018-10-309-88/+74
| * | | | Make Highlight accept language paramMark Chao2018-10-3016-56/+64
| * | | | Add BlobPresenter for highlightingMark Chao2018-10-304-1/+82
| * | | | Add access to Blob's language from gitattributesMark Chao2018-10-303-0/+29
| * | | | Add spec for Gitlab::Git::Repository#attributesMark Chao2018-10-303-7/+45
* | | | | Merge branch 'bvl-move-wrapped-gitaly-errors' into 'master'Douwe Maan2018-10-3010-35/+76
|\ \ \ \ \
| * | | | | Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-3010-35/+76
| | |/ / / | |/| | |
* | | | | Merge branch 'docs/fix-notifications-topic' into 'master'Achilleas Pipinellis2018-10-301-18/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix structure and add notification levelEvan Read2018-10-301-18/+23
|/ / / /
* | | | Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'Stan Hu2018-10-3090-2/+188
|\ \ \ \
| * | | | Enable frozen string for lib/gitlab/cigfyoung2018-10-2690-2/+188
* | | | | Merge branch 'fix-app-layout-form-description' into 'master'Clement Ho2018-10-301-2/+2
|\ \ \ \ \
| * | | | | Fix application layout form descriptionAndreas Kämmerle2018-10-301-2/+2
|/ / / / /
* | | | | Merge branch '50962-create-new-group-rename-form-fields-and-update-ui' into '...Mike Greiling2018-10-3011-57/+117
|\ \ \ \ \
| * | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-3011-57/+117
|/ / / / /
* | | | | Merge branch 'sh-fix-search-relative-urls' into 'master'Clement Ho2018-10-302-2/+7
|\ \ \ \ \
| * | | | | Fix search "all in GitLab" not working with relative URLssh-fix-search-relative-urlsStan Hu2018-10-282-2/+7
| |/ / / /
* | | | | Merge branch 'fl-missing-i18n' into 'master'Mike Greiling2018-10-307-15/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adds missing i18n to pipelines tablefl-missing-i18nFilipa Lacerda2018-10-307-15/+38
* | | | | Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-305-24/+111
|\ \ \ \ \
| * | | | | Runs prettier on changed files53227-empty-listFilipa Lacerda2018-10-301-1/+1
| * | | | | Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-305-24/+111
* | | | | | Merge branch 'tc-index-lfs-objects-file-store' into 'master'Douglas Barbosa Alexandre2018-10-305-21/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enhance performance of counting local LFS objectstc-index-lfs-objects-file-storeToon Claes2018-10-305-21/+25
| | |_|/ / | |/| | |
* | | | | Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'Filipa Lacerda2018-10-303-8/+13
|\ \ \ \ \
| * | | | | Add dynamic timer for delayed jobs in pipelines listwinh-pipeline-actions-dynamic-timerWinnie Hellmann2018-10-293-8/+13
* | | | | | Merge branch 'backport-ee-7203-sticky-logs-topbar' into 'master'Filipa Lacerda2018-10-303-74/+100
|\ \ \ \ \ \
| * | | | | | Backport ee 7203 sticky logs topbarSimon Knox2018-10-303-74/+100
|/ / / / / /
* | | | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-303-8/+5
|\ \ \ \ \ \
| * | | | | | Fixes diff discussions not being fully removedmr-diff-discussion-deletionPhil Hughes2018-10-303-8/+5
* | | | | | | Merge branch 'sh-fix-issue-53153' into 'master'Sean McGivern2018-10-303-1/+71
|\ \ \ \ \ \ \
| * | | | | | | Fix extra merge request versions created from forked merge requestssh-fix-issue-53153Stan Hu2018-10-293-1/+71