summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-072-2/+2
|
* Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-0/+21
|\ | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383
| * Implement ability to update deploy keysAlexander Randa2017-06-021-0/+21
| |
* | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-0/+1
|\ \ | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| * | Prometheus settingsPawel Chojnacki2017-06-021-0/+1
| | |
* | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | Support descriptions for snippetsJarka Kadlecova2017-05-313-2/+6
| | | |
* | | | Merge branch '2563-backport-ee1942' into 'master'Grzegorz Bizon2017-06-072-7/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport some EE changes from adding shared_runners_minutes_limit to the API Closes gitlab-ee#2563 See merge request !11936
| * | | | Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-062-7/+1
| | | | |
* | | | | Introduce optimistic locking support via optional parameter last_commit_id ↵Roman Safronov2017-06-061-2/+9
| | | | | | | | | | | | | | | | | | | | on File Update API
* | | | | Accept a username for User-level Events APIMark Fletcher2017-06-061-2/+2
| | | | |
* | | | | Introduce an Events APIMark Fletcher2017-06-064-31/+87
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Meld the following disparate endpoints: * `/projects/:id/events` * `/events` * `/users/:id/events` + Add result filtering to the above endpoints: * action * target_type * before and after dates
* | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-052-21/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Git-over-HTTP rejections See merge request !11398
| * | | | Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
| | | | |
| * | | | Refactor construction of responseMichael Kozono2017-06-052-14/+22
| | | | |
| * | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-051-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
* | | | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
|/ / / /
* | | | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose import_status in Projects API Closes #19646 See merge request !11851
| * | | | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+2
| | |_|/ | |/| |
* | | | Merge branch '28694-hard-delete-user-from-api' into 'master'Douwe Maan2017-06-021-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the API See merge request !11853
| * | | | Allow users to be hard-deleted from the APINick Thomas2017-06-021-1/+2
| | |_|/ | |/| |
* | | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-026-7/+7
|/ / / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameterAthar Hameed2017-06-021-0/+1
| | |
* | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-012-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| * \ \ Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-015-2/+68
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-018-39/+199
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-315-5/+25
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * | | | | Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-265-6/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | API and doc for protected variablesLin Jen-Shin2017-05-252-1/+4
| | | | | | |
* | | | | | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-014-30/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently used path Closes #32036 See merge request !11824
| * | | | | | Add missing specsKamil Trzcinski2017-06-014-30/+11
| | | | | | |
| * | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ↵Kamil Trzcinski2017-06-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | used path
* | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keys See merge request !11607
| * | | | | | Add missing `can_push` parameter to POST /v3/deploy_keysRichard Clamp2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The v3 API documentation claims that `can_push` is supported when adding a deploy_key. https://gitlab.com/gitlab-org/gitlab-ce/blob/8-16-stable/doc/api/deploy_keys.md#add-deploy-key Here we make good on this promise by adding `can_push` as an optional parameter so grape can route it. This was copied from the v4 API.
* | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-014-6/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-314-6/+6
| | | | | | |
| * | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-294-6/+6
| | | | | | |
* | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-318-39/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-313-0/+59
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'tc-improve-project-api-perf' into 'master'Douwe Maan2017-05-315-39/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve /project API performance Closes #31855 and #31937 See merge request !11666
| | * | | | | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid the use of slow queries, remove some deprecated methods and encourage the use of ProjectFinder to find projects.
| | * | | | | | Add :owned param to ProjectFinderToon Claes2017-05-303-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use it in the API.
| | * | | | | | Use helper to construct Finder paramsToon Claes2017-05-303-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProjectsFinder and GroupFinder both support the same set of params. And the `/api/v4/projects` and `/api/v4/group/:id/projects` also support the same set of params. But they do not match the Finder params. So use a helper method to transform them.
| | * | | | | | Use ProjectFinder to filter the projectsToon Claes2017-05-302-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of trying to do the heavy lifting in the API itself, use the existing features of the ProjectFinder.
| | * | | | | | Handle `membership` in ProjectFinderToon Claes2017-05-302-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProjectFinder supports the `non_public` parameter. This can be used to find only projects the user is member of.
| | * | | | | | Build options hash after finding the list of projectsToon Claes2017-05-301-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this order makes more sense and makes the code easier to read.
| | * | | | | | Move ProjectsFinder to `present_projects` for simplificationToon Claes2017-05-301-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid passing parameters double, move all filtering to the `present_projects` helper.
| | * | | | | | Copy `filter_projects` helper to V3Toon Claes2017-05-301-0/+27
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | The helper will be modified in V4, so copy the original to V4 to keep the current behavior in V3.
| * | | | | | Merge branch '33000-tag-list-in-project-create-api' into 'master'Rémy Coutable2017-05-311-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tag_list param to project api Closes #33000 See merge request !11799
| | * | | | | | Add tag_list param to project apivanadium232017-05-311-0/+2
| | |/ / / / /