summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Ensure 'build-qa-image' is created for all pipelines except docs & qacreate-build-qa-image-for-all-pipelinesRémy Coutable2019-09-032-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes 'package-and-qa-manual' created for 'master' because it's a valid use-case to run manual QA on 'master'. Without this change, no pipeline could be created for auto-deploy branches due to the following error: The form contains the following error: package-and-qa-manual: needs 'build-qa-image' Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'fix-cycle-analytics-seeds' into 'master'Thong Kuah2019-09-031-2/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cycle analytics seed script See merge request gitlab-org/gitlab-ce!32536
| * | | | | | | | | | Fix cycle analytics seed scriptAdam Hegyi2019-09-031-2/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'winh-quarantine-dashboard_spec' into 'master'Tim Zallmann2019-09-031-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine flaky dashboard_spec.js See merge request gitlab-org/gitlab-ce!32574
| * | | | | | | | | | Quarantine flaky dashboard_spec.jswinh-quarantine-dashboard_specWinnie Hellmann2019-09-031-1/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '62402-milestone-release-be' into 'master'Andreas Brandl2019-09-0322-21/+385
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Allow milestones to be associated with releases" BE See merge request gitlab-org/gitlab-ce!30816
| * | | | | | | | | | | Added relationships between Release and MilestoneEtienne Baqué2019-09-0322-21/+385
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified schema via migrations. Added one-to-one relationship between the two models. Added changelog file
* | | | | | | | | | | Merge branch 'db/prometheus-metrics-not-null-constraints' into 'master'Andreas Brandl2019-09-032-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add not null constraints to prometheus_metrics table columns Closes #66663 See merge request gitlab-org/gitlab-ce!32339
| * | | | | | | | | | | Add not null constraints to prometheus_metrics table columnsArun Kumar Mohan2019-09-022-2/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'links-use-new-location' into 'master'Rémy Coutable2019-09-037-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new location for helm charts repo See merge request gitlab-org/gitlab-ce!32563
| * | | | | | | | | | | | Use new location for helm charts repolinks-use-new-locationBalasankar "Balu" C2019-09-037-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | | | | | Merge branch 'add-pipeline-type-key-in-pipeline-entity' into 'master'Kamil Trzciński2019-09-0310-6/+204
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose `name` and `merge_request_event_type` in serialized json and predefined variables See merge request gitlab-org/gitlab-ce!32323
| * | | | | | | | | | | | | Add pipeline.type key to PipelineEntityadd-pipeline-type-key-in-pipeline-entityShinya Maeda2019-09-0310-6/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds pipeline.type key to PipelineEntity. This key will be used in MR widget in the next iteration.
* | | | | | | | | | | | | | Merge branch 'id-skip-setting-repo-refs' into 'master'Lin Jen-Shin2019-09-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip set_repo_refs to speed up the tests See merge request gitlab-org/gitlab-ce!32556
| * | | | | | | | | | | | | | Skip set_repo_refs to speed up the testsIgor2019-09-031-1/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '36765-flash-notification' into 'master'Kushal Pandya2019-09-0376-1286/+1200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make error flash notification sticky See merge request gitlab-org/gitlab-ce!30141
| * | | | | | | | | | | | | Make flash notifications stickyFatih Acet2019-09-0376-1286/+1200
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also unifies layout structure and remove no_container flag
* | | | | | | | | | | | | Merge branch 'change-role-system-hook' into 'master'Rémy Coutable2019-09-036-3/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system hooks for project/group membership updates Closes gitlab-ee#12252 See merge request gitlab-org/gitlab-ce!32371
| * | | | | | | | | | | | Add system hooks for project/group membership updatesBrandon Williams2019-09-026-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating group and project members, new system hooks `user_update_for_group` and `user_update_for_team` will be executed. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/12252
* | | | | | | | | | | | | Merge branch 'ce-12996-cancel-redundant-pipelines' into 'master'Lin Jen-Shin2019-09-032-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport retries options for cancel_running See merge request gitlab-org/gitlab-ce!32525
| * | | | | | | | | | | | Backport EE issue 12996ce-12996-cancel-redundant-pipelinesSean Carroll2019-09-022-5/+6
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bump-reliable-fetcher' into 'master'Stan Hu2019-09-032-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump reliable fetcher See merge request gitlab-org/gitlab-ce!32565
| * | | | | | | | | | | | Bump reliable fetcherValery Sizov2019-09-032-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'id-project-for-in-tests' into 'master'Lin Jen-Shin2019-09-034-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub DetectRepositoryLanguagesWorker for all tests See merge request gitlab-org/gitlab-ce!32430
| * | | | | | | | | | | | | Stub DetectRepositoryLanguagesWorker for all testsIgor2019-09-034-1/+13
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It performs an expensive operation, but isn't required in most of tests
* | | | | | | | | | | | | Merge branch '51372-remove-milestone-tabs-deprecation-message' into 'master'Kushal Pandya2019-09-034-20/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecation message for milestone tabs See merge request gitlab-org/gitlab-ce!32252
| * | | | | | | | | | | | Remove deprecation message for milestone tabs51372-remove-milestone-tabs-deprecation-messageHeinrich Lee Yu2019-09-034-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're reversing the deprecation due to user feedback
* | | | | | | | | | | | | Merge branch 'an-use-labkit-correlation-id' into 'master'Ash McKenzie2019-09-033-42/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all references to Gitlab::CorrelationId See merge request gitlab-org/gitlab-ce!32228
| * | | | | | | | | | | | Remove all references to Gitlab::CorrelationIdan-use-labkit-correlation-idAndrew Newdigate2019-08-263-42/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class has been replaced with Labkit::Correlation::CorrelationId
* | | | | | | | | | | | | Merge branch '40096-allow-ci-token-to-delete-from-registry' into 'master'Thong Kuah2019-09-035-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user can push to docker then it can delete too Closes #40096 See merge request gitlab-org/gitlab-ce!31796
| * | | | | | | | | | | | If user can push to docker then it can delete tooGiorgenes Gelatti2019-09-035-9/+24
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the permission of $CI_REGISTRY_USER to allow them to delete tags in addition to just pushing. https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
* | | | | | | | | | | | Merge branch 'docs-quick-actions-followup-2' into 'master'Evan Read2019-09-031-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make badging less confusing in quick actions doc Closes #66886 See merge request gitlab-org/gitlab-ce!32515
| * | | | | | | | | | | | Make badging less confusing in quick actions docMarcel Amirault2019-09-031-2/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-using-docker-build-1' into 'master'Evan Read2019-09-031-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add suggested changes to docker build doc Closes #66802 See merge request gitlab-org/gitlab-ce!32442
| * | | | | | | | | | | | Add suggested changes to docker build docMarcel Amirault2019-09-031-3/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '58192-add-danger-bot-development-docs' into 'master'Evan Read2019-09-033-1/+118
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Danger bot development documentation Closes #58192 See merge request gitlab-org/gitlab-ce!32506
| * | | | | | | | | | | | Add Danger bot development documentationNick Thomas2019-09-033-1/+118
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is overdue, and some of the suggestions are embarrassing, but this is how we actually develop Danger today.
* | | | | | | | | | | | Merge branch '66393-proposal-remove-area-chart-in-favor-of-time-series' into ↵66914-security-dashboard-component-replace-main-tag-with-article-tagTim Zallmann2019-09-022-569/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove area chart in favor of time series Closes #66393 See merge request gitlab-org/gitlab-ce!32129
| * | | | | | | | | | | Remove area.vue component66393-proposal-remove-area-chart-in-favor-of-time-seriesMiguel Rincon2019-08-242-569/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cluster-form-ca-cert-larger' into 'master'Tim Zallmann2019-09-023-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand textarea for CA cert in cluster form See merge request gitlab-org/gitlab-ce!32508
| * | | | | | | | | | | | Expand textarea for CA cert in cluster formcluster-form-ca-cert-largerThong Kuah2019-09-023-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current default is too small for a user to see what they have pasted in.
* | | | | | | | | | | | | Merge branch 'add-notification-reason-to-note-emails' into 'master'Mayra Cabrera2019-09-024-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add X-GitLab-NotificationReason header to note emails See merge request gitlab-org/gitlab-ce!32422
| * | | | | | | | | | | | | Add X-GitLab-NotificationReason header to note emailsadd-notification-reason-to-note-emailsSean McGivern2019-09-024-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'assigned' reason doesn't apply to notes, but the other two can ('mentioned' and 'own_activity'), so we can still use this for note emails.
* | | | | | | | | | | | | | Merge branch 'qa-add-built-in-project-template-test-ce' into 'master'Walmyr Lima e Silva Filho2019-09-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes for built-in project template test See merge request gitlab-org/gitlab-ce!32358
| * | | | | | | | | | | | | | Backport EE changes for built-in project template testqa-add-built-in-project-template-test-ceDesiree Chevalier2019-08-302-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'pl-project-service-filename-lineo' into 'master'Lin Jen-Shin2019-09-022-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide filename and line number for `class_eval` See merge request gitlab-org/gitlab-ce!32500
| * | | | | | | | | | | | | | Provide filename and line number for `class_eval`Peter Leitzen2019-09-022-9/+4
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes one RuboCop offense from its todo file.
* | | | | | | | | | | | | | Merge branch 'patch-74' into 'master'Achilleas Pipinellis2019-09-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clarify config value true is a string See merge request gitlab-org/gitlab-ce!32209
| * | | | | | | | | | | | | | Update `true` with `"true"`yonatan miller2019-09-021-2/+2
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab CI Linter otherwise gives error `variables config should be a hash value of key value pairs`
* | | | | | | | | | | | | | Merge branch 'sh-suppress-diverging-count-commits-request' into 'master'Filipa Lacerda2019-09-023-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip requesting diverging commit counts if no branches are listed See merge request gitlab-org/gitlab-ce!32496