Commit Graph

64708 Commits

Author SHA1 Message Date
Sean McGivern e548c61334 Merge branch '39720-group-milestone-sorting' into 'master'
Add Group Milestone sorting

Closes #39720

See merge request gitlab-org/gitlab-ce!15230
2017-11-22 11:40:52 +00:00
Sean McGivern 13cfcfc23b Merge branch 'sh-add-query-recorder-debugging' into 'master'
Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging

See merge request gitlab-org/gitlab-ce!15499
2017-11-22 11:19:36 +00:00
Phil Hughes d7527d73b1 Merge branch 'feature_add_mermaid' into 'master'
Add support of Mermaid

Closes #3711

See merge request gitlab-org/gitlab-ce!15107
2017-11-22 11:00:12 +00:00
Sean McGivern 0efa7e24f2 Merge branch 'gitaly-fetch-source-branch' into 'master'
Add FetchSourceBranch Gitaly call

Closes gitaly#758

See merge request gitlab-org/gitlab-ce!15498
2017-11-22 10:19:44 +00:00
Jacob Vosmaer (GitLab) 571f1dda17 Add FetchSourceBranch Gitaly call 2017-11-22 10:19:42 +00:00
Stan Hu 52b6cbcb9d Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging 2017-11-21 21:32:56 -08:00
Vitaliy @blackst0ne Klachkov 131e74d10d Add support of Mermaid 2017-11-22 14:12:04 +11:00
Michael Kozono 6369db0196 Update VERSION to 10.3.0-pre 2017-11-21 15:49:50 -08:00
Michael Kozono e6ee3d17b3 Update CHANGELOG.md for 10.2.0
[ci skip]
2017-11-21 15:46:09 -08:00
Michael Kozono 0a215e266b Merge remote-tracking branch 'dev/master' 2017-11-21 14:52:33 -08:00
Yorick Peterse 5a5bececbe Merge branch 'fix-ci-pipelines-index' into 'master'
Update composite pipelines index to include "id"

See merge request gitlab-org/gitlab-ce!15519
2017-11-21 21:36:28 +00:00
Annabel Dunstone Gray 7054a3cbed Merge branch 'svg-color' into 'master'
default fill color for SVGs

See merge request gitlab-org/gitlab-ce!15476
2017-11-21 20:39:26 +00:00
Simon Knox a82b9df591 default fill color for SVGs 2017-11-21 20:39:26 +00:00
Stan Hu b462edfddb Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'
ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`

Closes #40291

See merge request gitlab-org/gitlab-ce!15520
2017-11-21 20:26:53 +00:00
Brett Walker 5e861a0525 ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` 2017-11-21 20:26:53 +00:00
Douwe Maan 04c438065c Merge branch '39977-gitlab-shell-default-timeout' into 'master'
Set the default gitlab-shell timeout to 3 hours

Closes #39977

See merge request gitlab-org/gitlab-ce!15292
2017-11-21 19:08:09 +00:00
Rémy Coutable e2e4d18f1c Merge branch 'branch-exists-redis' into 'master'
Use Redis cache for branch existence checks

Closes #40349

See merge request gitlab-org/gitlab-ce!15513
2017-11-21 19:00:05 +00:00
Jacob Vosmaer (GitLab) 00cd5d93ce Use Redis cache for branch existence checks 2017-11-21 19:00:05 +00:00
🚄 Job van der Voort 🚀 2822254ec5 Merge branch 'update-contributing-md-to-less-prescriptive' into 'master'
Update CONTRIBUTING.md: Link definition of done to criteria

See merge request gitlab-org/gitlab-ce!15500
2017-11-21 18:54:01 +00:00
Victor Wu 356f33d20b Update CONTRIBUTING.md: Link definition of done to criteria 2017-11-21 18:54:01 +00:00
Stan Hu c63c41afca Merge branch '10-2-hashed-storage-file-uploader' into 'master'
FileUploader should use Hashed Storage only when project is migrated

See merge request gitlab-org/gitlab-ce!15526
2017-11-21 18:52:27 +00:00
🚄 Job van der Voort 🚀 68826c56c9 Merge branch 'simplify-feature-proposals' into 'master'
Simplify Feature Proposal template

See merge request gitlab-org/gitlab-ce!15297
2017-11-21 18:38:39 +00:00
Kamil Trzciński ce019812a5 Merge branch 'reduce-queries-for-artifacts-button' into 'master'
Use arrays in Ci::Pipeline#latest_builds_with_artifacts

See merge request gitlab-org/gitlab-ce!15525
2017-11-21 18:15:51 +00:00
Rémy Coutable 6da130c295 Merge branch 'gitaly-bundle-changes' into 'master'
Use `make install` for Gitaly setups in non-test environments

See merge request gitlab-org/gitlab-ce!15295
2017-11-21 17:45:38 +00:00
Alejandro Rodríguez c33ca9d807 Use `make install` for Gitaly setups in non-test environments 2017-11-21 17:45:36 +00:00
Gabriel Mazetto d087b4dac4 FileUploader should check for hashed_storage?(:attachments) to use disk_path 2017-11-21 18:38:25 +01:00
Nick Thomas afd5911557
Set the default gitlab-shell timeout to 3 hours 2017-11-21 17:32:37 +00:00
Annabel Dunstone Gray 4ebe69600f Merge branch '40377-blank-states' into 'master'
Fix blank states using old css

Closes #40377

See merge request gitlab-org/gitlab-ce!15521
2017-11-21 17:07:57 +00:00
Annabel Dunstone Gray 1b3197f077 Merge branch 'dz-improve-help-page' into 'master'
Add wiki css to help page

See merge request gitlab-org/gitlab-ce!15488
2017-11-21 16:54:43 +00:00
Yorick Peterse aafe5c123e
Update composite pipelines index to include "id"
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.
2017-11-21 17:48:52 +01:00
Yorick Peterse 54f1e406f4
Use arrays in Pipeline#latest_builds_with_artifacts
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.
2017-11-21 17:40:29 +01:00
Douwe Maan 6c33981654 Merge branch 'sh-optimize-read-only-check' into 'master'
Optimize read-only middleware so that it does not consume as much CPU

Closes #40185 and gitlab-com/infrastructure#3240

See merge request gitlab-org/gitlab-ce!15504
2017-11-21 16:10:47 +00:00
Filipa Lacerda 0ae8dc9d60
Fix blank states using old css 2017-11-21 15:49:46 +00:00
Rémy Coutable 9961ac033f Merge branch 'skip_confirmation_user_API' into 'master'
Skip confirmation user api

Closes #28934

See merge request gitlab-org/gitlab-ce!15175
2017-11-21 15:48:00 +00:00
Daniel Juarez 0b9e1e1662 Skip confirmation user api 2017-11-21 15:47:58 +00:00
Sean McGivern 28a5f5f2e9 Merge branch 'docs-custom-issue-tracker' into 'master'
Custom issue tracker

See merge request gitlab-org/gitlab-ce!15516
2017-11-21 15:21:50 +00:00
Victor Wu 129036b2cf Custom issue tracker 2017-11-21 15:21:50 +00:00
Sean McGivern f562e69eab Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master'
Resolve "Notes API for issues no longer returns label additions/removals"

Closes #39461

See merge request gitlab-org/gitlab-ce!15080
2017-11-21 14:49:07 +00:00
Douwe Maan 9024875e1f Merge branch '40367-tagspage-tags' into 'master'
Resolve "TagsPage|Tags"

Closes #40367

See merge request gitlab-org/gitlab-ce!15512
2017-11-21 14:39:23 +00:00
digitalMoksha aeb2f49fd4 Revert "check for `read_only?` first before seeing if request is disallowed"
This reverts commit 91075c8237.
2017-11-21 15:35:30 +01:00
Sean McGivern ff47c04b0e Merge branch 'zj-commit-show-n-1' into 'master'
Batch load blobs for diff generation

Closes #37599

See merge request gitlab-org/gitlab-ce!15370
2017-11-21 14:04:05 +00:00
Sean McGivern 6554509955 Merge branch 'issue_40337' into 'master'
Fix promoting milestone updating all issuables without milestone

Closes #40337

See merge request gitlab-org/gitlab-ce!15487
2017-11-21 14:02:23 +00:00
micael.bergeron c900c21eef add `#with_metadata` scope to remove a N+1 from the notes' API 2017-11-21 08:31:23 -05:00
Felipe Artur 3f6e45ed28 Fix promoting milestone updating all issuables without milestone 2017-11-21 11:09:14 -02:00
Zeger-Jan van de Weg f9565e3039
Batchload blobs for diff generation
After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs
are not merged yet.

For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.

Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21 13:53:26 +01:00
digitalMoksha 91075c8237 check for `read_only?` first before seeing if request is disallowed 2017-11-21 13:30:54 +01:00
digitalMoksha cba68d338b use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
since `Rails.application.routes.url_helpers` creates a new anonymous module every time it's called
2017-11-21 13:29:57 +01:00
Dmitriy Zaporozhets c70ffe1118
Remove unnecessary css for .documentation-index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-11-21 14:29:42 +02:00
Sean McGivern 6dd89059b8 Merge branch 'gitaly-test-no-deployment' into 'master'
Fix slow gitaly dev test bundle

See merge request gitlab-org/gitlab-ce!15508
2017-11-21 12:28:03 +00:00
Jacob Vosmaer (GitLab) 6f1e9f7ef7 Fix slow gitaly dev test bundle 2017-11-21 12:28:02 +00:00