summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-253-11/+16
|\
| * Add API support for looking up a user by usernameStan Hu2015-12-241-4/+10
| | | | | | | | Needed to support Huboard
| * Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
| | * Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-1/+1
| | |
| * | Add project permissions to all project API endpointsStan Hu2015-12-221-3/+3
| |/ | | | | | | This standardizes all the project API formats. Also needed to support Huboard.
* | Fix rubocop complainsDmitriy Zaporozhets2015-12-181-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-172-1/+13
|\ \ | |/
| * Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-161-0/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
| | * Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-0/+11
| | | | | | | | | | | | Fixes #4112
| * | Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
| |/
| * Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-0/+1
| |\ | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Add open_issues_count to project APIStan Hu2015-12-111-0/+1
| | | | | | | | | | | | This is needed to support Huboard and a generally useful value.
| * | Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
| | |
* | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-157-9/+67
|\ \ \ | |/ /
| * | Fix triggers testsKamil Trzcinski2015-12-111-1/+1
| | |
| * | Reimplement Trigger APIKamil Trzcinski2015-12-113-0/+53
| | |
| * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-114-7/+9
| | |
| * | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-102-2/+5
| |/
* | Merge branch 'master' into ee_masterValery Sizov2015-12-142-28/+37
|\ \ | |/
| * Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-0/+12
| |\ | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| * \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-2/+6
| |\ \
| * \ \ Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-073-8/+56
| |\ \ \
| * | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-022-14/+9
| | | | |
| * | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-23/+13
| | | | |
| * | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-187-57/+150
| |\ \ \ \
| * | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-22/+46
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-094-2/+37
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-081-2/+6
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-051-2/+6
| | | |_|/ | | |/| | | | | | | | | | | | Closes #3864
| * | | | Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-072-0/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'extend-events-api'Dmitriy Zaporozhets2015-12-041-0/+3
| | |\ \ \
| | | * | | Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+16
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add API group projects endpoint.Douwe Maan2015-12-071-0/+12
| |/ / /
| * | | Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-221-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
| | * | | Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-apiRobert Schilling2015-11-211-0/+5
| | | | | | | | | | | | | | | | | | | | compatibility
| * | | | Allow editing a release in API via PUT methodRobert Schilling2015-11-211-0/+21
| | | | |
| * | | | Only allow to create a release if it does not exist yetRobert Schilling2015-11-211-2/+2
| | | | |
| * | | | Use POST to create a new release instead of PUTRobert Schilling2015-11-211-1/+1
| | | | |
| * | | | API: Return 404 if the tag for a release does not existRobert Schilling2015-11-211-3/+7
| | | | |
| * | | | Make tag API consistent for release featureRobert Schilling2015-11-212-5/+6
| |/ / /
| * | | award emojiValery Sizov2015-11-191-3/+1
| | |/ | |/|
* | | License information can now be retrieved via the APIPatricio Cano2015-11-303-0/+31
| | |
* | | Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-eeRobert Speicher2015-11-212-7/+38
|\ \ \
| * | | Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867
| * | | Merge branch 'consistent-tags-api' into 'master' Stan Hu2015-11-212-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tag API for release feature consistent Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`. On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404. @stanhu Can you review? @rspeicher This MR should go into 8.2 See merge request !1864
* | | | Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into ↵Dmitriy Zaporozhets2015-11-201-3/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 8-2-stable-ce-to-ee Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-191-3/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
* | | Merge remote-tracking branch 'origin/master' into ce-to-eeValery Sizov2015-11-164-54/+91
|\ \ \ | |/ /
| * | Merge branch 'releases-feature'Dmitriy Zaporozhets2015-11-164-54/+91
| |\ \
View Lorry Controller Status