summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-135-10/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (285 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-132-6/+12
| |\ | | | | | | | | | | | | | | | | | | Extend projects API with CI data Reference #4264 See merge request !2303
| | * Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-113-31/+16
| | |
| | * Update ./doc/apiTomasz Maczukin2016-01-071-0/+9
| | |
| | * Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| | |
| | * Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
| | |
| * | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-1/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | * | Add API project upload endpointDouwe Maan2016-01-071-1/+11
| | | |
| * | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+21
| |/ /
| * | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-1/+1
| |\ \
| | * \ Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-061-1/+1
| | |\ \ | | | |/ | | |/| | | | | https://gitlab.com/Michi302/gitlab-ce
| | | * Make single user API endpoint return Entities::User instead of ↵Michi3022015-12-281-1/+1
| | | | | | | | | | | | | | | | Entities::UserBasic
| * | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-051-1/+1
| |/ / | | | | | | | | | target branch while builds were running
| * | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* | | Fix some typosTomasz Maczukin2016-01-131-2/+2
| | |
* | | Add some fixes after reviewTomasz Maczukin2016-01-131-13/+16
| | |
* | | Remove blank lineTomasz Maczukin2016-01-121-1/+0
| | |
* | | Update ./doc/apiTomasz Maczukin2016-01-071-1/+1
| | |
* | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-25/+16
| | |
* | | Fix a typo in method descriptionTomasz Maczukin2015-12-311-1/+1
| | |
* | | Add create feature to variables APITomasz Maczukin2015-12-311-0/+20
| | |
* | | Add missing 'not_found' checks in variables APITomasz Maczukin2015-12-311-0/+7
| | |
* | | Add delete feature to variables APITomasz Maczukin2015-12-311-0/+12
| | |
* | | Add update feature for variables APITomasz Maczukin2015-12-311-1/+20
| | |
* | | Add features for list and show details of variables in APITomasz Maczukin2015-12-313-0/+49
|/ /
* | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-1/+0
|/
* 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.
* 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
| |
* | 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 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 ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-081-2/+6
| |\
| * \ Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-072-0/+19
| |\ \
| * | | Add API group projects endpoint.Douwe Maan2015-12-071-0/+12
| | | |
* | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe 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 merge-if-greenZeger-Jan van de Weg2015-12-073-8/+56
|\ \ \ | |/ /
| * | 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>
View Lorry Controller Status