summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport approval MR rules report_type migration to CEbackport-report_approver-migration-to-ceLucas Charles2019-06-172-0/+14
* Merge branch 'mj/remove-old-password' into 'master'Marin Jankovski2019-06-171-3/+0
|\
| * Remove no longer valid passwordmj/remove-old-passwordMarin Jankovski2019-06-171-3/+0
* | Merge branch 'backport-schema-changes' into 'master'Robert Speicher2019-06-17108-3455/+4716
|\ \
| * | Run CI migrations since 11.11.0Yorick Peterse2019-06-171-1/+1
| * | Backport the EE schema and migrations to CEYorick Peterse2019-06-17105-3449/+4679
| * | Allow custom names for concurrent foreign keysYorick Peterse2019-06-172-5/+36
* | | Merge branch 'ce-11981-show-merge-train-position' into 'master'Filipa Lacerda2019-06-172-1/+13
|\ \ \
| * | | Add merge train position message (CE)Nathan Friend2019-06-172-1/+13
* | | | Merge branch 'patch-29' into 'master'Nick Thomas2019-06-171-1/+1
|\ \ \ \
| * | | | [skip ci] Update doorkeeper.en.ymlPierre Tardy2019-06-171-1/+1
| * | | | read_repository scope can be used for APIPierre Tardy2019-06-141-1/+1
* | | | | Merge branch 'jej/prototype-ip-enforcement-per-group' into 'master'Douwe Maan2019-06-173-0/+28
|\ \ \ \ \
| * | | | | CE port of IP address restriction for groupsImre Farkas2019-06-173-0/+28
|/ / / / /
* | | | | Merge branch 'docs-qa-ml-fix-list-rendering' into 'master'Rémy Coutable2019-06-171-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix list rendering on docs sitedocs-qa-ml-fix-list-renderingMark Lapierre2019-06-171-0/+1
* | | | | Merge branch '58886-issue-tracker-fields' into 'master'Sean McGivern2019-06-1713-0/+246
|\ \ \ \ \
| * | | | | Create models for issue trackers data58886-issue-tracker-fieldsJarka Košanová2019-06-1313-0/+246
* | | | | | Merge branch 'docs-ide-file-sync' into 'master'Marcia Ramos2019-06-172-0/+59
|\ \ \ \ \ \
| * | | | | | Docs for Web IDE file syncPaul Slaughter2019-06-172-0/+59
|/ / / / / /
* | | | | | Merge branch 'docs-merge-trains' into 'master'Marcia Ramos2019-06-175-2/+71
|\ \ \ \ \ \
| * | | | | | Docs for Merge Trainsdocs-merge-trainsShinya Maeda2019-06-175-2/+71
* | | | | | | Merge branch 'issue-58747' into 'master'Nick Thomas2019-06-173-8/+99
|\ \ \ \ \ \ \
| * | | | | | | Fix GPG signature verification with recent versions of GnuPGDavid Palubin2019-06-173-8/+99
|/ / / / / / /
* | | | | | | Merge branch '30138-display-cycle-analytics-issue-logic-fixes' into 'master'James Lopez2019-06-1732-164/+379
|\ \ \ \ \ \ \
| * | | | | | | Fix plan stage queryGosia Ksionek2019-06-1732-164/+379
|/ / / / / / /
* | | | | | | Merge branch '9490-record-repository_type-on-lfs_objects_projects-ce' into 'm...Grzegorz Bizon2019-06-1714-15/+140
|\ \ \ \ \ \ \
| * | | | | | | CE backport for changes in EE MR 138949490-record-repository_type-on-lfs_objects_projects-ceLuke Duncalfe2019-06-1714-15/+140
* | | | | | | | Merge branch 'error-pipelines-for-blocked-users' into 'master'Grzegorz Bizon2019-06-1720-45/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | preventing blocked users and their PipelineSchdules from creating new Pipelinesdrew cimino2019-06-0420-45/+106
* | | | | | | | | Merge branch 'docs/turn-single-line-code-into-blocks' into 'master'62873-add-simplest-happy-path-end-to-end-test-of-monitor-featureSanad Liaquat2019-06-171-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Turn single line code into blocksWalmyr2019-06-171-3/+15
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-1745-71/+1556
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New translations from CrowdinLuke Bennett2019-06-1745-71/+1556
|/ / / / / / / / /
* | | | | | | | | Merge branch 'container-registry-api-perms-58271' into 'master'Kamil Trzciński2019-06-176-10/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-176-10/+12
|/ / / / / / / / /
* | | | | | | | | Merge branch '35428-docker-registry-date-not-accurate' into 'master'Filipa Lacerda2019-06-173-4/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Docker registry date not accurate"Nick Kipling2019-06-173-4/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ...Filipa Lacerda2019-06-171-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backportScott Hampton2019-06-131-0/+2
* | | | | | | | | | Merge branch 'boolean-values-from-matches-operator' into 'master'Kamil Trzciński2019-06-173-59/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return boolean from Lexeme::Matches#evaluateboolean-values-from-matches-operatordrew cimino2019-06-143-59/+28
* | | | | | | | | | | Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-175-1/+79
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-145-1/+79
* | | | | | | | | | | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-1725-150/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-1425-150/+54
* | | | | | | | | | | | Merge branch '62910-task-completion-status-gql-pderichs' into 'master'Sean McGivern2019-06-176-1/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add task count and completed count to graphql types62910-task-completion-status-gql-pderichsPatrick Derichs2019-06-156-1/+81
* | | | | | | | | | | | Merge branch 'sh-clean-query-recorder-backtrace' into 'master'Sean McGivern2019-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clean QueryRecorder backtracesh-clean-query-recorder-backtraceStan Hu2019-06-141-1/+1