summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'je-add-group-deployments-page-fe' into 'master'Mike Greiling2019-09-047-30/+127
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see project deployments at cluster level (FE) See merge request gitlab-org/gitlab-ce!31575
| * | | | | | | | Add ability see deployments using a group clusterJacques Erasmus2019-09-047-30/+127
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to see project deployments using a group cluster
* | | | | | | | Merge branch 'issue_54042' into 'master'Michael Kozono2019-09-0414-6/+168
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let project reporters create issue from group boards Closes #54042 See merge request gitlab-org/gitlab-ce!29866
| * | | | | | | | Let project reporters create issue from group boardsFelipe Artur2019-09-0414-6/+168
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current state of group issue boards does not show the "Add issues" button on the UI for users that are reporters of group child projects.
* | | | | | | | Merge branch ↵Michael Kozono2019-09-049-1/+344
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-2' into 'master' Add service to transfer Group Milestones when transferring a Project See merge request gitlab-org/gitlab-ce!31778
| * | | | | | | | Add service to transfer group milestonesEugenia Grieff2019-09-049-1/+344
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new service that transfers milestones from a group to a project - Include new service in Projects transfer service - Include FromUnion module in Milestone model to use in transfer service - Add specs for new milestones service - Add specs for transferring milestones in project transfer service
* | | | | | | | Merge branch 'fix-smime-settings-require' into 'master'Rémy Coutable2019-09-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use spec_helper for S/MIME settings specs See merge request gitlab-org/gitlab-ce!32647
| * | | | | | | | Use spec_helper for S/MIME settings specsfix-smime-settings-requireYorick Peterse2019-09-041-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constant tested is defined in an initializer, and these are not loaded when using fast_spec_helper. When running just this test file, or when running this test first this can lead to test failures. To fix this we just use spec_helper instead of fast_spec_helper.
* | | | | | | | Merge branch 'docs-sethgitlab-dast' into 'master'Achilleas Pipinellis2019-09-041-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarified website url precedence See merge request gitlab-org/gitlab-ce!32599
| * | | | | | | | Clarified website url precedenceSeth Berger2019-09-041-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-fixes-scheduling-on-background-migrations' into 'master'66922Achilleas Pipinellis2019-09-041-6/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up "Scheduling" section on Background Migrations See merge request gitlab-org/gitlab-ce!32557
| * | | | | | | | Removes regular migrations from background onesMayra Cabrera2019-09-041-6/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifies that background migrations should be scheduled as post deployment migrations
* | | | | | | | Merge branch 'docs-sethgitlab-dast-ssot' into 'master'Achilleas Pipinellis2019-09-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed reference to project for DAST See merge request gitlab-org/gitlab-ce!32601
| * | | | | | | | Removed reference to project for DASTSeth Berger2019-09-041-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'osw-record-repo-push-events' into 'master'James Lopez2019-09-043-4/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE "Track repository pushes as audit events" See merge request gitlab-org/gitlab-ce!32304
| * | | | | | | | Backport "Track repository pushes as audit events"Oswaldo Ferreira2019-09-043-4/+17
| | | | | | | | |
* | | | | | | | | Merge branch 'remove-unnecessary-freeze-in-app-services' into 'master'Rémy Coutable2019-09-0411-14/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/services See merge request gitlab-org/gitlab-ce!32635
| * | | | | | | | | Avoid calling freeze on already frozen strings in app/servicesdineshpanda2019-09-0411-14/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ce-14713-fix-geo-link-pointing-to-online-doc' into 'master'Douglas Barbosa Alexandre2019-09-041-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the 'Repository Storage Types' doc page See merge request gitlab-org/gitlab-ce!32650
| * | | | | | | | | Add a link to the 'Repository Storage Types' doc pagece-14713-fix-geo-link-pointing-to-online-docRémy Coutable2019-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'winh-issue-get-epic_iid' into 'master'Dmitriy Zaporozhets2019-09-042-1/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose epic_iid in issues API (CE-backport) See merge request gitlab-org/gitlab-ce!32544
| * | | | | | | | | | Add epic_iid to issue API entityWinnie Hellmann2019-09-042-1/+16
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 0bf7fecdee5a200eeb4f27b4888a57ceee63bde9)
* | | | | | | | | | Merge branch 'winh-service-desk-config-requirement' into 'master'Sean McGivern2019-09-041-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note to gitlab.yml about Service Desk requirement See merge request gitlab-org/gitlab-ce!32651
| * | | | | | | | | | Add note to gitlab.yml about Service Desk requirementWinnie Hellmann2019-09-041-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '66454-base-components' into 'master'Kushal Pandya2019-09-047-0/+303
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates base components for new job log See merge request gitlab-org/gitlab-ce!32543
| * | | | | | | | | | Creates base components for new job logFilipa Lacerda2019-09-047-0/+303
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a link component, a line component and a clickable line component to handle the new job log format
* | | | | | | | | | Merge branch 'persist-needs-error' into 'master'Grzegorz Bizon2019-09-044-6/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist `needs:` validation as config error See merge request gitlab-org/gitlab-ce!32648
| * | | | | | | | | | Persist `needs:` validation as config errorpersist-needs-errorKamil Trzciński2019-09-044-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case when `needs:` is missing, but when requested by service, we would not save the pipeline with config_error. This makes it explicit that we want to persist the error as `config_error` failure reason.
* | | | | | | | | | | Merge branch 'pb-update-gitlab-shell-10-0-0' into 'master'Nick Thomas2019-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to v10.0.0 See merge request gitlab-org/gitlab-ce!32645
| * | | | | | | | | | Update gitlab-shell to v10.0.0pb-update-gitlab-shell-10-0-0Patrick Bajao2019-09-041-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'renovate/gitlab-packages' into 'master'Clement Ho2019-09-042-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to v5.21.0 See merge request gitlab-org/gitlab-ce!32632
| * | | | | | | | | Update dependency @gitlab/ui to v5.21.0Lukas Eipert2019-09-042-5/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'mk/fix-comment' into 'master'Dmitriy Zaporozhets2019-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix outdated comment See merge request gitlab-org/gitlab-ce!32598
| * | | | | | | | | Fix outdated commentmk/fix-commentMichael Kozono2019-09-031-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '12079-productivity-analytics-part-1' into 'master'James Lopez2019-09-045-4/+93
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes for productivity analytics. See merge request gitlab-org/gitlab-ce!32575
| * | | | | | | | | Backport EE changes for productivity analyticsPavel Shutsin2019-09-045-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve diff lines count efficiency
* | | | | | | | | | Merge branch '66428-make-review-app-deployment-use-wait' into 'master'Rémy Coutable2019-09-042-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Review App deployment use `--wait` instead of `--atomic` for better debugging Closes #66428 See merge request gitlab-org/gitlab-ce!32223
| * | | | | | | | | | Switch back to the '--wait' flag for the 'helm upgrade' command66428-make-review-app-deployment-use-waitRémy Coutable2019-09-032-4/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'robust-download-chart' into 'master'Rémy Coutable2019-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make download_chart function robust for its own Review App See merge request gitlab-org/gitlab-ce!32595
| * | | | | | | | | Make download_chart function robust for its own Review AppTakuya Noguchi2019-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | Merge branch '61927-internal-api-jwt-auth' into 'master'Kamil Trzciński2019-09-044-77/+137
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract Workhorse <-> GitLab JWT authentication to make it reusable See merge request gitlab-org/gitlab-ce!32623
| * | | | | | | | | | Extract Workhorse <-> GitLab authentication to make it reusable61927-internal-api-jwt-authKrasimir Angelov2019-09-044-77/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce JWTAutheticatable module that can be reused for ai=uthtication between Pages and GitLab (the same way we use do now for Workhorse). Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
* | | | | | | | | | | Merge branch '61927-internal-api-namespace' into 'master'Kamil Trzciński2019-09-045-297/+299
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename API::Internal class to API::Internal::Base See merge request gitlab-org/gitlab-ce!32617
| * | | | | | | | | | | Rename API::Internal class to API::Internal::Base61927-internal-api-namespaceKrasimir Angelov2019-09-045-297/+299
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that we can use API::Internal namespace. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927.
* | | | | | | | | | | Merge branch 'fix-doc-qa-pipeline' into 'master'Rémy Coutable2019-09-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs exception back to qa manual job See merge request gitlab-org/gitlab-ce!32631
| * | | | | | | | | | | Add docs exception back to qa manual jobMarcel Amirault2019-09-041-0/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'winh-ci-remove-jsdoc' into 'master'Mike Greiling2019-09-042-21/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jsdoc job See merge request gitlab-org/gitlab-ce!32465
| * | | | | | | | | | Remove jsdoc jobWinnie Hellmann2019-09-042-21/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/scoped-environment-variables-in-core' into 'master'Evan Read2019-09-044-7/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Expected Pricing for 'Environment-specific variables' feature See merge request gitlab-org/gitlab-ce!32433
| * | | | | | | | | | Removing 'Premium' label in block titleNicolas Borderes2019-09-044-7/+8
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added when it has been moved to core