Commit Graph
304 Commits
Author SHA1 Message Date
Valery Sizov 4e321ec11c Merge branch 'improve-group-members-api' into 'master'
Improve group members api

Related #1720

See merge request !1225
2014-10-29 13:42:56 +00:00
Dmitriy Zaporozhets eea6a8a17d Dont allow guests..developers to manage group members
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-29 13:38:00 +02:00
Dmitriy Zaporozhets f6491508fe Split group members api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-29 13:31:23 +02:00
Dmitriy Zaporozhets 576a80e97c Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into mr-vinn/gitlab-ce-api-project-delete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
2014-10-28 16:14:40 +02:00
Dmitriy Zaporozhets f3c120d25a Add failing test that should be green after group members api get fixed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-28 16:00:03 +02:00
Vinnie Okada 41518a467d Remove :keep_repo option
Always delete repositories from the filesystem when deleting a project.
2014-10-22 21:08:19 -05:00
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
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
Vinnie Okada 68b5ac7f18 Add option to keep repo on project delete
Update the project API controller to use `Projects::DestroyService`
instead of calling `Project#destroy` directly.

Also add an optional parameter, `:keep_repo`, that allows a project to
be deleted without deleting the repository, wiki, and satellite from
disk.
2014-10-07 15:21:00 -05:00
Marin Jankovski 86d5a63e5e Fix failing api specs. 2014-10-06 10:19:11 +02: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
Dmitriy Zaporozhets 4c52ff5184 Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-09-30 12:17:57 +03:00
Dmitriy Zaporozhets e145f46a93 Fix contributors api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-30 11:56:48 +03: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 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
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
Marin Jankovski f37b4cc5ad Different created_at and updated_at time in api merge_requests spec. 2014-09-15 11:54:49 +02:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02: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 bdbadebe3e Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +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 a83975ab8d API: Create project - make sure project path is respected
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-09 10:48:58 +03:00
Dmitriy Zaporozhets 9f505954a6 Fix tests for CI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-06 13:20:37 +03:00
Dmitriy Zaporozhets 3a971ca9ef Fix tests by using non-exist tag names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-05 13:12:41 +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
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
jubianchiandjubianchi 0ac4a933ff Filters issues by labels via API 2014-09-04 14:41:31 +02: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 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 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 7f99aa57a2 Fix specs for internal api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-02 11:35:34 +03:00
jubianchiandjubianchi 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
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02: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
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Dmitriy Zaporozhets e4c6dbe35f Fix api files specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 09:57:15 +03:00
Dmitriy Zaporozhets 7e1680934b Fix API branch specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 17:30:28 +03:00
Dmitriy Zaporozhets 72053703e8 Fix API repository specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 15:41:02 +03:00
Dmitriy Zaporozhets 70f868b737 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 16:05:43 +03:00