summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added changelog for user search improvementsusers-autocompleteYorick Peterse2018-02-223-5/+8
|
* Optimise searching for users using short queriesYorick Peterse2018-02-226-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This optimises searching for users when using queries consisting out of one or two characters such as "ab". We optimise such cases by searching for `LOWER(name)` and `LOWER(username)` instead of using `ILIKE`. Using `LOWER` produces a _much_ better performing query. For example, when searching for all users matching the term "a" we'd produce the following plan: Limit (cost=637.69..637.74 rows=20 width=805) (actual time=41.983..41.995 rows=20 loops=1) Buffers: shared hit=8330 -> Sort (cost=637.69..638.61 rows=368 width=805) (actual time=41.982..41.990 rows=20 loops=1) Sort Key: (CASE WHEN ((name)::text = 'a'::text) THEN 0 WHEN ((username)::text = 'a'::text) THEN 1 WHEN ((email)::text = 'a'::text) THEN 2 ELSE 3 END), name Sort Method: top-N heapsort Memory: 35kB Buffers: shared hit=8330 -> Bitmap Heap Scan on users (cost=75.47..627.89 rows=368 width=805) (actual time=9.452..41.305 rows=277 loops=1) Recheck Cond: (((name)::text ~~* 'a'::text) OR ((username)::text ~~* 'a'::text) OR ((email)::text = 'a'::text)) Rows Removed by Index Recheck: 7601 Heap Blocks: exact=7636 Buffers: shared hit=8327 -> BitmapOr (cost=75.47..75.47 rows=368 width=0) (actual time=8.290..8.290 rows=0 loops=1) Buffers: shared hit=691 -> Bitmap Index Scan on index_users_on_name_trigram (cost=0.00..38.85 rows=180 width=0) (actual time=4.369..4.369 rows=4071 loops=1) Index Cond: ((name)::text ~~* 'a'::text) Buffers: shared hit=360 -> Bitmap Index Scan on index_users_on_username_trigram (cost=0.00..34.41 rows=188 width=0) (actual time=3.896..3.896 rows=4140 loops=1) Index Cond: ((username)::text ~~* 'a'::text) Buffers: shared hit=328 -> Bitmap Index Scan on users_email_key (cost=0.00..1.94 rows=1 width=0) (actual time=0.022..0.022 rows=0 loops=1) Index Cond: ((email)::text = 'a'::text) Buffers: shared hit=3 Planning time: 3.912 ms Execution time: 42.171 ms With the changes in this commit we now produce the following plan instead: Limit (cost=13257.48..13257.53 rows=20 width=805) (actual time=1.567..1.579 rows=20 loops=1) Buffers: shared hit=287 -> Sort (cost=13257.48..13280.93 rows=9379 width=805) (actual time=1.567..1.572 rows=20 loops=1) Sort Key: (CASE WHEN ((name)::text = 'a'::text) THEN 0 WHEN ((username)::text = 'a'::text) THEN 1 WHEN ((email)::text = 'a'::text) THEN 2 ELSE 3 END), name Sort Method: top-N heapsort Memory: 35kB Buffers: shared hit=287 -> Bitmap Heap Scan on users (cost=135.66..13007.91 rows=9379 width=805) (actual time=0.194..1.107 rows=277 loops=1) Recheck Cond: ((lower((name)::text) = 'a'::text) OR (lower((username)::text) = 'a'::text) OR ((email)::text = 'a'::text)) Heap Blocks: exact=277 Buffers: shared hit=287 -> BitmapOr (cost=135.66..135.66 rows=9379 width=0) (actual time=0.152..0.152 rows=0 loops=1) Buffers: shared hit=10 -> Bitmap Index Scan on yorick_test_users (cost=0.00..124.75 rows=9377 width=0) (actual time=0.101..0.101 rows=277 loops=1) Index Cond: (lower((name)::text) = 'a'::text) Buffers: shared hit=4 -> Bitmap Index Scan on index_on_users_lower_username (cost=0.00..1.94 rows=1 width=0) (actual time=0.035..0.035 rows=1 loops=1) Index Cond: (lower((username)::text) = 'a'::text) Buffers: shared hit=3 -> Bitmap Index Scan on users_email_key (cost=0.00..1.94 rows=1 width=0) (actual time=0.014..0.014 rows=0 loops=1) Index Cond: ((email)::text = 'a'::text) Buffers: shared hit=3 Planning time: 0.303 ms Execution time: 1.687 ms Here we can see the new query is 25 times faster compared to the old query.
* Removed pagination from AutocompleteUsersFinderYorick Peterse2018-02-224-11/+14
| | | | | | | The frontend code doesn't use this so there's no practical point in supporting this. We also hardcode the limit to 20 so users can no longer request their own limit, which could overload the database (depending on any upper bounds perhaps enforced by Kaminari).
* Don't pluck IDs in AutocompleteUsersFinderYorick Peterse2018-02-221-3/+7
| | | | | | We can instead just use a UNION. This removes the need for plucking hundreds if not thousands of IDs into memory when a project has many members.
* Merge branch 'dispatcher-import-batch-3' into 'master'Jacob Schatz2018-02-2222-131/+32
|\ | | | | | | | | Use dynamic imports in dispatcher (Part 3) See merge request gitlab-org/gitlab-ce!17277
| * Use dynamic imports in dispatcher (Part 3)Clement Ho2018-02-2222-131/+32
|/
* Merge branch 'patch-28' into 'master'Marcia Ramos2018-02-221-1/+1
|\ | | | | | | | | Add link to project visibility settings in push to create project docs See merge request gitlab-org/gitlab-ce!17292
| * Add link to project visibility settings in push to create project docsPedro Moreira da Silva2018-02-221-1/+1
| |
* | Merge branch 'docs-milestones-refactor' into 'master'Marcia Ramos2018-02-228-40/+88
|\ \ | | | | | | | | | | | | Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
| * | Update docs milestonesdocs-milestones-refactorVictor Wu2018-02-218-40/+88
| | |
* | | Merge branch 'docs-replace-prod-names' into 'master'🚄 Job van der Voort 🚀2018-02-2211-22/+45
|\ \ \ | | | | | | | | | | | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable See merge request gitlab-org/gitlab-ce!17161
| * | | Docs: search/replace "Enterprise Edition" and adjust when applicableMarcia Ramos2018-02-2211-22/+45
|/ / /
* | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-226-1/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
| * | | Fix 500 error when loading an invalid upload URLSean McGivern2018-02-226-1/+40
| | | |
* | | | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-223-12/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'tc-info-version-check' into 'master'" See merge request gitlab-org/gitlab-ce!17269
| * | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441bVictor Wu2018-02-213-12/+3
| | | | | | | | | | | | | | | This reverts merge request !17257
* | | | | Merge branch ↵Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴)2018-02-221-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43416-document-where-user-clone-fetch-activity-appears-in-the-logs' into 'master' Resolve "document where user clone/fetch activity appears in the logs" Closes #43416 See merge request gitlab-org/gitlab-ce!17227
| * | | | | add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logsDiana Stanley2018-02-191-0/+4
| | | | | |
* | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master'Filipa Lacerda2018-02-2222-45/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harmonize CE and EE JS code See merge request gitlab-org/gitlab-ce!17264
| * | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-2222-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵Douwe Maan2018-02-223-1/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "ActionView::Template::Error: 366..524 out of range" Closes #42332 See merge request gitlab-org/gitlab-ce!17262
| * | | | | | Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-223-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rugged sometimes chops a context line in between bytes, resulting in the context line having an invalid encoding: https://github.com/libgit2/rugged/issues/716 When that happens, we will try to detect the encoding for the diff, and sometimes we'll get it wrong. If that difference in encoding results in a difference in string lengths between the diff and the underlying blobs, we'd fail to highlight any inline diffs, and return a 500 status to the user. As we're using the underlying blobs, the encoding is 'correct' anyway, so if the string range is invalid, we can just discard the inline diff highlighting. We still report to Sentry to ensure that we can investigate further in future.
* | | | | | | Merge branch '43495-spec-failure-spec-features-users_spec-rb' into 'master'Sean McGivern2018-02-228-247/+194
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spec failure: spec/features/users_spec.rb" Closes #43495 See merge request gitlab-org/gitlab-ce!17289
| * | | | | | | Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rbRémy Coutable2018-02-228-247/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'webpack-autoinclude' into 'master'Jacob Schatz2018-02-221-6/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport of Webpack auto include for EE imports See merge request gitlab-org/gitlab-ce!17282
| * | | | | | | Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
|/ / / / / / /
* | | | | | | Merge branch 'fix-squash-with-renamed-files' into 'master'Grzegorz Bizon2018-02-223-5/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix squash with renamed files Closes gitlab-ee#4975 See merge request gitlab-org/gitlab-ce!17216
| * | | | | | | Fix squash with renamed filesfix-squash-with-renamed-filesSean McGivern2018-02-193-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ignore the names for renamed files when configuring with sparse checkout.
* | | | | | | | Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-223-10/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branchnames to be named the same as the commit it points to See merge request gitlab-org/gitlab-ce!17231
| * | | | | | | | Handle branch and tag names which are commit idsZeger-Jan van de Weg2018-02-213-10/+48
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a test where a branch name is also a valid commit id. Git, the binary should create an error message which is difficult to parse and leading to errors later, as seen in: gitlab-org/gitlab-ce#43222 To catch these cases in the future, gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which a branch name matching the commit
* | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-221-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format markdown.md to comply with what it describes. See merge request gitlab-org/gitlab-ce!17284
| * | | | | | | | Format markdown.md to comply with what it describes.Ulf Rompe2018-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the text says "here are two spaces to force a line break" there really should be two spaces to force a line break.
* | | | | | | | | Update VERSION to 10.6.0-prev10.6.0.preMark Fletcher2018-02-221-1/+1
| | | | | | | | |
* | | | | | | | | Update CHANGELOG.md for 10.5.0Mark Fletcher2018-02-22160-804/+192
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'jramsay-detailed-proofreader-process-docs' into 'master'Douwe Maan2018-02-221-3/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more detail to the proofreader process See merge request gitlab-org/gitlab-ce!17279
| * | | | | | | | No `../` is necessary for linking pages in the same directory.jramsay-detailed-proofreader-process-docsConnor Shea2018-02-211-1/+1
| | | | | | | | |
| * | | | | | | | Link directly to proofreader.mdJames Ramsay2018-02-211-2/+4
| | | | | | | | |
| * | | | | | | | Add more detail to the proofreader processJames Ramsay2018-02-211-3/+20
| | | | | | | | |
* | | | | | | | | Merge branch ↵Filipa Lacerda2018-02-226-152/+100
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master' Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ↵42886-followup-to-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-21413-6913/+5810
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
| * | | | | | | | | Merge branch 'master' into ↵Shah El-Rahman2018-02-1613-55/+27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
| * | | | | | | | | | Remove use of callback in pipeline stop/retry modalsShah El-Rahman2018-02-166-152/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make changes to names of events and variables Combine stop and retry modals into 1 Fix lint issues Add comment about usage of eventHub instead of props
* | | | | | | | | | | Merge branch 'ce-gitaly-squash-in-progress' into 'master'Grzegorz Bizon2018-02-224-2/+51
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC See merge request gitlab-org/gitlab-ce!17002
| * | | | | | | | | | | Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progressAlejandro Rodríguez2018-02-214-2/+51
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'Grzegorz Bizon2018-02-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Controller Projects::PipelinesController#show executes more than 100 SQL queries" Closes #43134 See merge request gitlab-org/gitlab-ce!17168
| * | | | | | | | | | | Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-showDylan Griffith2018-02-222-1/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'git-access-existence-check' into 'master'Robert Speicher2018-02-225-7/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix repo existence check in GitAccessWiki Closes #43385 and gitlab-com/infrastructure#3734 See merge request gitlab-org/gitlab-ce!17268
| * | | | | | | | | | | | Fix repo existence check in GitAccessWikiJacob Vosmaer (GitLab)2018-02-225-7/+29
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mk-improve-background-migration-specs' into 'master'Stan Hu2018-02-219-518/+706
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve background migration specs See merge request gitlab-org/gitlab-ce!17162
View Lorry Controller Status