summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Forbid all inline script tags in Linter::InlineJavaScriptWinnie Hellmann2018-02-281-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-reenable-wiki' into 'master'Douwe Maan2018-02-281-3/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable the remaning Wiki Gitaly-Endpoints See merge request gitlab-org/gitlab-ce!17422
| * | | | | | | | | Re-enable the remaning Wiki Gitaly-EndpointsKim Carlbäcker2018-02-281-3/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-282-8/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display IP Address Of Runner On Runner Page" Closes #43489 See merge request gitlab-org/gitlab-ce!17286
| * | | | | | | | | Persist runner IP address on contact (#43489)Dylan Griffith2018-02-282-8/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Fix code search results with non-ASCII data43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bitSean McGivern2018-02-281-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Popen#popen now returns ASCII-8BIT (binary) data always, so we need to handle that explicitly.
* | | | | | | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-273-9/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824
| * | | | | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-273-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-273-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development envRémy Coutable2018-02-271-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵Douwe Maan2018-02-272-10/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Keep raw link when redacting unauthorized link object references Closes #40502 See merge request gitlab-org/gitlab-ce!17365
| * | | | | | | | Keep link when redacting unauthorized object linksOswaldo Ferreira2018-02-272-10/+30
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ↵Sean McGivern2018-02-271-42/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a performance/memory issue in lib/api/services.rb Closes #43620 See merge request gitlab-org/gitlab-ce!17369
| * | | | | | | | Fix a performance/memory issue in lib/api/services.rb43620-lib-api-services-rb-retains-a-lot-of-memory-and-objectsRémy Coutable2018-02-261-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-271-0/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully migrate build stages again Closes #38756 See merge request gitlab-org/gitlab-ce!15741
| * \ \ \ \ \ \ \ \ Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-2315-11/+303
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits)
| * | | | | | | | | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-2225-191/+446
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | Use a helper to schedule pipeline stages migrationGrzegorz Bizon2018-02-161-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-167-10/+21
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | * master: (38 commits)
| * | | | | | | | | | Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-1522-102/+181
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | | | | Recover from unique constraint violation in stages migrationGrzegorz Bizon2018-02-151-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Migrate pipeline stages in batches instead of single rowGrzegorz Bizon2018-02-141-54/+30
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-126-22/+32
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-09270-1541/+4482
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1480 commits) Conflicts: db/schema.rb
| * | | | | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-061-12/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-061-3/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-061-0/+67
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-272-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose ChatName objects to slash commands See merge request gitlab-org/gitlab-ce!17295
| * | | | | | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-232-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
* | | | | | | | | | | | | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-262-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate recursive tree entries fetching to Gitaly See merge request gitlab-org/gitlab-ce!17191
| * | | | | | | | | | | | | Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-262-6/+22
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'suppress-squash-warnings' into 'master'Douwe Maan2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress whitespace warnings in squash error messages Closes gitlab-ee#3639 See merge request gitlab-org/gitlab-ce!17317
| * | | | | | | | | | | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are obscuring the real error, which is confusing for everyone.
* | | | | | | | | | | | | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-261-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorker See merge request gitlab-org/gitlab-ce!17356
| * | | | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorkerDouwe Maan2018-02-261-1/+7
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respond with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
| * | | | | | | | | | | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-existMichael Kozono2018-02-241-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-263-67/+156
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-236-21/+31
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-235-19/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | Resolve "Milestone Quick Action not displayed with no project milestones but ↵🙈 jacopo beschi 🙉2018-02-233-17/+13
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with group milestones"
| * | | | | | | | | | | Merge branch 'users-autocomplete' into 'master'Douwe Maan2018-02-232-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of searching for and auto completing of users See merge request gitlab-org/gitlab-ce!17158
| | * | | | | | | | | | Added changelog for user search improvementsusers-autocompleteYorick Peterse2018-02-221-4/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Optimise searching for users using short queriesYorick Peterse2018-02-222-2/+16
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+8
|/ / / / / / / / / /
* | | | | | | | | | Allow token authentication on go-get requestDouwe Maan2018-02-232-1/+17
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-2313-9/+287
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| * | | | | | | | | Use `Redactor` to hide cross project informationbvl-external-auth-portBob Van Landuyt2018-02-223-42/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the redactor can be run on multiple documents at once and query results are stored in the request store.
| * | | | | | | | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-2214-8/+308
| |/ / / / / / / /