summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use pluck instead of map for loading commit SHAssh-pluck-merge-request-diff-commit-shasStan Hu2018-10-311-1/+1
| | | | This saves some ActiveRecord overhead and memory.
* Merge branch 'rpereira2_improve-usage-ping-info' into 'master'Evan Read2018-10-311-1/+5
|\ | | | | | | | | Add instructions to find the usage ping payload See merge request gitlab-org/gitlab-ce!22571
| * Add instructions to find the usage ping payloadReuben Pereira2018-10-311-1/+5
|/
* Merge branch '52992-absorb-qa-product-qa' into 'master'Douglas Barbosa Alexandre2018-10-3115-165/+55
|\ | | | | | | | | CE: Absorb product into factory See merge request gitlab-org/gitlab-ce!22698
| * CE: Absorb product into factoryLin Jen-Shin2018-10-3115-165/+55
|/
* Merge branch 'docs/refactor-backup' into 'master'Evan Read2018-10-311-91/+224
|\ | | | | | | | | Refactor the backup/restore docs See merge request gitlab-org/gitlab-ce!22576
| * Refactor the backup/restore docsdocs/refactor-backupAchilleas Pipinellis2018-10-301-91/+224
| | | | | | | | | | | | - Rearrange sections - Stress out the importance of storing config files - Add troubleshooting guide in case secrets is lost
* | Merge branch 'docs-add-existing-k8s-integration-info' into 'master'Evan Read2018-10-301-0/+8
|\ \ | | | | | | | | | | | | Added info on getting k8s integration for existing cluster See merge request gitlab-org/gitlab-ce!21783
| * | Added periods and modified numberingdocs-add-existing-k8s-integration-infoJason Colyer2018-10-301-4/+4
| | |
| * | Added Evan's suggestionsJason Colyer2018-10-241-12/+7
| | |
| * | Updated commands and order from MR recomendationsJason Colyer2018-10-111-4/+4
| | |
| * | Added info on getting k8s integration for existing clusterJason Colyer2018-09-171-0/+13
| | |
* | | Merge branch '53052-mg-fix-broken-ie11' into 'master'Clement Ho2018-10-303-5/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken ie11 due to non-transpiled components in gitlab-ui Closes #53052 See merge request gitlab-org/gitlab-ce!22695
| * | | Add changelog entry for !2269553052-mg-fix-broken-ie11Mike Greiling2018-10-301-0/+5
| | | |
| * | | Upgrade gitlab-ui to latestMike Greiling2018-10-302-5/+5
| | | |
* | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-3028-125/+289
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
| * | | | Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
| | | | | | | | | | | | | | | | | | | | This gives flexiblity to avoid duplicated query of Project.
| * | | | Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
| | | | |
| * | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-307-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
| * | | | Move :plain option to Highlight classMark Chao2018-10-309-88/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to DRY the repeated file size check. Move spec and constants to Highlight
| * | | | Make Highlight accept language paramMark Chao2018-10-3016-56/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
| * | | | Add BlobPresenter for highlightingMark Chao2018-10-304-1/+82
| | | | | | | | | | | | | | | | | | | | Force FoundBlob to use BlobPresenter
| * | | | Add access to Blob's language from gitattributesMark Chao2018-10-303-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Ported from Highlight class since it as a concept is more related to blob, and this allows more flexibility.
| * | | | Add spec for Gitlab::Git::Repository#attributesMark Chao2018-10-303-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | seed_helper changed because testing requires attributes file in repo, but repo was not a real git repo but instead faked.
* | | | | Merge branch 'bvl-move-wrapped-gitaly-errors' into 'master'Douwe Maan2018-10-3010-35/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move Repository#wrapped_gitaly_errors into concern See merge request gitlab-org/gitlab-ce!22691
| * | | | | Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-3010-35/+76
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Having this in a concern allows us to reuse it for different single purpose classes that call out to git without going through the repository every time.
* | | | | Merge branch 'docs/fix-notifications-topic' into 'master'Achilleas Pipinellis2018-10-301-18/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix structure and add notification level See merge request gitlab-org/gitlab-ce!22528
| * | | | Fix structure and add notification levelEvan Read2018-10-301-18/+23
|/ / / /
* | | | Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'Stan Hu2018-10-3090-2/+188
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable some frozen string for lib/gitlab/ci See merge request gitlab-org/gitlab-ce!22636
| * | | | Enable frozen string for lib/gitlab/cigfyoung2018-10-2690-2/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/ci/*.rb * lib/gitlab/ci/build/**/*.rb * lib/gitlab/ci/config/**/*.rb * lib/gitlab/ci/pipeline/**/*.rb * lib/gitlab/ci/reports/**/*.rb Partially addresses #47424.
* | | | | Merge branch 'fix-app-layout-form-description' into 'master'Clement Ho2018-10-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix application layout form description See merge request gitlab-org/gitlab-ce!22658
| * | | | | Fix application layout form descriptionAndreas Kämmerle2018-10-301-2/+2
|/ / / / /
* | | | | Merge branch '50962-create-new-group-rename-form-fields-and-update-ui' into ↵Mike Greiling2018-10-3011-57/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Create new group: Rename form fields and update UI" Closes #50962 See merge request gitlab-org/gitlab-ce!22418
| * | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-3011-57/+117
|/ / / / /
* | | | | Merge branch 'sh-fix-search-relative-urls' into 'master'Clement Ho2018-10-302-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search "all in GitLab" not working with relative URLs Closes #53259 See merge request gitlab-org/gitlab-ce!22644
| * | | | | Fix search "all in GitLab" not working with relative URLssh-fix-search-relative-urlsStan Hu2018-10-282-2/+7
| |/ / / / | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53259
* | | | | Merge branch 'fl-missing-i18n' into 'master'Mike Greiling2018-10-307-15/+38
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Adds missing i18n to pipelines table See merge request gitlab-org/gitlab-ce!22690
| * | | | Adds missing i18n to pipelines tablefl-missing-i18nFilipa Lacerda2018-10-307-15/+38
| | | | |
* | | | | Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-305-24/+111
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty list for links to changed pages in Review App from MR Widget" Closes #53227 See merge request gitlab-org/gitlab-ce!22665
| * | | | | Runs prettier on changed files53227-empty-listFilipa Lacerda2018-10-301-1/+1
| | | | | |
| * | | | | Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-305-24/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a deployment has no files to show in the dropdown we fallback to the regular single button for the review app link. This commit moves the review app link into a component since it's used twice.
* | | | | | Merge branch 'tc-index-lfs-objects-file-store' into 'master'Douglas Barbosa Alexandre2018-10-305-21/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance performance of counting local LFS objects Closes gitlab-ee#6067 See merge request gitlab-org/gitlab-ce!22143
| * | | | | Enhance performance of counting local LFS objectstc-index-lfs-objects-file-storeToon Claes2018-10-305-21/+25
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an index to the `file_store` column on `lfs_objects`. This makes counting local objects faster. Also, there is no longer need to check for objects with `file_store` being `NULL`. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18557 --- ### Query plans #### Before & with `NULL` ``` Aggregate (cost=113495.96..113495.97 rows=1 width=8) (actual time=1691.394..1691.394 rows=1 loops=1) -> Seq Scan on lfs_objects (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..1312.488 rows=2852607 loops=1) Filter: ((file_store = 1) OR (file_store IS NULL)) Rows Removed by Filter: 131 Planning time: 0.077 ms Execution time: 1691.433 ms ``` #### Before, without `NULL` ``` Aggregate (cost=113495.96..113495.97 rows=1 width=8) (actual time=856.423..856.424 rows=1 loops=1) -> Seq Scan on lfs_objects (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..672.181 rows=2852607 loops=1) Filter: (file_store = 1) Rows Removed by Filter: 131 Planning time: 0.128 ms Execution time: 856.470 ms ``` #### After & with `NULL` ``` Aggregate (cost=68819.95..68819.96 rows=1 width=8) (actual time=583.355..583.355 rows=1 loops=1) -> Index Only Scan using index_lfs_objects_on_file_store on lfs_objects (cost=0.43..61688.35 rows=2852643 width=0) (actual time=0.028..399.177 rows=2852607 loops=1) Filter: ((file_store = 1) OR (file_store IS NULL)) Rows Removed by Filter: 131 Heap Fetches: 867 Planning time: 0.096 ms Execution time: 583.404 ms ``` #### After, without `NULL` ``` Aggregate (cost=68817.29..68817.30 rows=1 width=8) (actual time=490.550..490.551 rows=1 loops=1) -> Index Only Scan using index_lfs_objects_on_file_store on lfs_objects (cost=0.43..61685.68 rows=2852643 width=0) (actual time=0.040..311.760 rows=2852607 loops=1) Index Cond: (file_store = 1) Heap Fetches: 831 Planning time: 0.294 ms Execution time: 490.590 ms ``` Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6067
* | | | | Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'Filipa Lacerda2018-10-303-8/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in pipelines list See merge request gitlab-org/gitlab-ce!22621
| * | | | | Add dynamic timer for delayed jobs in pipelines listwinh-pipeline-actions-dynamic-timerWinnie Hellmann2018-10-293-8/+13
| | | | | |
* | | | | | Merge branch 'backport-ee-7203-sticky-logs-topbar' into 'master'Filipa Lacerda2018-10-303-74/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport ee 7203 sticky logs topbar See merge request gitlab-org/gitlab-ce!22282
| * | | | | | Backport ee 7203 sticky logs topbarSimon Knox2018-10-303-74/+100
|/ / / / / /
* | | | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-303-8/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes diff discussions not being fully removed Closes #53317 See merge request gitlab-org/gitlab-ce!22680
| * | | | | | Fixes diff discussions not being fully removedmr-diff-discussion-deletionPhil Hughes2018-10-303-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a discussion on a none changed line would not get fully removed and therefore leave the comment row empty. This was caused by the discussiob being added to the right when it shouldnt of been This also fixes a very rare edge case where discussions would get added twice to diff lines causing a Vue rendering warning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317
* | | | | | | Merge branch 'sh-fix-issue-53153' into 'master'Sean McGivern2018-10-303-1/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix extra merge request versions created from forked merge requests Closes #53153 See merge request gitlab-org/gitlab-ce!22611
View Lorry Controller Status