Commit Graph

433 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets c624b45bd0
Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-21 11:46:45 +03:00
Dmitriy Zaporozhets ab2db486b8 Merge branch 'security-api-internal-publicity' into 'master'
Gitlab-shell identification

Part of gitlab/gitlabhq#1528

See merge request !1185
2014-10-20 10:47:43 +00:00
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +03:00
Kevin Houdebert 62b322d7b5 Add Hipchat services API 2014-10-14 19:07:34 +02:00
Ciro Santilli 2d23522107 Use :message key, not :error for File::Service. 2014-10-13 20:55:09 +02:00
Dmitriy Zaporozhets 06c91aa20e
Improve wiki path parsing in internal api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 17:28:55 +03:00
Dmitriy Zaporozhets 0bf99f6557
Developers can push to wiki repo. Protected branches does not affect wiki repo any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 16:05:24 +03:00
Dmitriy Zaporozhets ac6f032122 Merge pull request #7779 from Bugagazavr/hook_tag_push_events
Add tag push events to project hook api
2014-10-03 13:38:56 +03:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev b4963e9dda Add tag_push_events to project hook api 2014-10-03 10:23:32 +04:00
Bernhard Kaindl f030ee846e API: Initial support for forking a project via the API
This change adds POST /projects/fork/:id to the API for forking
a project into the namespace of the authenticated user, like the
"create fork" link in the GUI does. It also calls the same code.

Failure and permission checks (except for conflict) are already
implemented and handled in ForkService and the API, so the added
code is simple and does not alter anything.
2014-10-01 10:27:48 +02:00
jubianchi f258a59ef6 Filters issues by milestone via API 2014-09-26 22:03:37 +02:00
Dmitriy Zaporozhets eaeb4a90d4
Fix branch API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 16:22:08 +03:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets db12e2dc8d Merge pull request #7807 from cirosantilli/factor-service-error
Factor error and success methods from services.
2014-09-22 21:00:11 +03:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Marin Jankovski 685754b088 Fix typo in comment. 2014-09-16 08:44:50 +02:00
jubianchi 998cd3cb63 Improve error reporting on users API
* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
2014-09-16 01:25:24 +02:00
Dmitriy Zaporozhets 4f1bb91a75
Fix finder and tests for new membership models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 16:45:28 +03:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Dmitriy Zaporozhets 6558e52d90
More fixes to project members api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 12:01:45 +03:00
Dmitriy Zaporozhets ce49f035cf
Fix access_level api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 77c64a9b36
Replace project_access attribute with access_level in specs and API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 11:36:50 +03:00
Dmitriy Zaporozhets c69b8e0459
Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets 3162140dfa
Fix tag tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-05 09:36:11 +03:00
Dmitriy Zaporozhets 66516da3c1
Explicit issues order in API. Fixes tests for mysql. Again :)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-04 17:15:08 +03:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Dmitriy Zaporozhets 260fd2127c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-04 15:55:14 +03:00
Dmitriy Zaporozhets 9bb1d8fc8d Merge pull request #7382 from Razer6/git_ref_validation
Validate branch/tag-names and references WebUI, API
2014-09-04 15:52:42 +03:00
jubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02:00
Dmitriy Zaporozhets 93f15a4953
Explicit order of issues in API. Fixes specs for mysql db
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-03 22:57:32 +03:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API
Add specs for GitRefValidator
2014-09-03 13:08:35 +02:00
Dmitriy Zaporozhets cf53b361b9
Make sure /api/allowed return 200 status code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-03 13:33:44 +03:00
Dmitriy Zaporozhets 0a7dea29aa
/api/allowed use POST now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-03 09:06:16 +03:00
Dmitriy Zaporozhets 20c2e90222
Refactor finders. Prevent circular dependency error
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-02 15:28:27 +03:00
Dmitriy Zaporozhets 3a3c4ea436 Merge branch 'gitlab-shell-2-0' into 'master'
Modify GitLab to work with gitlab-shell 2.0

Related to #1516

See merge request !1057
2014-09-02 09:20:15 +00:00
Dmitriy Zaporozhets 0306a4e2e4
Rewrite GitAccess for gitlab-shell v2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-01 19:57:25 +03:00
jubianchi 4fdd21685c Filters issues by state via API 2014-09-01 13:51:40 +02:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Jacob Vosmaer 6dc24e3bcf Merge pull request #7527 from Razer6/api_labels_return_code
API: Fix labels return code
2014-08-18 17:16:32 +02:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Dmitriy Zaporozhets 6063a1e6c1
Add labels api authorization. Update permission doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 11:59:19 +03:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api
Implement complete labels API (create/delete/update)
2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation
Better label color validation, fixes #7454
2014-08-15 10:17:16 +03:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets 1d63464c82
Fix repository archive
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 71f87ffb66 Merge pull request #6788 from CingleVue/master
Patched `MergeRequest` to return more data.
2014-08-13 16:47:51 +03:00