summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-03-0315-26/+79
|\
| * Merge branch 'rs-filter-array' into 'master' Douwe Maan2016-03-0210-13/+37
| |\ | | | | | | | | | | | | | | | | | | Add FilterArray class to Banzai See merge request !3053
| | * Add FilterArray class to Banzairs-filter-arrayRobert Speicher2016-03-0110-13/+37
| | |
| * | Merge branch 'mail-room-config-without-rails' into 'master' Douwe Maan2016-03-021-4/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't load all of GitLab in mail_room Fixes #12731 cc @jacobvosmaer See merge request !3005
| | * | Fix `gitlab:incoming_email:check` task.Douwe Maan2016-02-291-4/+6
| | | |
| * | | Fix import from gitlab.comKazuki Sawada2016-03-021-1/+1
| | |/ | |/| | | | | | | Fixes #12652
| * | Merge branch 'fix/commit-status-api-improvement' into 'master' Douwe Maan2016-03-011-4/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return empty array when commit has no statuses in API This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080 See merge request !3010
| | * | Check if commit exists first in commit status APIGrzegorz Bizon2016-03-011-1/+1
| | | |
| | * | Return empty array when commit has no statuses in APIGrzegorz Bizon2016-02-291-4/+6
| | |/ | | | | | | | | | | | | | | | | | | This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080
| * | Merge branch 'rs-wiki-toc' into 'master' Douwe Maan2016-03-012-8/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter Closes #2494 See merge request !2952
| | * | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-tocRobert Speicher2016-02-232-8/+33
| | |/ | | | | | | | | | Closes #2494
| * | Merge branch 'comment-batch-size' into 'master' Douwe Maan2016-03-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch size >1000 does not pay off We did a small experiment to see how a full scan of the Redis keys on gitlab.com speeds up as we increase the batch size. The values on the right are time in seconds for a full scan (no delete operations). ``` count: 10); 284.500529021 count: 100); 86.21216934 count: 1_000); 60.931676195 count: 10_000); 60.96355610 count: 100_000); 62.378172541 ``` It looks like 1,000 is a good number. See merge request !2970
| | * | Batch size >1000 does not pay offcomment-batch-sizeJacob Vosmaer2016-02-251-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did a small experiment to see how a full scan of the Redis keys on gitlab.com speeds up as we increase the batch size. The values on the right are time in seconds for a full scan (no delete operations). count: 10); 284.500529021 count: 100); 86.21216934 count: 1_000); 60.931676195 count: 10_000); 60.96355610 count: 100_000); 62.378172541 It looks like 1,000 is a good number.
* | | Correct commentJacob Vosmaer2016-03-011-1/+1
| | |
* | | Use DiffCollection#overflow?Jacob Vosmaer2016-03-011-2/+1
| | |
* | | Less 'lines', more 'each_line'Jacob Vosmaer2016-03-012-2/+2
| | |
* | | Use DiffCollection#overflow?Jacob Vosmaer2016-03-011-1/+1
| | |
* | | Why did I add this?Jacob Vosmaer2016-03-011-3/+0
| | |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-03-012-7/+16
|\ \ \ | |/ /
| * | Merge branch 'fix/project-wiki-ending' into 'master' Robert Speicher2016-02-291-3/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for project paths ending in .wiki This prevents `Git operation was rejected by pre-receive hook` when an actual project ending with .wiki is thought to be a wiki by the `Internal` API. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13742 See merge request !2960
| | * | updated internal.rb and spec based on MR feedbackJames Lopez2016-02-261-3/+3
| | | |
| | * | fix for projects ending in .wikiJames Lopez2016-02-241-1/+8
| | |/
| * | Merge branch 'rs-data-links' into 'master' Douwe Maan2016-02-291-4/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Sanitize `data` and `vbscript` links Closes #13625 Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 See merge request !2905
| | * Sanitize `vbscript:` linksrs-data-linksRobert Speicher2016-02-231-1/+3
| | | | | | | | | | | | Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
| | * Sanitize `data:` linksRobert Speicher2016-02-211-4/+4
| | | | | | | | | | | | Closes #13625
* | | Fix typoJacob Vosmaer2016-02-291-1/+1
| | |
* | | Make #diffs safe (limited) by defaultJacob Vosmaer2016-02-293-4/+4
| | |
* | | We no longer have a timeout flagJacob Vosmaer2016-02-261-2/+3
| | |
* | | Convert enumerator to hashJacob Vosmaer2016-02-261-1/+1
| | |
* | | Fixes caught by failing testsJacob Vosmaer2016-02-261-2/+2
| | |
* | | Return an Enumerator from Diff::ParserJacob Vosmaer2016-02-261-39/+40
| | |
* | | Use less to_aJacob Vosmaer2016-02-251-1/+1
| | |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-02-2535-129/+518
|\ \ \ | |/ /
| * | Merge branch 'uploads-700' into 'master' revert-53176717Marin Jankovski2016-02-231-6/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | Restrict permissions on public/uploads Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631 See merge request !2764
| | * Simplify permissions creationuploads-700Achilleas Pipinellis2016-02-101-1/+1
| | | | | | | | | | | | [ci skip]
| | * Restrict permissions on public/uploadsAchilleas Pipinellis2016-02-091-6/+7
| | |
| * | Merge branch 'refactor-scan' into 'master' Douwe Maan2016-02-201-6/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve readability of 'rake cache:clear' code See merge request !2892
| | * | Improve readability of 'rake cache:clear' coderefactor-scanJacob Vosmaer2016-02-191-6/+5
| | | |
| * | | Fix API implementationKamil Trzcinski2016-02-192-4/+2
| | | |
| * | | Introduce API for serving the artifacts archiveKamil Trzcinski2016-02-192-0/+31
| | | |
| * | | Record user that erased a build through APIGrzegorz Bizon2016-02-191-1/+1
| | | |
| * | | Use POST method instead of DELETE when erasing a buildGrzegorz Bizon2016-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
| * | | Fix build api specs after rebaseGrzegorz Bizon2016-02-191-1/+1
| | | |
| * | | Fix name of build erasable, remove superfluous method from itGrzegorz Bizon2016-02-191-1/+1
| | | |
| * | | Move build eraseable API to proper API contextGrzegorz Bizon2016-02-192-19/+22
| | | |
| * | | Do not allow to modify build if it has been erasedGrzegorz Bizon2016-02-191-0/+3
| | | |
| * | | Use DELETE verb for erasing a build contentGrzegorz Bizon2016-02-191-2/+4
| | | | | | | | | | | | | | | | Also added API specs for that
| * | | And CI API endpoint where user can erase a buildGrzegorz Bizon2016-02-191-0/+16
| | | |
| * | | Move eraseable implementation to build concernGrzegorz Bizon2016-02-191-25/+0
| | | |
| * | | Add methods to build eraseable componentGrzegorz Bizon2016-02-191-0/+25
| | | |