Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove `Snippet#expires_at`rs-snippets-dont-expire | Robert Speicher | 2016-03-05 | 1 | -1/+1 |
| | | | | | | This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. | ||||
* | Merge branch 'rs-frontmatter-pre' into 'master' | Robert Speicher | 2016-03-05 | 4 | -0/+55 |
|\ | | | | | | | | | Properly display YAML front matter in Markdown See merge request !3072 | ||||
| * | Add YamlFrontMatterFilter to the PreProcessPipeline | Robert Speicher | 2016-03-04 | 2 | -1/+30 |
| | | | | | | | | | | This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting. | ||||
| * | Add a PreProcessPipeline | Robert Speicher | 2016-03-02 | 3 | -0/+26 |
| | | |||||
* | | Merge branch 'rs-wiki-pipeline-spec' into 'master' | Douwe Maan | 2016-03-04 | 1 | -3/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Add a spec for WikiPipeline Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter. See merge request !3054 | ||||
| * | | Replace `[[_TOC_]]` tag even if `toc` result is blankrs-wiki-pipeline-spec | Robert Speicher | 2016-03-03 | 1 | -3/+5 |
| | | | |||||
* | | | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 6 | -56/+48 |
| |/ |/| | |||||
* | | Merge branch 'rs-filter-array' into 'master' | Douwe Maan | 2016-03-02 | 10 | -13/+37 |
|\ \ | | | | | | | | | | | | | | | | | | | Add FilterArray class to Banzai See merge request !3053 | ||||
| * | | Add FilterArray class to Banzairs-filter-array | Robert Speicher | 2016-03-01 | 10 | -13/+37 |
| |/ | |||||
* | | Merge branch 'mail-room-config-without-rails' into 'master' | Douwe Maan | 2016-03-02 | 1 | -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 Maan | 2016-02-29 | 1 | -4/+6 |
| | | | |||||
* | | | Fix import from gitlab.com | Kazuki Sawada | 2016-03-02 | 1 | -1/+1 |
| |/ |/| | | | | | Fixes #12652 | ||||
* | | Merge branch 'fix/commit-status-api-improvement' into 'master' | Douwe Maan | 2016-03-01 | 1 | -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 API | Grzegorz Bizon | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Return empty array when commit has no statuses in API | Grzegorz Bizon | 2016-02-29 | 1 | -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 Maan | 2016-03-01 | 2 | -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-toc | Robert Speicher | 2016-02-23 | 2 | -8/+33 |
| |/ | | | | | | | Closes #2494 | ||||
* | | Merge branch 'comment-batch-size' into 'master' | Douwe Maan | 2016-03-01 | 1 | -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-size | Jacob Vosmaer | 2016-02-25 | 1 | -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. | ||||
* | | Merge branch 'fix/project-wiki-ending' into 'master' | Robert Speicher | 2016-02-29 | 1 | -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 feedback | James Lopez | 2016-02-26 | 1 | -3/+3 |
| | | | |||||
| * | | fix for projects ending in .wiki | James Lopez | 2016-02-24 | 1 | -1/+8 |
| |/ | |||||
* | | Merge branch 'rs-data-links' into 'master' | Douwe Maan | 2016-02-29 | 1 | -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-links | Robert Speicher | 2016-02-23 | 1 | -1/+3 |
| | | | | | | | | Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660 | ||||
| * | Sanitize `data:` links | Robert Speicher | 2016-02-21 | 1 | -4/+4 |
| | | | | | | | | Closes #13625 | ||||
* | | Merge branch 'uploads-700' into 'master' revert-53176717 | Marin Jankovski | 2016-02-23 | 1 | -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-700 | Achilleas Pipinellis | 2016-02-10 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Restrict permissions on public/uploads | Achilleas Pipinellis | 2016-02-09 | 1 | -6/+7 |
| | | |||||
* | | Merge branch 'refactor-scan' into 'master' | Douwe Maan | 2016-02-20 | 1 | -6/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Improve readability of 'rake cache:clear' code See merge request !2892 | ||||
| * | | Improve readability of 'rake cache:clear' coderefactor-scan | Jacob Vosmaer | 2016-02-19 | 1 | -6/+5 |
| | | | |||||
* | | | Fix API implementation | Kamil Trzcinski | 2016-02-19 | 2 | -4/+2 |
| | | | |||||
* | | | Introduce API for serving the artifacts archive | Kamil Trzcinski | 2016-02-19 | 2 | -0/+31 |
| | | | |||||
* | | | Record user that erased a build through API | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Use POST method instead of DELETE when erasing a build | Grzegorz Bizon | 2016-02-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042 | ||||
* | | | Fix build api specs after rebase | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Fix name of build erasable, remove superfluous method from it | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Move build eraseable API to proper API context | Grzegorz Bizon | 2016-02-19 | 2 | -19/+22 |
| | | | |||||
* | | | Do not allow to modify build if it has been erased | Grzegorz Bizon | 2016-02-19 | 1 | -0/+3 |
| | | | |||||
* | | | Use DELETE verb for erasing a build content | Grzegorz Bizon | 2016-02-19 | 1 | -2/+4 |
| | | | | | | | | | | | | Also added API specs for that | ||||
* | | | And CI API endpoint where user can erase a build | Grzegorz Bizon | 2016-02-19 | 1 | -0/+16 |
| | | | |||||
* | | | Move eraseable implementation to build concern | Grzegorz Bizon | 2016-02-19 | 1 | -25/+0 |
| | | | |||||
* | | | Add methods to build eraseable component | Grzegorz Bizon | 2016-02-19 | 1 | -0/+25 |
| | | | |||||
* | | | Merge branch 'saml-decoupling' into 'master' | Patricio Cano | 2016-02-19 | 3 | -4/+60 |
|\ \ \ | |||||
| * | | | Make new `allow_single_sign_on` feature backwards compatible | Patricio Cano | 2016-02-18 | 1 | -1/+5 |
| | | | | |||||
| * | | | Decouple SAML authentication from the default Omniauth logic | Patricio Cano | 2016-02-18 | 3 | -4/+56 |
| | | | | |||||
* | | | | Rename Entities::ForkedFromProject to Entities::BasicProjectDetails | Tomasz Maczukin | 2016-02-19 | 1 | -3/+3 |
| | | | | |||||
* | | | | Change `last_contact` to `contacted_at` | Tomasz Maczukin | 2016-02-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject | Tomasz Maczukin | 2016-02-19 | 1 | -7/+1 |
| | | | | |||||
* | | | | iChange `name` and `path` to `name_with_namespace` and `path_with_namespace` ↵ | Tomasz Maczukin | 2016-02-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | in `RunnerProjectDetails` | ||||
* | | | | Move :runner_id param to POST body when enabling specific runner in project | Tomasz Maczukin | 2016-02-19 | 1 | -1/+3 |
| | | | |