Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into remove-forks-from-projects-settings | Han Loong Liauw | 2015-10-17 | 6 | -16/+113 | |
|\ \ | ||||||
| * \ | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' | Dmitriy Zaporozhets | 2015-10-15 | 1 | -2/+10 | |
| |\ \ | ||||||
| | * | | Fix bug where merge request comments created by API would not trigger ↵ | Stan Hu | 2015-10-10 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715 | |||||
| * | | | Merge branch 'master' into git-archive-golanggit-archive-golang | Douwe Maan | 2015-10-15 | 5 | -2/+102 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrd | Valery Sizov | 2015-10-14 | 2 | -1/+13 | |
| | |\ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | Hide passwords to non-admin users in the services API | Alex Lossent | 2015-10-12 | 2 | -1/+13 | |
| | | |/ | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface | |||||
| | * | | [ci skip] Fix wrong comment | sue445 | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`) | |||||
| | * | | Fix broken tests | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix some changes | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update rendering | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Small bug fixes | Kamil Trzcinski | 2015-10-12 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Add Commit Status documentation | Kamil Trzcinski | 2015-10-12 | 1 | -10/+10 | |
| | | | | ||||||
| | * | | Add author to statuses | Kamil Trzcinski | 2015-10-12 | 2 | -1/+2 | |
| | | | | ||||||
| | * | | Fix commit status POST URL | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Implement Commit Status API | Kamil Trzcinski | 2015-10-12 | 3 | -1/+87 | |
| | |/ | ||||||
| * | | Let gitlab-git-http-server handle archive downloads | Jacob Vosmaer | 2015-10-08 | 1 | -12/+1 | |
| |/ | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server. | |||||
* | | Made suggested content changes based on MR Review | Han Loong Liauw | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs | |||||
* | | Adds ability to remove the forked relationship | Han Loong Liauw | 2015-10-13 | 1 | -1/+1 | |
|/ | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog | |||||
* | Fix rubocop warnings in lib | Guilherme Garnier | 2015-10-03 | 1 | -3/+2 | |
| | ||||||
* | api: add enable_ssl_verification to PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -2/+4 | |
| | ||||||
* | api: expose note_events and enable_ssl_verification for hooks | Ben Boeckel | 2015-09-24 | 1 | -1/+1 | |
| | ||||||
* | Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-api | Patricio Cano | 2015-09-22 | 1 | -0/+11 | |
| | | | | documentation said it was possible, but actually wasn't. | |||||
* | Merge branch 'restrict-user-api-integers' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 1 | -1/+1 | |
|\ | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156 | |||||
| * | Restrict users API endpoints to use integer IDs | Stan Hu | 2015-08-23 | 1 | -1/+1 | |
| | | | | | | | | Closes #2267 | |||||
* | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | |||||
| * | | Fix broken sort in merge request API | Stan Hu | 2015-09-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | Closes #2266 | |||||
* | | | fix specs. Stage 3 | Valery Sizov | 2015-09-15 | 2 | -36/+38 | |
| | | | ||||||
* | | | fix specs. Stage 2 | Valery Sizov | 2015-09-14 | 1 | -3/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-11 | 1 | -0/+10 | |
|\ \ \ | |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Added service API endpoint to retrieve service parameters | Petheo Bence | 2015-09-10 | 1 | -0/+10 | |
| | | | ||||||
* | | | Remove network from CI | Dmitriy Zaporozhets | 2015-09-11 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 5 | -55/+82 | |
|\ \ \ | |/ / | ||||||
| * | | Add API method for get user by ID of an SSH key | Artem V. Navrotskiy | 2015-09-03 | 3 | -0/+25 | |
| | | | ||||||
| * | | Drone CI service | Kirilll Zaitsev | 2015-09-02 | 2 | -55/+57 | |
| |/ | ||||||
* | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -2/+2 | |
|/ | ||||||
* | Merge branch 'remove-satellites' | Dmitriy Zaporozhets | 2015-08-19 | 2 | -25/+31 | |
|\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'master' into remove-satellites | Dmitriy Zaporozhets | 2015-08-17 | 1 | -0/+3 | |
| |\ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 2 | -25/+31 | |
| | | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | |||||
* | | | Merge pull request #9567 from bigsurge/bigsurge-patch-1 | Stan Hu | 2015-08-19 | 1 | -0/+1 | |
|\ \ \ | |_|/ |/| | | add CommitNote field expose :created_at | |||||
| * | | add CommitNote field expose :created_at | bigsurge | 2015-08-19 | 1 | -0/+1 | |
| | | | | | | | | | add CommitNote field expose :created_at | |||||
* | | | api: add 'system', 'upvote', and 'downvote' fields to note queries | Ben Boeckel | 2015-08-12 | 1 | -0/+3 | |
| |/ |/| | | | | | This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9. | |||||
* | | Merge branch 'revert-satellites' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 2 | -31/+25 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136 | |||||
| * | | Revert "Fix editing files via API" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -26/+24 | |
| | | | | | | | | | | | | This reverts commit 7bde6ae540bab5c93a83bfe26102674adba0eab5. | |||||
| * | | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Fix corrupted binary files when using API files endpoint | Stan Hu | 2015-08-09 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219 | |||||
* | | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-08-06 | 3 | -7/+126 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 3 | -7/+133 | |
| |\ \ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Fix indentation | Douwe Maan | 2015-07-31 | 1 | -11/+11 | |
| | | | | ||||||
| | * | | Merge branch 'master' into api-useremails | Douwe Maan | 2015-07-31 | 1 | -0/+10 | |
| | |\ \ | ||||||
| | * | | | Add ability to manage user email addresses via the API. | Douwe Maan | 2015-07-29 | 2 | -0/+115 | |
| | | | | |