summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-sprite-task' into 'master' Dmitriy Zaporozhets2016-03-091-0/+121
|\ | | | | | | | | | | | | | | | | | | | | | | Add a `gemojione:sprite` Rake task This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. See merge request !3130
| * Add a `gemojione:sprite` Rake taskRobert Speicher2016-03-091-0/+121
| | | | | | | | | | | | | | | | | | | | | | This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. [ci skip]
* | Retry spinach testsKamil Trzcinski2016-03-091-28/+34
| |
* | Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Bitbucket 'closed' issues were imported as 'opened' _Originally opened at !2930 by @iurisilvio._ - - - Bitbucket has an undocumented status `closed`. https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html Related to https://gitlab.com/gitlab-com/support-forum/issues/559 See merge request !2973
| * | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-071-1/+1
| | |
* | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-091-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
| * | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-051-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 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-081-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
* | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-072-55/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for cross project references for labels ## Summary Support for cross project references for labels. ## Rationale 1. Cross project label references are currently not supported in GitLab 1. `to_reference` method signature in `Label` model breaks the abstraction introduced in `Referable`. `concerns/referable.rb: def to_reference(_from_project = nil)` Signatures: ``` label.rb: def to_reference(format = :id) commit_range.rb: def to_reference(from_project = nil) commit.rb: def to_reference(from_project = nil) external_issue.rb: def to_reference(_from_project = nil) group.rb: def to_reference(_from_project = nil) issue.rb: def to_reference(from_project = nil) merge_request.rb: def to_reference(from_project = nil) milestone.rb: def to_reference(from_project = nil) project.rb: def to_reference(_from_project = nil) snippet.rb: def to_reference(from_project = nil) user.rb: def to_reference(_from_project = nil) ``` This MR suggests using `def to_reference(from_project = nil, format: :id)` which makes use of keyword arguments and preserves abstract interface. 1. We need support for cross project label references when we want to move issue to another project It may happen that issue description, system notes or comments contain reference to label and this reference will be invalid after moving issue to another project and will not be displayed correctly unless we have support for cross project references. Merge request that needs this feature: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831 I think that cross project label references may be useful, (example: `Hey, see our issues for CI in GitLab CE! - gitab-org/gitlab-ce~"CI"`). cc @JobV @DouweM @rspeicher See merge request !2966
| * | | Remove redundant code in cross project labels implementationGrzegorz Bizon2016-03-031-4/+0
| | | |
| * | | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-031-2/+6
| | | |
| * | | Add support for cross project references for labelsGrzegorz Bizon2016-03-031-54/+23
| | | |
| * | | Fix bug with return value in abstract reference filterGrzegorz Bizon2016-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When `object_class.link_reference_pattern` was `nil` because object being processed do not implemement link references `call` method returned `nil` instead of returning document, even if document has been processed in for basic reference pattern.
* | | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Reduce progress bar noise during brakeman run See merge request !3101
| * | | Reduce progress bar noise during brakeman runPeter Suschlik2016-03-041-1/+1
| | | |
* | | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-054-0/+55
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Properly display YAML front matter in Markdown See merge request !3072
| * | | Add YamlFrontMatterFilter to the PreProcessPipelineRobert Speicher2016-03-042-1/+30
| | | | | | | | | | | | | | | | | | | | This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting.
| * | | Add a PreProcessPipelineRobert Speicher2016-03-023-0/+26
| |/ /
* | | Merge branch 'rs-wiki-pipeline-spec' into 'master' Douwe Maan2016-03-041-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-specRobert Speicher2016-03-031-3/+5
| | |
* | | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-036-56/+48
| |/ |/|
* | 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.
* | 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
* | 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
| | |
View Lorry Controller Status