summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * Create an event on epic actionsJan Provaznik2019-09-0311-3/+33
|/ | | | | Creates new event when an epic is created, closed, reopened or commented.
* Merge branch 'fix-performance-bar-thresholds' into 'master'Stan Hu2019-09-032-9/+9
|\ | | | | | | | | Fix performance bar thresholds See merge request gitlab-org/gitlab-ce!32587
| * Fix performance bar thresholdsfix-performance-bar-thresholdsSean McGivern2019-09-032-9/+9
| | | | | | | | | | These were written in seconds but are supposed to be in milliseconds. The total Gitaly time was wrong for the same reason.
* | Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'Mike Greiling2019-09-038-61/+51
|\ \ | | | | | | | | | | | | Remove vue resource from sidebar service See merge request gitlab-org/gitlab-ce!32400
| * | Revert "DB change, migratoin and changelog"Lee Tickett2019-09-038-61/+51
|/ / | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | Merge branch '66464-typo-in-release_endpoint_requiremets-constant' into 'master'Michael Kozono2019-09-032-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Typo in RELEASE_ENDPOINT_REQUIREMETS constant" Closes #66464 See merge request gitlab-org/gitlab-ce!32468
| * | Correct typo in constant66464-typo-in-release_endpoint_requiremets-constantSean Carroll2019-09-022-6/+6
| | |
* | | Merge branch 'remove-vue-resource-from-issue' into 'master'Clement Ho2019-09-033-5/+10
|\ \ \ | | | | | | | | | | | | | | | | Remove vue resource from issue See merge request gitlab-org/gitlab-ce!32421
| * | | Revert "DB change, migratoin and changelog"Lee Tickett2019-09-033-5/+10
|/ / / | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | Merge branch '13988-add-rails-helpers' into 'master'Stan Hu2019-09-033-7/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add new RailsHelpers module for specs Closes #66688 See merge request gitlab-org/gitlab-ce!32309
| * | | Use new RailsHelpers module13988-add-rails-helpersAsh McKenzie2019-08-282-7/+9
| | | |
| * | | Add new RailsHelpers module for specsAsh McKenzie2019-08-281-0/+7
| | | |
* | | | Merge branch 'fixes-broken-master-on-anonymous-session' into 'master'Rémy Coutable2019-09-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses spec_helper instead of rails_helper Closes #66952 See merge request gitlab-org/gitlab-ce!32594
| * | | | Uses spec_helper instead of rails_helperMayra Cabrera2019-09-031-1/+1
|/ / / / | | | | | | | | | | | | | | | | spec/rails_helper.rb was removed on 1068ec2e9201af3de1fc5ebe9c8d9f7953c89b51
* | | | Merge branch 'docs/edit-rules-docs' into 'master'Achilleas Pipinellis2019-09-031-33/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Edit to new rules documentation See merge request gitlab-org/gitlab-ce!32244
| * | | | Edit to new rules documentationEvan Read2019-09-031-33/+59
|/ / / /
* | | | Merge branch 'docs-development_add_new_prometheus_metrics' into 'master'Achilleas Pipinellis2019-09-031-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Development docs: how to add Prometheus metrics See merge request gitlab-org/gitlab-ce!32306
| * | | | Development docs: how to add Prometheus metricsThong Kuah2019-09-031-0/+23
|/ / / / | | | | | | | | | | | | | | | | This documents the various knowledge needed to add new GitLab self-monitoring Prometheus metrics.
* | | | Merge branch 'ogolowinski-master-patch-72109' into 'master'Marcia Ramos2019-09-031-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated Feature flags doc See merge request gitlab-org/gitlab-ce!32578
| * | | | Updated Feature flags docOrit Golowinski2019-09-031-4/+0
|/ / / /
* | | | Merge branch 'qa-remove-unneeded-only-extend' into 'master'Lin Jen-Shin2019-09-032-15/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes two bugs with the `package-and-qa-manual:master` and `build-qa-image` jobs See merge request gitlab-org/gitlab-ce!32584
| * | | | Remove a useless '.except-docs-qa' extension in 'package-and-qa-manual'qa-remove-unneeded-only-extendRémy Coutable2019-09-032-15/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'winh-yarn-integrity-check-output' into 'master'Kushal Pandya2019-09-032-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve output for yarn integrity check See merge request gitlab-org/gitlab-ce!32569
| * | | | | Improve output for yarn integrity checkWinnie Hellmann2019-09-032-1/+12
|/ / / / /
* | | | | Merge branch '62591-fix-milestone-due-date-today-wording' into 'master'Nick Thomas2019-09-033-5/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording on milestone due date today Closes #62591 See merge request gitlab-org/gitlab-ce!32096
| * | | | | Fix wording on milestone due date today62591-fix-milestone-due-date-today-wordingAlexandru Croitor2019-09-033-5/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | Fix wording on milestone due date, to show today instead of hours ago or remaining, when milestone is due today.
* | | | | Merge branch '66741-remove-spec-rails_helper-rb' into 'master'Grzegorz Bizon2019-09-03242-244/+240
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove spec/rails_helper.rb Closes #66741 See merge request gitlab-org/gitlab-ce!32380
| * | | | | Replace rails_helper.rb with spec_helper.rb66741-remove-spec-rails_helper-rbAsh McKenzie2019-08-30242-244/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails_helper.rb's only logic was to require spec_helper.rb.
* | | | | | Merge branch '65509-improve-gc-report-buckets-granularity' into 'master'Kamil Trzciński2019-09-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GC_REPORT_BUCKETS granularity See merge request gitlab-org/gitlab-ce!32586
| * | | | | | Improve GC_REPORT_BUCKETS granularity65509-improve-gc-report-buckets-granularityAleksei Lipniagov2019-09-031-1/+1
| | | | | | |
* | | | | | | Merge branch 'winh-dev-incoming_email-check' into 'master'Sean McGivern2019-09-032-27/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated mail_room check See merge request gitlab-org/gitlab-ce!32588
| * | | | | | | Remove outdated mail_room checkWinnie Hellmann2019-09-032-27/+0
|/ / / / / / /
* | | | | | | Merge branch 'docs/clarify-needs-limits' into 'master'Achilleas Pipinellis2019-09-031-25/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify limits for needs keyword See merge request gitlab-org/gitlab-ce!32444
| * | | | | | | Clarify limits for needs keywordEvan Read2019-09-031-25/+22
|/ / / / / / /
* | | | | | | Merge branch 'ab-routable-nplus1' into 'master'Stan Hu2019-09-034-3/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload routes information in Routable See merge request gitlab-org/gitlab-ce!32352
| * | | | | | | Preload routes informationab-routable-nplus1Andreas Brandl2019-09-034-3/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a high frequency N+1 issue: `RoutableActions#find_routable!` is used across many controllers to retrieve e.g. the Project or Namespace by path. The `#find_routable!` method calls `#ensure_canonical_path` which in turn retrieves `#full_path` from the given Routable. This in turn triggers a lookup on `routes`, leading to a high frequency of these queries: ```sql SELECT "routes".* FROM "routes" WHERE "routes"."source_id" = $1 AND "routes"."source_type" = $2 LIMIT $3 ``` This is unnecessary as we already join `routes` in `Routable#find_by_full_path` anyways.
* | | | | | | Merge branch 'mc/feature/downstream-pipeline-tracking-ce' into 'master'Kamil Trzciński2019-09-031-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport documentation for status checking behaviors See merge request gitlab-org/gitlab-ce!32184
| * | | | | | | Backport documentation from EEmc/feature/downstream-pipeline-tracking-ceMatija Čupić2019-09-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport documentation from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15580
* | | | | | | | Merge branch '66454-utils-parser' into 'master'Kushal Pandya2019-09-033-0/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates utility parser for the job log See merge request gitlab-org/gitlab-ce!32555
| * | | | | | | | Creates utils for the job log66454-utils-parserFilipa Lacerda2019-09-033-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new job log json format we need a parser on the frontend
* | | | | | | | | Merge branch 'mh/jest-fail-unmocked-requests' into 'master'Kushal Pandya2019-09-034-8/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Make unmocked requests fail in Jest again See merge request gitlab-org/gitlab-ce!31863
| * | | | | | | | Fix test false passes on unmocked requestsmh/jest-fail-unmocked-requestsMartin Hanzel2019-08-304-8/+21
| | | | | | | | |
* | | | | | | | | Merge branch 'ab-remove-support-bot-column' into 'master'Yorick Peterse2019-09-033-1/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Users.support_bot column See merge request gitlab-org/gitlab-ce!32554
| * | | | | | | | | Remove Users.support_bot columnab-remove-support-bot-columnAndreas Brandl2019-09-023-1/+25
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column is not present in `db/schema.rb` and hence needs to be removed conditionally. See https://gitlab.com/gitlab-org/gitlab-ce/issues/66901 for background
* | | | | | | | | Merge branch 'clusterable_cluster_environments_path' into 'master'Jan Provaznik2019-09-032-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #environments_cluster_path which will always return nil in CE See merge request gitlab-org/gitlab-ce!32527
| * | | | | | | | | Add facade which will always return nil in CEclusterable_cluster_environments_pathThong Kuah2019-09-032-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method will be overridden in EE
* | | | | | | | | | Merge branch 'create-build-qa-image-for-all-pipelines' into 'master'Lin Jen-Shin2019-09-032-8/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure 'build-qa-image' is created for all pipelines See merge request gitlab-org/gitlab-ce!32570
| * | | | | | | | | Introduce a new 'package-and-qa-manual:master' jobRémy Coutable2019-09-031-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because in `master`, the `gitlab:assets:compile` is created, but not the `gitlab:assets:compile pull-cache` job, and the `needs` keyword cannot take jobs that don't exist, thus we have to create a dedicated job for `master`, with `needs: ["build-qa-image", "gitlab:assets:compile"]` instead of `needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]`. Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status