Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fix merge api and spec | Dmitriy Zaporozhets | 2015-08-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-07-31 | 1 | -0/+10 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | No more web url | Douwe Maan | 2015-07-30 | 1 | -2/+10 | |
| | | | | | ||||||
| * | | | | Add project star and fork count, group avatar URL and user/group web URL ↵ | Douwe Maan | 2015-07-28 | 1 | -1/+3 | |
| | |/ / | |/| | | | | | | | | | | attributes to API | |||||
* | | | | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 1 | -7/+5 | |
|/ / / | ||||||
* | | | Return comments in created order in merge request API | Stan Hu | 2015-07-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | Closes #1832 | |||||
* | | | Merge branch 'merge-request-wip-information' into 'master' | Stan Hu | 2015-07-15 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | api: expose work_in_progress flag See merge request !948 | |||||
| * | | api: expose work_in_progress flag | Ben Boeckel | 2015-07-10 | 1 | -0/+1 | |
| | | | ||||||
* | | | Fix transferring of project to another group using the API. | Douwe Maan | 2015-07-11 | 1 | -2/+2 | |
|/ / | ||||||
* | | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" | Stan Hu | 2015-07-09 | 1 | -3/+0 | |
| | | | | | | | | This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b. | |||||
* | | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-07-09 | 1 | -0/+3 | |
|/ | ||||||
* | Merge branch 'settings-via-api' into 'master' | Dmitriy Zaporozhets | 2015-07-07 | 3 | -0/+58 | |
|\ | | | | | | | | | | | | | | | API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934 | |||||
| * | Add tests and improve logic | Dmitriy Zaporozhets | 2015-07-06 | 1 | -1/+2 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Add docs and empty specs for applicaiton settings API | Dmitriy Zaporozhets | 2015-07-06 | 1 | -2/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | API to set application settings for admin | Dmitriy Zaporozhets | 2015-07-03 | 3 | -0/+58 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Allow user to be blocked and unblocked via the API | Steve Norman | 2015-07-03 | 1 | -0/+30 | |
|/ | ||||||
* | Merge branch 'rename-abilities' into 'master' | Dmitriy Zaporozhets | 2015-06-26 | 3 | -6/+6 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename abilities to correspond contoller/model action names write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code ``` def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end ``` See merge request !896 | |||||
| * | Rename abilities to correspond contoller/model action namesrename-abilities | Dmitriy Zaporozhets | 2015-06-26 | 3 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Only people who can manage issue can assign labels to itpermission-improvements | Dmitriy Zaporozhets | 2015-06-26 | 1 | -1/+1 | |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Add 2FA status to user admin API | Stan Hu | 2015-06-23 | 1 | -0/+1 | |
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391 | |||||
* | Fix error when deleting a user who has projects | Stan Hu | 2015-06-23 | 1 | -1/+1 | |
| | | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394 | |||||
* | Fix editing files via API | Dmitriy Zaporozhets | 2015-06-05 | 1 | -24/+26 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master' | Dmitriy Zaporozhets | 2015-06-05 | 1 | -1/+1 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | Order commit comments in API chronologically When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order. Same as !628 but with CI See merge request !768 | |||||
| * | Order commit comments in API chronologically | Martin Luder | 2015-05-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order. | |||||
* | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master' | Dmitriy Zaporozhets | 2015-06-04 | 1 | -5/+6 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace API available to all users ### What does this MR do? This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API. ### Why was this MR needed? Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9328 See merge request !708 | |||||
| * | | Make namespace API available to all users | Stan Hu | 2015-05-28 | 1 | -5/+6 | |
| | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9328 | |||||
* | | | Wrap group removal into service | Dmitriy Zaporozhets | 2015-06-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Disable changing of the source branch in merge request update API | Stan Hu | 2015-05-29 | 1 | -2/+6 | |
| | | | ||||||
* | | | You can not remove user if he/she is an only owner of group | Dmitriy Zaporozhets | 2015-05-28 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add support for Webhook note events | Stan Hu | 2015-05-21 | 1 | -2/+4 | |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745 | |||||
* | | Allow to configure gitlab_shell_secret location | Jakub Jirutka | 2015-05-16 | 1 | -1/+1 | |
| | | ||||||
* | | Add order option for projects API | Valery Sizov | 2015-05-14 | 1 | -1/+6 | |
| | | ||||||
* | | Improve Git access error messages. | Douwe Maan | 2015-05-13 | 1 | -19/+7 | |
| | | ||||||
* | | Added X-GitLab-Event header for web hooks | bugagazavr | 2015-05-08 | 1 | -1/+1 | |
|/ | ||||||
* | Add current_sign_in_at to api User | Sven Selberg | 2015-05-04 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-05-03 | 3 | -5/+18 | |
|\ | | | | | | | jubianchi-api-iid | |||||
| * | Query issues, merge requests and milestones with their IID through API | jubianchi | 2015-05-02 | 3 | -5/+18 | |
| | | ||||||
* | | Merge pull request #9066 from jirutka/fix-6417 | Dmitriy Zaporozhets | 2015-05-03 | 1 | -2/+2 | |
|\ \ | |/ |/| | Fix #6417: users with group permission should be able to create groups via API | |||||
| * | Fix #6417: users with group permission should be able to create groups via API | Robert Schilling | 2015-03-31 | 1 | -2/+2 | |
| | | ||||||
* | | Don't allow a merge request to be merged when its title starts with "WIP". | Douwe Maan | 2015-04-30 | 1 | -2/+2 | |
| | | ||||||
* | | Send 500 errors as JSON in the API | jubianchi | 2015-04-27 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "Added X-GitLab-Event header for web hooks" | Valery Sizov | 2015-04-27 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00. | |||||
* | | Added X-GitLab-Event header for web hooks | bugagazavr | 2015-04-25 | 1 | -1/+1 | |
| | | ||||||
* | | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 3 | -6/+6 | |
| | | ||||||
* | | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 1 | -2/+2 | |
| | | ||||||
* | | Track who created a group or project member. | Douwe Maan | 2015-04-14 | 1 | -1/+1 | |
| | | ||||||
* | | Use through-relation instead of manually mapping. | Douwe Maan | 2015-04-14 | 1 | -2/+1 | |
| | | ||||||
* | | Rename manage_group ability to admin_group for consistency with project. | Douwe Maan | 2015-04-14 | 2 | -4/+4 | |
| | | ||||||
* | | Include creator_id in project info of API | Christoph Dreis | 2015-04-10 | 1 | -0/+1 | |
| | |