summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
* | | 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
* | | Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-193-4/+60
|\ \ \
| * | | Make new `allow_single_sign_on` feature backwards compatiblePatricio Cano2016-02-181-1/+5
| * | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-183-4/+56
* | | | Rename Entities::ForkedFromProject to Entities::BasicProjectDetailsTomasz Maczukin2016-02-191-3/+3
* | | | Change `last_contact` to `contacted_at`Tomasz Maczukin2016-02-191-1/+1
* | | | Replace Entities::RunnerProjectDetails with Entities::ForkedFromProjectTomasz Maczukin2016-02-191-7/+1
* | | | iChange `name` and `path` to `name_with_namespace` and `path_with_namespace` ...Tomasz Maczukin2016-02-191-2/+2
* | | | Move :runner_id param to POST body when enabling specific runner in projectTomasz Maczukin2016-02-191-1/+3
* | | | Modify and fix output of delete and update of a runnerTomasz Maczukin2016-02-191-2/+2
* | | | Modify runner projects selecting method in runners APITomasz Maczukin2016-02-192-8/+4
* | | | Fix runners filteringTomasz Maczukin2016-02-191-2/+6
* | | | Limit projects to user available projects if user is not an adminTomasz Maczukin2016-02-192-2/+12
* | | | Modify authentication check methods in runners APITomasz Maczukin2016-02-191-24/+22
* | | | Add token to runner details output in APITomasz Maczukin2016-02-192-1/+2
* | | | Add associated project info to runner details outputTomasz Maczukin2016-02-191-0/+7