e41dadcb33
Doorkeeper integration
2014-12-24 15:38:07 +02:00
3a5ed5260b
Supporting for multiple omniauth provider for the same user
2014-12-04 13:03:55 +02:00
612b8806dd
Fix internal API for missing project or key
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 16:55:33 +02:00
53bf52f191
Better message for failed pushes because of git hooks
...
Conflicts:
lib/gitlab/git_access.rb
spec/lib/gitlab/git_access_spec.rb
2014-11-18 13:10:07 +02:00
940ed58e76
Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-11-12 13:19:35 +02:00
24276ed836
Merge pull request #8224 from liammonahan/master
...
Expose projects_limit through users API if UserFull.
2014-11-04 17:33:20 +02:00
2edf212a8b
Expose projects_limit through users API if UserFull.
2014-11-02 18:51:34 -05:00
ef9f8677e6
Expose author username in project events API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-31 12:08:45 +02:00
aa75a755ee
Merge branch 'api-delete-branch-json' into 'master'
...
Api delete branch json
Fixes gitlab/gitlabhq#1478
See merge request !1233
2014-10-31 09:38:24 +00:00
961a6bfcc2
API delete branch: render branch name json instead of true
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-30 17:28:59 +02:00
f0dd16d53e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-10-30 16:17:36 +02:00
822d9aa6ba
Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags.
2014-10-30 09:48:23 -04:00
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
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
f6491508fe
Split group members api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-29 13:31:23 +02:00
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
41518a467d
Remove :keep_repo option
...
Always delete repositories from the filesystem when deleting a project.
2014-10-22 21:08:19 -05:00
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
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
b5763e91cd
add gitlab-shell identification
2014-10-15 20:03:25 +03:00
62b322d7b5
Add Hipchat services API
2014-10-14 19:07:34 +02:00
2d23522107
Use :message key, not :error for File::Service.
2014-10-13 20:55:09 +02:00
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
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
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
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
2e9f5de868
Add parenthesis to function def with arguments.
2014-10-03 09:18:46 +02:00
b4963e9dda
Add tag_push_events to project hook api
2014-10-03 10:23:32 +04:00
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
f258a59ef6
Filters issues by milestone via API
2014-09-26 22:03:37 +02:00
430758653c
Adds comments to commits in the API
2014-09-26 10:58:11 +02:00
eaeb4a90d4
Fix branch API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 16:22:08 +03:00
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
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
ad47993ac4
Factor error and success methods from services.
2014-09-21 11:43:05 +02:00
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
685754b088
Fix typo in comment.
2014-09-16 08:44:50 +02:00
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
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
b99b2e60d5
Ordering and sorting for MR in api.
2014-09-15 11:54:49 +02:00
6558e52d90
More fixes to project members api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 12:01:45 +03:00
ce49f035cf
Fix access_level api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 11:55:36 +03:00
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
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
3162140dfa
Fix tag tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-05 09:36:11 +03:00
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
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
260fd2127c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2014-09-04 15:55:14 +03:00
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
0ac4a933ff
Filters issues by labels via API
2014-09-04 14:41:31 +02:00
Valery Sizov
Dmitriy Zaporozhets
Liam Monahan
Dmitriy Zaporozhets
Sean Edge
Valery Sizov
Vinnie Okada
Kevin Houdebert
Ciro Santilli
Kirill Zaitsev
Bernhard Kaindl
jubianchi
Jeroen Jacobs
Marin Jankovski
jubianchi