summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-071-1/+1
|
* Merge branch ↵Kamil Trzciński2018-02-072-20/+2
|\ | | | | | | | | | | | | | | | | '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour' into 'master' Resolve "StuckCiJobsWorker wrongly detects, cancels 'stuck' builds when per-job timeout is more than an hour" Closes #38265, #42196, and #42750 See merge request gitlab-org/gitlab-ce!16756
| * Merge branch 'master' into ↵Matija Čupić2018-02-049-47/+48
| |\ | | | | | | | | | 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
| * | Refactor runner attribute caching implementationMatija Čupić2018-02-041-1/+1
| | |
| * | Move info update implementation to Ci::Runner modelMatija Čupić2018-01-291-26/+1
| | |
| * | Update runner info on all authenticated requestsMatija Čupić2018-01-292-1/+2
| | |
| * | Extend Runner API helpers with cache info storageMatija Čupić2018-01-291-5/+11
| | |
* | | Merge branch 'master' into '26388-push-to-create-a-new-project'Douwe Maan2018-02-061-1/+18
|\ \ \ | | | | | | | | | | | | # Conflicts: # lib/gitlab/path_regex.rb
| * | | Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-apiDmitriy Zaporozhets2018-02-061-1/+18
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Moves project creationg to git access check for git pushTiago Botelho2018-02-062-22/+13
| | | |
* | | | Abstracts ProjectMoved and ProjectCreated into a BaseProjectTiago Botelho2018-02-062-4/+8
| | | |
* | | | Move new project on push logic to a serviceTiago Botelho2018-02-062-31/+14
| | | |
* | | | Add specsTiago Botelho2018-02-062-11/+15
| | | |
* | | | Adds remote messsage when project is created in a push over SSH or HTTPTiago Botelho2018-02-062-5/+28
| | | |
* | | | Adds option to push over SSH to create a new projectTiago Botelho2018-02-061-1/+14
|/ / /
* | | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924
| * | | Make find_user_from_sources extensible for EELin Jen-Shin2018-02-051-1/+5
| | |/ | |/|
* | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-0512-0/+38
|\ \ \ | |/ / |/| | | | | | | | Track and act upon the number of executed SQL queries See merge request gitlab-org/gitlab-ce!16466
| * | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-0112-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we have more visibility in the number of SQL queries that are executed in web requests. The current threshold is hardcoded to 100 as we will rarely (maybe once or twice) change it. In production and development we use Sentry if enabled, in the test environment we raise an error. This feature is also only enabled in production/staging when running on GitLab.com as it's not very useful to other users.
* | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-021-4/+2
| | | | | | | | | | | | including/extending it
* | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-3/+3
|/ /
* | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-013-9/+9
| |
* | Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perfStan Hu2018-01-304-30/+25
| | | | | | | | | | | | | | | | | | | | | | endpoints We can simplify the code quite a bit and improve performance by using grape-entity merge fields: https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields Relates to #42030
* | Remove tap and use simplified method callOswaldo Ferreira2018-01-291-1/+2
| |
* | Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-statusOswaldo Ferreira2018-01-281-1/+8
|/
* Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"Douwe Maan2018-01-251-10/+1
| | | This reverts merge request !16626
* Merge branch 'search-100' into 'master'Yorick Peterse2018-01-241-1/+1
|\ | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * Use limit for search count queriessearch-100Jan Provaznik2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-241-1/+10
|\ \ | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
| * | Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-231-1/+10
| | |
* | | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| | | | | | | | | | | | | | | | | | To make it more clear to developers that the entity exposes the application secret, define a separate entity that only should be used when the secret is needed (probably only on creation).
* | | Add documentation about when the application API was addedToon Claes2018-01-241-0/+1
| | |
* | | Add application create APINicolas MERELLI2018-01-243-0/+33
| |/ |/|
* | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ↵Jacob Vosmaer (GitLab)2018-01-221-7/+8
|/ | | | pull
* Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-222-2/+2
|\ | | | | | | | | | | | | Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
| * Fix error on empty query for Members APIMark Fletcher2018-01-212-2/+2
| |
* | Merge branch ↵Rémy Coutable2018-01-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master' Resolve "Protected branches API route returns 404 for branches with dots" Closes #42231 See merge request gitlab-org/gitlab-ce!16591
| * | Fix protected branches API to accept name parameter with dotMark Fletcher2018-01-191-1/+1
| |/
* | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵Jan Christophersen2018-01-191-2/+2
|/ | | | with 'issues_enabled=false'"
* Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-182-2/+3
|\ | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * api support for merge_requests_events system hookAlexis Reigel2018-01-042-2/+3
| |
* | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'Sean McGivern2018-01-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix the user-agent detail API endpoint for project snippets Closes #42129 See merge request gitlab-org/gitlab-ce!16521
| * | Fix the user-agent detail API endpoint for project snippetsNick Thomas2018-01-171-1/+1
| | |
* | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-176-43/+89
|\ \ \ | | | | | | | | | | | | | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * | | Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-0/+1
| | | |
| * | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-163-33/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
| * | | Merge branch ↵Stan Hu2018-01-164-10/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API
* | | Adds sorting to deployments APIJacopo2018-01-171-1/+3
|/ / | | | | | | | | Adds sorting to deployments API through the `order_by` and sort `fields`.
* | Merge branch 'builds-api-nplusone' into 'master'Stan Hu2018-01-162-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "N+1 queries with /projects/:project_id/builds API endpoint" Closes #41957 See merge request gitlab-org/gitlab-ce!16445
| * | Use preload instead of includes to avoid joinsbuilds-api-nplusoneMatija Čupić2018-01-152-2/+2
| | |
View Lorry Controller Status