summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Hide confidential events in rubyBob Van Landuyt2018-12-171-30/+12
| | | | | | | | | | | | We're filtering the events using `Event#visible_to_user?`. At most we're loading 100 events at once. Pagination is also dealt with in the finder, but the resulting array is wrapped in a `Kaminari.paginate_array` so the API's pagination helpers keep working. We're passing the total count into that paginatable array, which would include confidential events. But we're not disclosing anything.
* Remove rails4 specific codeJasper Maes2018-12-161-1/+1
|
* Fix deprecation: Passing ActiveRecord::Base objects to ↵Jasper Maes2018-12-131-1/+1
| | | | sanitize_sql_hash_for_assignment
* Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-133-0/+44
|
* Merge branch ↵Grzegorz Bizon2018-12-101-0/+24
|\ | | | | | | | | | | | | | | | | '54626-able-to-download-a-single-archive-file-with-api-by-ref-name' into 'master' Add endpoint to download single artifact by ref Closes #54626 See merge request gitlab-org/gitlab-ce!23538
| * Add endpoint to download single artifact by refSteve Azzopardi2018-12-071-0/+24
| | | | | | | | | | | | | | | | | | | | Add a new endpoint `projects/:id/jobs/artifacts/:ref_name/raw/*artifact_path?job=name` which is the close the web URL for consistency sake. This endpoint can be used to download a single file from artifacts for the specified ref and job. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54626
* | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-072-5/+5
|\ \ | | | | | | | | | | | | Log and pass correlation-id between Unicorn, Sidekiq and Gitaly See merge request gitlab-org/gitlab-ce!22844
| * | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-062-5/+5
| |/ | | | | | | | | | | | | | | The Correlation ID is taken or generated from received X-Request-ID. Then it is being passed to all executed services (sidekiq workers or gitaly calls). The Correlation ID is logged in all structured logs as `correlation_id`.
* | Backports some changes from gitlab-ee!7885Rubén Dávila2018-12-071-1/+16
| |
* | Merge branch '54857-fix-templates-path-traversal' into 'master'Cindy Pallares2018-12-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [master]: Prevent a path traversal attack on global file templates Closes #2745 See merge request gitlab/gitlabhq!2677
| * | Prevent a path traversal attack on global file templatesNick Thomas2018-12-051-1/+1
| | | | | | | | | | | | | | | | | | The API permits path traversal characters like '../' to be passed down to the template finder. Detect these requests and cause them to fail with a 500 response code.
* | | Merge branch 'blob-count2' into 'master'Rémy Coutable2018-12-061-6/+1
|\ \ \ | |_|/ |/| | | | | | | | Support unlimited file search in web UI and API See merge request gitlab-org/gitlab-ce!23553
| * | Optimized file search to work without limitsJan Provaznik2018-12-061-6/+1
| | | | | | | | | | | | | | | | | | | | | * removed 100 limit on file search results because we load all results anyway * expensive processing (parsing match content, utf encoding) is done only for selected page in paginated output
* | | Rename project's pipelines relationFrancisco Javier López2018-12-053-4/+4
| | |
* | | Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' ↵Grzegorz Bizon2018-12-051-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Use read_repository scope on read-only files endpoints" Closes #54826 See merge request gitlab-org/gitlab-ce!23534
| * | Use read_repository scope on read-only files APIJames Lopez2018-12-041-0/+4
| |/
* | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into ↵Grzegorz Bizon2018-12-0450-61/+67
|\ \ | |/ | | | | | | | | fix/gb/encrypt-runners-tokens * commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81': (101 commits)
| * Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'Nick Thomas2018-11-3049-61/+61
| |\ | | | | | | | | | | | | Fix API::Namespaces routing to accept namepaces with dots See merge request gitlab-org/gitlab-ce!22912
| | * Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-2849-61/+61
| | | | | | | | | | | | | | | It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
| * | Merge branch 'if-40385-prohibit_impersonation' into 'master'Rémy Coutable2018-11-291-0/+6
| |\ \ | | | | | | | | | | | | | | | | Add config to prohibit impersonation See merge request gitlab-org/gitlab-ce!23338
| | * | Add config to disable impersonationImre Farkas2018-11-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab.impersonation_enabled config option defaulting to true to keep the current default behaviour. Only the act of impersonation is modified, impersonation token management is not affected.
* | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into ↵Grzegorz Bizon2018-11-292-1/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | fix/gb/encrypt-runners-tokens * commit '6852680584a1b22788f451457a6042eabf862a73': (57 commits)
| * | | Merge branch '33705-merge-request-rebase-api' into 'master'Sean McGivern2018-11-292-1/+38
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Add a rebase API endpoint for merge requests Closes #33705 See merge request gitlab-org/gitlab-ce!23296
| | * | Allow the status of a rebase to be determinedNick Thomas2018-11-282-1/+12
| | | |
| | * | Add a rebase API endpoint for merge requestsNick Thomas2018-11-271-0/+26
| | |/
* | | Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-285-4/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * master: (243 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml
| * | Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-281-2/+7
| |\ \ | | | | | | | | | | | | | | | | Removes all the irrelevant code and columns that were migrated from the Project… See merge request gitlab-org/gitlab-ce!21497
| | * | Removes all the irrelevant import related code and columnsTiago Botelho2018-11-271-2/+7
| | |/ | | | | | | | | | | | | Clears the import related columns and code from the Project model over to the ProjectImportState model
| * | Merge branch 'lock-trace-writes' into 'master'Stan Hu2018-11-271-0/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | Lock writes to trace stream Closes #51502 See merge request gitlab-org/gitlab-ce!23332
| | * Lock writes to trace streamKamil Trzciński2018-11-271-0/+4
| | |
| * | Set content disposition attachment to several endpointsFrancisco Javier López2018-11-232-0/+2
| |/
| * Merge branch 'optimise-job-request' into 'master'Grzegorz Bizon2018-11-211-1/+2
| |\ | | | | | | | | | | | | Use cached size when passing artifacts to Runner See merge request gitlab-org/gitlab-ce!23228
| | * Use cached size when passing artifacts to Runneroptimise-job-requestKamil Trzciński2018-11-201-1/+2
| | |
| * | Change param name for consistencyHeinrich Lee Yu2018-11-191-2/+2
| | |
| * | Add group projects API options for including shared and subgroupsHeinrich Lee Yu2018-11-191-1/+13
| |/
* | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokensGrzegorz Bizon2018-11-214-4/+23
|\ \ | |/ | | | | | | | | | | | | * dev/master: (302 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml
| * Merge branch '41875-allow-pipelines-to-be-deleted-by-project-owners' into ↵Grzegorz Bizon2018-11-161-0/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow pipelines to be deleted by project owners" Closes #41875 See merge request gitlab-org/gitlab-ce!22988
| | * Authorize DestroyPipelineService against pipelineMatija Čupić2018-11-131-1/+1
| | |
| | * Destroy pipeline in serviceMatija Čupić2018-11-121-4/+4
| | | | | | | | | | | | | | | Move all logic for destroying a Pipeline into a service so it's easily reusable.
| | * Implement MVC for Pipeline deletion APIMatija Čupić2018-11-121-0/+15
| | |
| * | Merge branch 'docs/rs-revert-api-version' into 'master'Evan Read2018-11-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | Revert API is going into 11.5, not 11.6. See merge request gitlab-org/gitlab-ce!23060
| | * | Revert API is going into 11.5, not 11.6.docs/rs-revert-api-versionRobert Speicher2018-11-141-1/+1
| | |/
| * | Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-152-3/+7
| |\ \ | | |/ | |/| | | | | | | Display impersonation token value only after creation See merge request gitlab-org/gitlab-ce!22916
| | * Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-122-3/+7
| | | | | | | | | | | | | | | Since we migrated all PersonlAccessTokens to store only its hash in the DB, the token value can no longer be shown to the user.
* | | Remove Rubocop override that is no longer necessaryGrzegorz Bizon2018-11-201-2/+0
| | |
* | | Find a runner using encrypted project / group tokensGrzegorz Bizon2018-11-201-2/+2
|/ /
* | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-121-0/+9
|\ \ | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | Add Discord integrationblackst0ne2018-10-301-0/+9
| | |
* | | Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-091-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
| * | | Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-091-3/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
View Lorry Controller Status