Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fix deploy key api 500 if key is empty | Dmitriy Zaporozhets | 2013-06-03 | 1 | -14/+16 | |
| | | ||||||
* | | Add api to collect owned user projects. Api deploy_key.create: Enable deploy ↵ | Dmitriy Zaporozhets | 2013-06-03 | 2 | -2/+32 | |
| | | | | | | | | key if it exist in other owned project | |||||
* | | Merge pull request #4115 from bke-drewb/apidocs | Dmitriy Zaporozhets | 2013-05-29 | 1 | -1/+1 | |
|\ \ | | | | | | | Update api docs and remove old attribute from User entity. | |||||
| * | | Update api docs and remove old attribute from User entity. | Drew Blessing | 2013-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity. Add color scheme ID to API User entity | |||||
* | | | Up grape version. Fix issue with raw content being escaped | Dmitriy Zaporozhets | 2013-05-27 | 1 | -0/+2 | |
| | | | ||||||
* | | | Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq ↵ | Dmitriy Zaporozhets | 2013-05-27 | 3 | -0/+293 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | into former03-feature_teams_api Conflicts: doc/api/README.md | |||||
| * | | [FEATURE] Basic user_teams api | Christian Simon | 2013-05-21 | 3 | -0/+293 | |
| | | | | | | | | | | | | | | | * Closing #3066 * Closing #3609 | |||||
* | | | split repositories and projects api | Dmitriy Zaporozhets | 2013-05-23 | 3 | -115/+134 | |
|/ / | ||||||
* | | Refactor API classes. So api classes like Gitlab::Issues become API::Issues | Dmitriy Zaporozhets | 2013-05-14 | 13 | -13/+51 | |
| | | ||||||
* | | Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes | Dmitriy Zaporozhets | 2013-05-07 | 2 | -71/+71 | |
|\ \ | | | | | | | Code cleanup: Replace old hashes and remove trailing spaces | |||||
| * | | remove trailing spaces | Andrey Kumanyaev | 2013-05-05 | 2 | -71/+71 | |
| | | | ||||||
* | | | fix API route to delete project hook | Nihad Abbasov | 2013-05-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | modify api to work with new deploy keys | Dmitriy Zaporozhets | 2013-05-06 | 3 | -7/+6 | |
|/ / | ||||||
* | | Add support for git-archive in gitlab internal api | Dmitriy Zaporozhets | 2013-04-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #3209 from tsl0922/master | Dmitriy Zaporozhets | 2013-04-18 | 1 | -0/+1 | |
|\ \ | | | | | | | Fix: API 500 error when project does not exists | |||||
| * | | Fix: API 500 error when project does not exists | tsl0922 | 2013-03-14 | 1 | -0/+1 | |
| | | | ||||||
* | | | Paginate users in users api | Dmitriy Zaporozhets | 2013-04-16 | 1 | -0/+1 | |
| | | | ||||||
* | | | Fixed API file raw functionality, Fixed tree controller tests. Added ↵ | Dmitriy Zaporozhets | 2013-04-03 | 1 | -5/+7 | |
| | | | | | | | | | | | | BlobController specs | |||||
* | | | Project.repository should never be nil so you can call repository.exists? or ↵ | Dmitriy Zaporozhets | 2013-04-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | repository.empty? Also specify separate project factory for project with filled repo | |||||
* | | | Fix notify specs. Fix merge request close via api | Dmitriy Zaporozhets | 2013-03-28 | 1 | -0/+2 | |
| |/ |/| | ||||||
* | | Dont show blocked users in autocomplete | Dmitriy Zaporozhets | 2013-03-19 | 1 | -0/+1 | |
| | | ||||||
* | | add attachemnts support for wall | Dmitriy Zaporozhets | 2013-03-19 | 1 | -0/+1 | |
| | | ||||||
* | | load notes for wall via api | Dmitriy Zaporozhets | 2013-03-19 | 1 | -0/+4 | |
| | | ||||||
* | | API docs updated | Alex Denisov | 2013-03-19 | 1 | -1/+1 | |
| | | ||||||
* | | Abilities added to /user and /sign_in requests | Alex Denisov | 2013-03-18 | 3 | -4/+8 | |
| | | ||||||
* | | Result of misspellings run. | Kevin Lyda | 2013-03-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | Most of these are comments but a few are strings for users. Might be an idea to run this from time to time: https://github.com/lyda/misspell-check It runs mostly clean now. | |||||
* | | Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into ↵ | Dmitriy Zaporozhets | 2013-03-15 | 1 | -1/+9 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DanKnox-use_gollum_wikis Conflicts: app/views/layouts/project_resource.html.haml app/views/wikis/edit.html.haml app/views/wikis/pages.html.haml app/views/wikis/show.html.haml spec/features/gitlab_flavored_markdown_spec.rb | |||||
| * | | Replace current Wiki system with Gollum Wikis. | Dan Knox | 2013-03-09 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces the old database backed Wiki system with the excellent Gollum git based Wiki system. The UI has been updated to allow for utilizing the extra features that Gollum provides. Specifically: * Edit page now allows you to choose the content format. * Edit page allows you to provide a commit message for the change. * History page now shows Format, Commit Message, and Commit Hash. * A new Git Access page has been added with the Wiki Repo URL. * The default page has been changed to Home from Index to match the Gollum standard. The old Wiki model has been left in tact to provide for the development of a migration script that will move all content stored in the old Wiki system into new Gollum Wikis. | |||||
* | | | add api users filter and integrate users select2 | Dmitriy Zaporozhets | 2013-03-13 | 1 | -1/+2 | |
| |/ |/| | ||||||
* | | Reduce amount of user info provided with internal api | Dmitriy Zaporozhets | 2013-03-11 | 2 | -1/+5 | |
| | | ||||||
* | | Merge branch 'master' into api/system_hooks_adjustments | Sebastian Ziebell | 2013-03-07 | 1 | -0/+3 | |
|\ \ | |/ | ||||||
| * | Merge pull request #2835 from Asquera/fixes/api | Dmitriy Zaporozhets | 2013-03-07 | 8 | -33/+129 | |
| |\ | | | | | | | Fix API return codes | |||||
| * | | block user should not be able to push | Dmitriy Zaporozhets | 2013-03-07 | 1 | -0/+3 | |
| | | | ||||||
* | | | API: system hooks API functions and documentation updated | Sebastian Ziebell | 2013-03-07 | 1 | -5/+15 | |
| |/ |/| | | | | | | | | | * updated system hooks documentation and code comments * fixed access to system hooks if no user given resulting in a `500 Server Error` * added tests | |||||
* | | API: fixes project creation and removed redundant info | Sebastian Ziebell | 2013-03-07 | 2 | -6/+3 | |
| | | ||||||
* | | Merge branch 'master' into fixes/api, code clean up and tests fixed | Sebastian Ziebell | 2013-03-07 | 5 | -0/+175 | |
|\ \ | |/ | | | | | | | | | Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb | |||||
| * | Merge pull request #3146 from amacarthur/AdminAPIs | Dmitriy Zaporozhets | 2013-03-06 | 3 | -0/+70 | |
| |\ | | | | | | | Additional Admin APIs | |||||
| | * | Additional Admin APIs | Angus MacArthur | 2013-03-05 | 3 | -0/+70 | |
| | | | ||||||
| * | | Merge pull request #3149 from m4tthumphrey/api-deploy-keys | Dmitriy Zaporozhets | 2013-03-06 | 1 | -0/+43 | |
| |\ \ | | | | | | | | | Added methods to manage project deploy keys via API | |||||
| | * | | Project deploy keys API | Matt Humphrey | 2013-03-05 | 1 | -0/+43 | |
| | |/ | ||||||
| * | | System hooks API. | Matt Humphrey | 2013-03-06 | 1 | -0/+60 | |
| |/ | ||||||
* | | API: refactored and simplified error handling in merge requests API | Sebastian Ziebell | 2013-03-05 | 2 | -18/+8 | |
| | | ||||||
* | | Fixes api | Sebastian Ziebell | 2013-03-05 | 1 | -2/+1 | |
| | | ||||||
* | | Merge branch 'master' into fixes/api | Sebastian Ziebell | 2013-03-05 | 2 | -4/+4 | |
|\ \ | |/ | | | | | | | Conflicts: lib/api/projects.rb | |||||
| * | User's blocked field refactored to use state machine | Andrew8xx8 | 2013-03-04 | 1 | -2/+2 | |
| | | ||||||
| * | Missed comma. | Matt Humphrey | 2013-03-01 | 1 | -1/+1 | |
| | | ||||||
| * | Added namespace_id to project creation via API | Matt Humphrey | 2013-03-01 | 1 | -1/+2 | |
| | | | | | | This allows you to set the namespace ID for projects via the the API. By default it is created for the current user. You can assign it to the global namespace by passing `GLN` which translates to 'Global Namespace'. | |||||
* | | API: fixed adding a note | Sebastian Ziebell | 2013-02-27 | 1 | -1/+1 | |
| | | | | | | | | Now the correct attribute is checked if it's available or not. Also fixed a test. | |||||
* | | Merge branch 'master' into fixes/api | Sebastian Ziebell | 2013-02-27 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | proper fix for #2300 | Nihad Abbasov | 2013-02-27 | 1 | -1/+1 | |
| | |