| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | 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 | |
| | | | | | ||||||
| * | | | | Modify and fix output of delete and update of a runner | Tomasz Maczukin | 2016-02-19 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Modify runner projects selecting method in runners API | Tomasz Maczukin | 2016-02-19 | 2 | -8/+4 | |
| | | | | | ||||||
| * | | | | Fix runners filtering | Tomasz Maczukin | 2016-02-19 | 1 | -2/+6 | |
| | | | | | ||||||
| * | | | | Limit projects to user available projects if user is not an admin | Tomasz Maczukin | 2016-02-19 | 2 | -2/+12 | |
| | | | | | ||||||
| * | | | | Modify authentication check methods in runners API | Tomasz Maczukin | 2016-02-19 | 1 | -24/+22 | |
| | | | | | ||||||
| * | | | | Add token to runner details output in API | Tomasz Maczukin | 2016-02-19 | 2 | -1/+2 | |
| | | | | | ||||||
| * | | | | Add associated project info to runner details output | Tomasz Maczukin | 2016-02-19 | 1 | -0/+7 | |
| | | | | | ||||||
| * | | | | Split `/runners` entrypoint to `/runners` and `/runners/all` | Tomasz Maczukin | 2016-02-19 | 1 | -9/+12 | |
| | | | | | ||||||
| * | | | | Add some fixes in runners API documentation | Tomasz Maczukin | 2016-02-19 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Fix runners filtering in API | Tomasz Maczukin | 2016-02-19 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Add missing methods documentation; fix rubocop reported violation | Tomasz Maczukin | 2016-02-19 | 1 | -1/+36 | |
| | | | | | ||||||
| * | | | | Add feature to enable/disable runner in project | Tomasz Maczukin | 2016-02-19 | 1 | -0/+26 | |
| | | | | | ||||||
| * | | | | Add basic runners management API | Tomasz Maczukin | 2016-02-19 | 3 | -0/+114 | |
| | |/ / |/| | | | | | | | | | | | | | | | | | - add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner | |||||
| * | | | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 1 | -1/+2 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | -----  |  See merge request !2800 | |||||
| | * | | Update Emoji asset path | Robert Speicher | 2016-02-12 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder. | |||||
| * | | | Revert "Merge branch 'saml-decoupling' into 'master' " | Douwe Maan | 2016-02-18 | 3 | -56/+4 | |
| | | | | | | | | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9. | |||||
| * | | | Merge branch 'saml-decoupling' into 'master' | Robert Speicher | 2016-02-18 | 3 | -4/+56 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782 | |||||
| | * | | | Decouple SAML authentication from the default Omniauth logic | Patricio Cano | 2016-02-18 | 3 | -4/+56 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-18 | 5 | -13/+28 | |
| |\ \ \ \ | |/ / / | | | | | | | | | cache-clear | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |