summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Grzegorz Bizon2018-01-041-1/+1
|\ | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-031-1/+1
| | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | Merge branch ↵Robert Speicher2018-01-021-1/+3
|\ \ | |/ |/| | | | | | | | | 'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`" See merge request gitlab-org/gitlab-ce!16051
| * Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-membersRémy Coutable2017-12-211-1/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Gracefully handle orphaned write deploy keys in /internal/post_receivesh-handle-orphaned-deploy-keysStan Hu2017-12-241-3/+6
| | | | | | | | | | | | | | | | | | On GitLab.com, there are write deploy keys with no associated users. Pushes with these deploy keys end with an Error 500 since we attempt to look up redirect message. If there is no user, don't attempt to display a redirect message. Closes #41466
* | Support new chat notifications parameters in Services APIMark Fletcher2017-12-222-34/+151
|/ | | | | + Add support for the new separate channel and events settings * Dry up chat notifications in the service properties definitions
* Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-202-2/+3
|\ | | | | | | | | | | | | Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
| * Add optional `search` param for Merge Requests APIMark Fletcher2017-12-201-0/+1
| |
| * Employ declared_params in finder methods for MR and Issue API listsMark Fletcher2017-12-202-2/+2
| | | | | | | | - Ensure that unwanted params are no passed to actual finder classes
* | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-4/+4
|/ | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1513-50/+177
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| * sorting for tags apihaseeb2017-12-141-1/+6
| |
| * Adds ordering to projects contributors in APIJacopo2017-12-131-1/+3
| | | | | | | | | | | | | | Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name|email|commits. The available `sort` options are: asc|desc.
| * Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-081-0/+2
| | | | | | | | | | | | | | | | | | Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
| * Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-081-2/+15
| | | | | | | | | | | | | | | | | | [10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
| * Allow git pull/push on project redirectsMayra Cabrera2017-12-081-2/+11
| |
| * Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
| * Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-071-0/+3
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
| * Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'Sean McGivern2017-12-071-10/+8
| |\ | | | | | | | | | | | | CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747
| | * CE backport of ProtectedBranches API changesJames Edwards-Jones2017-12-071-10/+8
| | | | | | | | | | | | | | | In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516
| * | The API isn't using the appropriate services for managing forksFrancisco Javier López2017-12-071-10/+11
| | |
| * | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-052-9/+7
| |\ \ | | |/ | |/| | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
| | * Store expire_at in ci_job_artifactsKamil Trzcinski2017-12-031-4/+5
| | |
| | * Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-032-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata.
| | * Create Ci::ArtifactsZeger-Jan van de Weg2017-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow jobs/builds to have multiple artifacts, and to start seperating concerns from Ci::Build a new model is created: Ci::Artifact. Changes include the updating of the ArtifactUploader to adapt to a slightly different interface. The uploader expects to be initialized with a `Ci::Build`. Futher a migration with the minimal fields, the needed foreign keys and an index. Last, the way this works is by prepending a module to Ci::Build so we can basically override behaviour but if needed use `super` to get the original behaviour.
| * | Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-044-14/+98
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475
| | * | Not forcing to redefine preload_relationFrancisco Lopez2017-12-011-1/+1
| | | |
| | * | Undoing the change to ForkNetworkMemberFrancisco Lopez2017-12-011-11/+7
| | | |
| | * | Fixed BasicProjectDetail parentFrancisco Lopez2017-12-011-1/+1
| | | |
| | * | Removed binding.pryFrancisco Lopez2017-12-011-1/+0
| | | |
| | * | Removing blank lineFrancisco Lopez2017-12-011-1/+0
| | | |
| | * | Changes after rebaseFrancisco Lopez2017-12-011-3/+14
| | | |
| | * | Undoing debugging changeFrancisco Lopez2017-12-011-2/+2
| | | |
| | * | Comments from code review applied. Also switched forked_from_project and ↵Francisco Lopez2017-12-013-43/+52
| | | | | | | | | | | | | | | | ForkedProjectLinks to ForkNetworkMember
| | * | Refactored /projects and /user/:user_id/projects endpointsFrancisco Lopez2017-12-014-25/+77
| | | |
| | * | Code review comments appliedFrancisco Lopez2017-12-011-2/+2
| | | |
| | * | Small renamingFrancisco Lopez2017-12-011-4/+4
| | | |
| | * | More preloading improvement and added batch count servicesFrancisco Lopez2017-12-011-5/+20
| | | |
| | * | Preload project route to avoid N+1 queryStan Hu2017-12-011-1/+1
| | | |
| | * | Only serialize namespace essentials in group's projects API responseStan Hu2017-12-011-2/+4
| | | |
| | * | Omit the `all` call after Project#project_group_links to avoid unnecessary loadsStan Hu2017-12-011-1/+1
| | | |
| | * | Optimize API /groups/:id/projects by preloading associationsStan Hu2017-12-011-0/+1
| | |/ | | | | | | | | | Closes #40308
| * | Added default order to UserFinderFrancisco Javier López2017-12-042-0/+12
| |/
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3013-30/+123
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (170 commits) support ordering of project notes in notes api Redirect to an already forked project if it exists Reschedule the migration to populate fork networks Create fork networks for forks for which the source was deleted. Fix item name and namespace text overflow in Projects dropdown Minor backport from EE fix link that was linking to `html` instead of `md` Backport epic tasklist Add timeouts for Gitaly calls SSHUploadPack over Gitaly is now OptOut fix icon colors in commit list Fix star icon color/stroke Backport border inline edit Add checkboxes to automatically run AutoDevops pipeline BE for automatic pipeline when enabling Auto DevOps I am certainly weary of debugging sidekiq but I don't think that's what was meant Ensure MRs always use branch refs for comparison Fix issue comment submit button disabled on GFM paste Lock seed-fu at the correct version in Gemfile.lock Improve indexes on merge_request_diffs ...
| * support ordering of project notes in notes apihaseeb2017-11-291-1/+6
| |
| * Merge branch 'gitaly-ssh-upload-pack-opt-out' into 'master'Sean McGivern2017-11-291-4/+4
| |\ | | | | | | | | | | | | | | | | | | SSHUploadPack over Gitaly is now OptOut Closes gitaly#730 See merge request gitlab-org/gitlab-ce!15623
| | * SSHUploadPack over Gitaly is now OptOutgitaly-ssh-upload-pack-opt-outKim "BKC" Carlbäcker2017-11-291-4/+4
| | | | | | | | | | | | - Better gitaly-handling in /api/internal/allowed specs
| * | Add timeouts for Gitaly callsAndrew Newdigate2017-11-291-0/+3
| | |
| * | Merge branch 'tm/feature/list-runners-jobs-api' into 'master'Kamil Trzciński2017-11-282-7/+42
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432
| | * | Refactorize jobs finding logicTomasz Maczukin2017-11-281-6/+2
| | | |