summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'12-1-auto-deploy-0010836Kamil Trzciński2019-06-223-3/+3
* Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'mas...Ash McKenzie2019-06-212-1/+11
* Merge branch 'sh-update-component-list-docs' into 'master'Evan Read2019-06-201-3/+3
* Merge branch 'sh-pipeline-typo-docs' into 'master'Marcia Ramos2019-06-191-1/+2
* Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-183-1/+49
* Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-187-10/+92
* Merge branch 'backport-report_approver-migration-to-ce' into 'master'Yorick Peterse2019-06-182-0/+14
* Merge branch 'gitaly-version-v1.47.0' into 'master'Yorick Peterse2019-06-182-1/+6
* Restore Jira tables in db/schema.rbYorick Peterse2019-06-171-0/+20
* Merge branch 'merge-schema-backport-to-auto-deploy' into '12-1-auto-deploy-00...Yorick Peterse2019-06-17108-3455/+4696
|\
| * Run CI migrations since 11.11.0Yorick Peterse2019-06-171-1/+1
| * Backport the EE schema and migrations to CEYorick Peterse2019-06-17105-3449/+4659
| * Allow custom names for concurrent foreign keysYorick Peterse2019-06-172-5/+36
|/
* Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-1745-71/+1556
* Merge branch 'patch-71' into 'master'Stan Hu2019-06-151-3/+3
|\
| * Fix broken hyperlink in reducing_the_repo_size_using_git.mdTom Forbes2019-06-151-3/+3
|/
* Merge branch 'pendo-poc' into 'master'Tim Zallmann2019-06-151-0/+1
|\
| * Backport: Pendo POC snippetDonald Cook2019-06-151-0/+1
|/
* Merge branch 'renovate/gitlab-ui-4.x' into 'master'Clement Ho2019-06-152-5/+5
|\
| * Update dependency @gitlab/ui to ^4.1.0null2019-06-142-5/+5
|/
* Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' in...Fatih Acet2019-06-143-23/+38
|\
| * Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctlySam Bigelow2019-06-123-23/+38
* | Merge branch '62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicorn' int...Stan Hu2019-06-142-0/+2
|\ \
| * | Apply suggestion to scripts/review_apps/review-apps.sh62149-ci-review-apps-change-pullpolicy-sidekiq-and-unicornRémy Coutable2019-06-121-1/+1
| * | Pass FORCE_RAILS_IMAGE_BUILDS=true to the CNG triggered pipelineRémy Coutable2019-06-121-0/+1
| * | [Review Apps] Set `global.imagePullPolicy: Always`Rémy Coutable2019-06-121-0/+1
* | | Merge branch 'ac-fix-graphql-project-stats' into 'master'Stan Hu2019-06-145-3/+93
|\ \ \
| * | | Do not blindly expose public project statisticsMayra Cabrera2019-06-145-3/+93
|/ / /
* | | Merge branch 'bvl-comments-graphql' into 'master'Jan Provaznik2019-06-1427-12/+469
|\ \ \
| * | | Expose comments on Noteables in GraphQLBob Van Landuyt2019-06-1427-12/+469
* | | | Merge branch 'leipert-default-image-node-12' into 'master'Mike Greiling2019-06-141-1/+1
|\ \ \ \
| * | | | Update default CI image to use node@12Lukas 'Eipi' Eipert2019-06-141-1/+1
* | | | | Merge branch '12173-renumber-user-callout-enum' into 'master'Kamil Trzciński2019-06-141-1/+4
|\ \ \ \ \
| * | | | | Renumber a new UserCallout enum for EE compatibility12173-renumber-user-callout-enumNick Thomas2019-06-141-1/+4
* | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Mike Greiling2019-06-142-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update dependency @gitlab/svgs to ^1.65.0Lukas 'Eipi' Eipert2019-06-142-5/+5
| |/ / / /
* | | | | Merge branch '4354-lock-memberships-to-ldap-sync-part-1' into 'master'Stan Hu2019-06-143-0/+30
|\ \ \ \ \
| * | | | | EE port: add app-wide LDAP membership lock field4354-lock-memberships-to-ldap-sync-part-1Pavel Shutsin2019-06-133-0/+30
* | | | | | Merge branch 'ee-12033-doc-lm-python-version-docs' into 'master'Achilleas Pipinellis2019-06-141-0/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Document CI variable LM_PYTHON_VERSIONFabien Catteau2019-06-141-0/+17
|/ / / / /
* | | | | Merge branch 'caneldem-master-patch-02411' into 'master'Achilleas Pipinellis2019-06-141-8/+8
|\ \ \ \ \
| * | | | | Add which tools is used by License Management projectCan Eldem2019-06-141-8/+8
|/ / / / /
* | | | | Merge branch 'docs/link-to-default-helm-chart' into 'master'Achilleas Pipinellis2019-06-141-1/+2
|\ \ \ \ \
| * | | | | Add link to default Helm chartEvan Read2019-06-141-1/+2
|/ / / / /
* | | | | Merge branch 'docs/admin-area-doc-structure' into 'master'Achilleas Pipinellis2019-06-141-30/+34
|\ \ \ \ \
| * | | | | Add structure to admin area pageEvan Read2019-06-141-30/+34
|/ / / / /
* | | | | Merge branch 'renovate/gitlab-eslint-plugin-i18n-1.x' into 'master'Mike Greiling2019-06-142-2/+2
|\ \ \ \ \
| * | | | | Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0renovate/gitlab-eslint-plugin-i18n-1.xLukas 'Eipi' Eipert2019-06-132-2/+2
* | | | | | Merge branch 'docs/cross-link-mr-approve' into 'master'Achilleas Pipinellis2019-06-141-1/+4
|\ \ \ \ \ \
| * | | | | | Cross link to MR approvals docsEvan Read2019-06-141-1/+4
|/ / / / / /