summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-sprite-task' into 'master' Dmitriy Zaporozhets2016-03-091-0/+121
|\
| * Add a `gemojione:sprite` Rake taskRobert Speicher2016-03-091-0/+121
* | 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`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`rs-snippets-dont-expireRobert Speicher2016-03-051-1/+1
* | | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-081-0/+2
|\ \ \ | |_|/ |/| |
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-041-0/+2
* | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-072-55/+26
|\ \ \
| * | | 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
* | | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Add YamlFrontMatterFilter to the PreProcessPipelineRobert Speicher2016-03-042-1/+30
| * | | Add a PreProcessPipelineRobert Speicher2016-03-023-0/+26
| |/ /
* | | Merge branch 'rs-wiki-pipeline-spec' into 'master' Douwe Maan2016-03-041-3/+5
|\ \ \ | |_|/ |/| |
| * | 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 Banzairs-filter-arrayRobert Speicher2016-03-0110-13/+37
| |/
* | Merge branch 'mail-room-config-without-rails' into 'master' Douwe Maan2016-03-021-4/+6
|\ \
| * | Fix `gitlab:incoming_email:check` task.Douwe Maan2016-02-291-4/+6
* | | Fix import from gitlab.comKazuki Sawada2016-03-021-1/+1
| |/ |/|
* | Merge branch 'fix/commit-status-api-improvement' into 'master' Douwe Maan2016-03-011-4/+6
|\ \
| * | 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
| |/
* | Merge branch 'rs-wiki-toc' into 'master' Douwe Maan2016-03-012-8/+33
|\ \
| * | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-tocRobert Speicher2016-02-232-8/+33
| |/
* | Merge branch 'comment-batch-size' into 'master' Douwe Maan2016-03-011-1/+1
|\ \
| * | Batch size >1000 does not pay offcomment-batch-sizeJacob Vosmaer2016-02-251-1/+1
| |/
* | Merge branch 'fix/project-wiki-ending' into 'master' Robert Speicher2016-02-291-3/+10
|\ \
| * | 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 `vbscript:` linksrs-data-linksRobert Speicher2016-02-231-1/+3
| * Sanitize `data:` linksRobert Speicher2016-02-211-4/+4
* | Merge branch 'uploads-700' into 'master' revert-53176717Marin Jankovski2016-02-231-6/+7
|\ \ | |/ |/|
| * Simplify permissions creationuploads-700Achilleas Pipinellis2016-02-101-1/+1
| * 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' 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
* | | Fix build api specs after rebaseGrzegorz Bizon2016-02-191-1/+1
View Lorry Controller Status