summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cross link default branch docs to issue closing pattern docsdocs/cross-link-default-branchAchilleas Pipinellis2017-11-221-2/+3
|
* Merge branch 'qa/gb/backport-geo-integration-tests-commons' into 'master'Rémy Coutable2017-11-2211-4/+153
|\ | | | | | | | | | | | | Backport QA code that belongs to CE from EE Geo Closes #40344 See merge request gitlab-org/gitlab-ce!15536
| * Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commonsRémy Coutable2017-11-2211-4/+153
| | | | | | | | | | | | Merge branch 'qa/gb/add-geo-integration-tests' into 'master' See merge request gitlab-org/gitlab-ee!3294
* | Merge branch 'improve-extra-queries-output' into 'master'Rémy Coutable2017-11-222-5/+12
|\ \ | | | | | | | | | | | | Improve output for extra queries in specs See merge request gitlab-org/gitlab-ce!15537
| * | Improve output for extra queries in specsimprove-extra-queries-outputSean McGivern2017-11-222-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this used `Array#-`, which would remove all queries that matches the query text in the original set. However, sometimes we have a problem with parameterised queries, where the query text is identical both times, so we'd run a query N times instead of once, and it would be hidden from the output. Replace the logic to only remove a given query N times from the actual log, where N is the number of times it appears in the expected log.
* | | Merge branch 'docs-install-locale-compile' into 'master'Rubén Dávila2017-11-221-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch to using gettext:compile instead of gettext:pack in the install docs Closes #40360 See merge request gitlab-org/gitlab-ce!15501
| * | | Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compileDJ Mountney2017-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs This skips the step that updates the .pot files with changes in the codebase, which can take extra time, and isn't required during install.
* | | | Merge branch '40354-improve-ee_compat_check' into 'master'Sean McGivern2017-11-222-32/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Try to find the merge-base against the canonical master and name the remotes See merge request gitlab-org/gitlab-ce!15495
| * | | | Try to find the merge-base against the canonical masterRémy Coutable2017-11-222-32/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'group-new-miletone-breadcrumb' into 'master'Filipa Lacerda2017-11-222-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new group milestone breadcrumb Closes #40338 See merge request gitlab-org/gitlab-ce!15511
| * | | | | Fixed new group milestone breadcrumbPhil Hughes2017-11-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #40338
* | | | | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-226-1/+133
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230
| * | | | | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-074-30/+13
| | | | | |
| * | | | | Add Group Milestone sortingGeorge Andrinopoulos2017-11-077-1/+150
| | | | | |
* | | | | | Merge branch 'sh-add-query-recorder-debugging' into 'master'Sean McGivern2017-11-222-0/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging See merge request gitlab-org/gitlab-ce!15499
| * | | | | | Add QUERY_RECORDER_DEBUG environment variable to improve performance debuggingsh-add-query-recorder-debuggingStan Hu2017-11-212-0/+53
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-2219-41/+211
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107
| * | | | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-2219-41/+211
| | | | | |
* | | | | | Merge branch 'gitaly-fetch-source-branch' into 'master'Sean McGivern2017-11-228-11/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add FetchSourceBranch Gitaly call Closes gitaly#758 See merge request gitlab-org/gitlab-ce!15498
| * | | | | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-228-11/+49
|/ / / / /
* | | | | Update VERSION to 10.3.0-prev10.3.0.preMichael Kozono2017-11-211-1/+1
| | | | |
* | | | | Update CHANGELOG.md for 10.2.0Michael Kozono2017-11-21147-744/+187
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge remote-tracking branch 'dev/master'Michael Kozono2017-11-210-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-11-2172-270/+813
| |\ \ \ \ \
| * | | | | | Fix offense to the LineBreakAfterGuardClauses copRémy Coutable2017-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix-ci-pipelines-index' into 'master'Yorick Peterse2017-11-213-2/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update composite pipelines index to include "id" See merge request gitlab-org/gitlab-ce!15519
| * | | | | | | Update composite pipelines index to include "id"fix-ci-pipelines-indexYorick Peterse2017-11-213-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the composite index on ci_pipelines (project_id, ref, status) to also include the "id" column at the end. Adding this column to the index drastically improves the performance of queries used for getting the latest pipeline for a particular branch. For example, on project dashboards we'll run a query like the following: SELECT ci_pipelines.* FROM ci_pipelines WHERE ci_pipelines.project_id = 13083 AND ci_pipelines.ref = 'master' AND ci_pipelines.status = 'success' ORDER BY ci_pipelines.id DESC LIMIT 1; Limit (cost=0.43..58.88 rows=1 width=224) (actual time=26.956..26.956 rows=1 loops=1) Buffers: shared hit=6544 dirtied=16 -> Index Scan Backward using ci_pipelines_pkey on ci_pipelines (cost=0.43..830922.89 rows=14216 width=224) (actual time=26.954..26.954 rows=1 loops=1) Filter: ((project_id = 13083) AND ((ref)::text = 'master'::text) AND ((status)::text = 'success'::text)) Rows Removed by Filter: 6476 Buffers: shared hit=6544 dirtied=16 Planning time: 1.484 ms Execution time: 27.000 ms Because of the lack of "id" in the index we end up scanning over the primary key index, then applying a filter to filter out any remaining rows. The more pipelines a GitLab instance has the slower this will get. By adding "id" to the mentioned composite index we can change the above plan into the following: Limit (cost=0.56..2.01 rows=1 width=224) (actual time=0.034..0.034 rows=1 loops=1) Buffers: shared hit=5 -> Index Scan Backward using yorick_test on ci_pipelines (cost=0.56..16326.37 rows=11243 width=224) (actual time=0.033..0.033 rows=1 loops=1) Index Cond: ((project_id = 13083) AND ((ref)::text = 'master'::text) AND ((status)::text = 'success'::text)) Buffers: shared hit=5 Planning time: 0.695 ms Execution time: 0.061 ms This in turn leads to a best-case improvement of roughly 25 milliseconds, give or take a millisecond or two.
* | | | | | | | Merge branch 'svg-color' into 'master'Annabel Dunstone Gray2017-11-2110-108/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default fill color for SVGs See merge request gitlab-org/gitlab-ce!15476
| * | | | | | | | default fill color for SVGsSimon Knox2017-11-2110-108/+2
|/ / / / / / / /
* | | | | | | | Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'Stan Hu2017-11-212-1/+45
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Closes #40291 See merge request gitlab-org/gitlab-ce!15520
| * | | | | | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`Brett Walker2017-11-212-1/+45
|/ / / / / / / /
* | | | | | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master'Douwe Maan2017-11-215-6/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the default gitlab-shell timeout to 3 hours Closes #39977 See merge request gitlab-org/gitlab-ce!15292
| * | | | | | | | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-215-6/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'branch-exists-redis' into 'master'Rémy Coutable2017-11-212-5/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Redis cache for branch existence checks Closes #40349 See merge request gitlab-org/gitlab-ce!15513
| * | | | | | | | | Use Redis cache for branch existence checksJacob Vosmaer (GitLab)2017-11-212-5/+26
|/ / / / / / / / /
* | | | | | | | | Merge branch 'update-contributing-md-to-less-prescriptive' into 'master'🚄 Job van der Voort 🚀2017-11-211-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md: Link definition of done to criteria See merge request gitlab-org/gitlab-ce!15500
| * | | | | | | | | Update CONTRIBUTING.md: Link definition of done to criteriaVictor Wu2017-11-211-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '10-2-hashed-storage-file-uploader' into 'master'Stan Hu2017-11-212-15/+45
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileUploader should use Hashed Storage only when project is migrated See merge request gitlab-org/gitlab-ce!15526
| * | | | | | | | | FileUploader should check for hashed_storage?(:attachments) to use disk_pathGabriel Mazetto2017-11-212-15/+45
| | | | | | | | | |
* | | | | | | | | | Merge branch 'simplify-feature-proposals' into 'master'🚄 Job van der Voort 🚀2017-11-211-42/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify Feature Proposal template See merge request gitlab-org/gitlab-ce!15297
| * | | | | | | | | | Simplify Feature Proposal templatesimplify-feature-proposalsMark Pundsack2017-11-091-42/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'reduce-queries-for-artifacts-button' into 'master'Kamil Trzciński2017-11-213-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use arrays in Ci::Pipeline#latest_builds_with_artifacts See merge request gitlab-org/gitlab-ce!15525
| * | | | | | | | | | | Use arrays in Pipeline#latest_builds_with_artifactsreduce-queries-for-artifacts-buttonYorick Peterse2017-11-213-1/+13
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes Ci::Pipeline#latest_builds_with_artifacts so it returns an Array instead of a relation. Whenever we use this data we do so in two steps: 1. Count the number of rows 2. If this number is greater than 0, iterate over the rows By returning an Array instead we only execute 1 query of which the total time/work is less than running either just a COUNT(*) or both queries (in the worst case). On GitLab.com this change should save us a few milliseconds per request to ProjectsController#show.
* | | | | | | | | | | Merge branch 'gitaly-bundle-changes' into 'master'Rémy Coutable2017-11-212-10/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `make install` for Gitaly setups in non-test environments See merge request gitlab-org/gitlab-ce!15295
| * | | | | | | | | | Use `make install` for Gitaly setups in non-test environmentsAlejandro Rodríguez2017-11-212-10/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '40377-blank-states' into 'master'Annabel Dunstone Gray2017-11-215-27/+46
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blank states using old css Closes #40377 See merge request gitlab-org/gitlab-ce!15521
| * | | | | | | | | | Fix blank states using old css40377-blank-statesFilipa Lacerda2017-11-215-27/+46
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dz-improve-help-page' into 'master'Annabel Dunstone Gray2017-11-212-21/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wiki css to help page See merge request gitlab-org/gitlab-ce!15488
| * | | | | | | | | | | Remove unnecessary css for .documentation-indexdz-improve-help-pageDmitriy Zaporozhets2017-11-211-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Add wiki css to help pageDmitriy Zaporozhets2017-11-202-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>