summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-022-2/+2
|
* Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-292-4/+4
| | | This reverts merge request !10845
* Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-282-4/+4
|\ | | | | | | | | | | | | Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845
| * Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-272-4/+4
| | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
* | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-271-1/+1
|\ \ | | | | | | | | | | | | Allow admins to sudo to blocked users See merge request !10842
| * | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, (for example) admins can't delete snippets for blocked users, which is an unexpected limitation. - We modify `authenticate!` to conduct the `access_api` policy check against the `initial_current_user`, instead of the user being impersonated. - Update CHANGELOG for !10842
* | | Wrong method call on notify_post_receive.Luigi Leoni2017-04-271-1/+1
| |/ |/|
* | Merge branch '26437-closed-by' into 'master' Rémy Coutable2017-04-261-0/+15
|\ \ | | | | | | | | | | | | | | | | | | Add issues/:iid/closed_by api endpoint Closes #26437 See merge request !10511
| * | Add issues/:iid/closed_by api endpointmhasbini2017-04-121-0/+15
| | |
* | | Ability to filter merge requests by labels and milestonesRobert Schilling2017-04-251-11/+14
| | |
* | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' Sean McGivern2017-04-253-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846
| * | | Don't display the `is_admin?` flag for user API responses.Timothy Andrew2017-04-253-5/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint
* | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating a merge request via the `/merge` endpoint we check the `mergeable` and `mergeable_state` status, these will return `false` if the application option only_allow_merge_if_pipeline_succeeds is enabled. We should skip CI checks if the request uses the merge_when_pipeline_succeeds param Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22740
* | | Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-211-2/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786
| * | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-201-2/+5
| | |
* | | Refactor changing files in web UIDouwe Maan2017-04-204-8/+8
| | |
* | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-8/+14
|\ \ \ | | | | | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509
| * | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-8/+14
| |/ /
* | | Remove unused user activities codeSean McGivern2017-04-143-13/+1
| | |
* | | Expose `last_activity_on` in the User APIRémy Coutable2017-04-142-9/+9
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Port 'Add user activities API' to CESean McGivern2017-04-143-1/+24
| | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
* | | Remove user activities table and use redis instead of PG for recording ↵James Lopez2017-04-141-0/+7
| | | | | | | | | | | | | | | | | | activities Refactored specs and added a post deployment migration to remove the activity users table.
* | | Add user activity service and spec. Also added relevant - NOT offline - ↵James Lopez2017-04-141-0/+12
|/ / | | | | | | | | | | | | migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
* | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-3/+9
| | | | | | | | | | | | | | | | | | | | When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
* | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| |
* | Separate CE params on Grape APIOswaldo Ferreira2017-04-106-30/+110
| |
* | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-102-18/+12
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Remove the User#is_admin? methodblackst0ne2017-04-0911-20/+20
|
* Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-071-7/+3
|\ | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-065-9/+22
| |\ | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-067-6/+7
| |\ \
| * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0616-91/+111
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| * | | | Fixed developers_can_push in RepoBranch API entityJames Edwards-Jones2017-04-041-6/+2
| | | | |
| * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
| | | | |
| * | | | Extract ProtectedRef ConcernJames Edwards-Jones2017-04-031-2/+2
| | | | |
* | | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-071-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'microsoft-teams-integration' into 'master' Douwe Maan2017-04-062-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | adds initial microsoft teams integration See merge request !10412
| * | | | adds relevant testsTiago Botelho2017-04-062-0/+15
| | | | |
* | | | | Optimise trace handling code to use streaming instead of full readKamil Trzciński2017-04-063-9/+7
| |_|_|/ |/| | |
* | | | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' Rémy Coutable2017-04-066-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProjectsFinder should handle more options Closes #28810 See merge request !9682
| * | | | ProjectsFinder should handle more optionsJacopo2017-04-066-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended ProjectFinder in order to handle the following options: - current_user - which user use - project_ids_relation: int[] - project ids to use - params: - trending: boolean - non_public: boolean - starred: boolean - sort: string - visibility_level: int - tags: string[] - personal: boolean - search: string - non_archived: boolean GroupProjectsFinder now inherits from ProjectsFinder. Changed the code in order to use the new available options.
* | | | Merge branch '30021-api-deploy_keys-can_push-is-not-honoured' into 'master' Rémy Coutable2017-04-061-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Enable creation of deploy keys with write access via the API Closes #30021 See merge request !10488
| * | | Enable creation of deploy keys with write access via the APIMark Fletcher2017-04-051-0/+1
| | | | | | | | | | | | | | | | * Documentation was incorrectly advertising the missing param
* | | | Merge branch '30195-document-search-param-on-api' into 'master' Sean McGivern2017-04-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "search" optional param and docs for V4 Closes #30195 See merge request !10358
| * | | | Add "search" optional param and docs for V430195-document-search-param-on-apiOswaldo Ferreira2017-04-051-0/+1
| |/ / / | | | | | | | | | | | | Notice that this param is being supported since V3, but we have not added the proper docs for it
* | | | Merge branch 'gitaly-refs' into 'master'Robert Speicher2017-04-051-1/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Implement Gitaly refs client See merge request !9291
| * | | Incorporate Gitaly client for refs serviceAlejandro Rodríguez2017-04-041-1/+4
| | | |
* | | | Added mock deployment and monitoring service with environments fixturesKamil Trzciński2017-04-051-1/+7
| |/ / |/| |
* | | Merge branch 'bug/api_milestone_merge_requests_scope' into 'master' Rémy Coutable2017-04-041-1/+1
|\ \ \ | |/ / |/| | | | | | | | Fixes milestone/merge_request API endpoint to really scope the results See merge request !10369
| * | Fixes milestone/merge_request API endpoint to really scope the resultsJoren De Groof2017-04-031-1/+1
| | | | | | | | | | | | | | | The MergeRequestsFinder uses the milestone_title instead of the milestone_id
View Lorry Controller Status