summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove un-needed code from file template mediator class65842-template-pickerpburdette2019-09-051-6/+0
|
* Remove choose template type and use filename inputpburdette2019-09-053-5/+3
| | | | | | Removed choose template type functionality and we now rely on the filename input value to determine what template dropdown will be used
* Move template selectors into editorpburdette2019-09-043-3/+1
|
* Fix merge conflicts in graph componentpburdette2019-09-040-0/+0
|\
| * Update append right with new valuesarahghp2019-05-041-1/+1
| |
| * Align ce/ee filessarahghp2019-05-032-4/+3
| |
| * Adds backport changesarahghp2019-04-251-0/+3
| |
* | Adds CE backport changepburdette2019-09-042-1/+11
| |
* | Update append right with new valuesarahghp2019-09-041-1/+1
| |
* | Align ce/ee filessarahghp2019-09-042-4/+3
| |
* | Adds backport changesarahghp2019-09-041-0/+3
| |
* | 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
* | | | | Merge branch 'force-https-source-in-yarn-lock' into 'master'Mike Greiling2019-09-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Always use HTTPS sources for NPM modules in yarn.lock See merge request gitlab-org/gitlab-ce!32245
| * | | | | Always use HTTPS sources for NPM modules in yarn.lockTakuya Noguchi2019-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28445 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch 'change-prioritized-labels-empty-state-message' into 'master'Mike Greiling2019-09-043-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change prioritized labels empty state message See merge request gitlab-org/gitlab-ce!32338
| * | | | | | Revert "DB change, migratoin and changelog"Lee Tickett2019-09-043-1/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | | | | Merge branch 'remove-vue-resource-from-group-service' into 'master'Paul Slaughter2019-09-045-27/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove vue resource from group service See merge request gitlab-org/gitlab-ce!32420
| * | | | | | Remove vue resource from group serviceLee Tickett2019-09-045-27/+26
|/ / / / / / | | | | | | | | | | | | | | | | | | Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/66750
* | | | | | Merge branch ↵Evan Read2019-09-041-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs-updates-database-review-merge-request-author-responsibility' into 'master' Update merge request author's responsibility on Database Review See merge request gitlab-org/gitlab-ce!32558
| * | | | | | Updates the merge request author responsibilityMayra Cabrera2019-09-041-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Indicate it's the author's responsibility to prepare the merge request for a database review
* | | | | | Merge branch 'docs/logs-database-load-balancing' into 'master'Evan Read2019-09-041-6/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from database load balancing docs Closes #66711 See merge request gitlab-org/gitlab-ce!32387
| * | | | | | Follow-up from database load balancing docsAchilleas Pipinellis2019-09-041-6/+7
|/ / / / / /
* | | | | | Merge branch 'patch-74' into 'master'Ray Paik2019-09-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update large repositories, remove duplicated text See merge request gitlab-org/gitlab-ce!32605
| * | | | | | Update large repositories, remove duplicated textTymoteusz Motylewski2019-09-031-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'revert-2f01437f' into 'master'Paul Slaughter2019-09-038-51/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'" See merge request gitlab-org/gitlab-ce!32620
| * | | | | | Revert "Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'"Mike Greiling2019-09-038-51/+61
| | |_|/ / / | |/| | | | | | | | | | This reverts merge request !32400
* | | | | | Merge branch 'je-add-cluster-domain-warning' into 'master'Mike Greiling2019-09-034-5/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cluster domain warning See merge request gitlab-org/gitlab-ce!32260
| * | | | | | Add cluster domain warningJacques Erasmus2019-09-034-5/+31
|/ / / / / / | | | | | | | | | | | | | | | | | | Added a cluster domain wanring if no domain is defined
* | | | | | Merge branch ↵Michael Kozono2019-09-031-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'add_docker_registry_replication_options_to_gitlab_yml_template' into 'master' Add Notification secret into gitlab.yml.template See merge request gitlab-org/gitlab-ce!32532
| * | | | | Add Notification secret into gitlab.yml.templateValery Sizov2019-09-031-0/+1
|/ / / / /
* | | | | Merge branch 'epic-events' into 'master'Thong Kuah2019-09-0311-3/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE] Create an event on epic actions See merge request gitlab-org/gitlab-ce!32257
View Lorry Controller Status