summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
|
* Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher2017-07-281-1/+1
|\ | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126
| * Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable2017-07-281-1/+1
| | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-281-2/+6
|/
* initShinya Maeda2017-07-281-13/+10
|
* Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-282-33/+68
|\ | | | | | | | | | | | | Add top-level /merge_requests API endpoint Closes #28422 See merge request !13060
| * Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-281-2/+2
| | | | | | | | Should have been part of !13004.
| * Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-281-1/+3
| | | | | | | | This matches the behavior of the /issues endpoint.
| * Add top-level /merge_requests API endpointToon Claes2017-07-271-31/+64
| | | | | | | | | | | | | | And add support for additional query parameters: - `author_id`: Returns merge requests created by the given user `id` - `assignee_id`: Returns merge requests assigned to the given user `id` - `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
* | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-272-86/+5
|\ \ | |/ |/| | | | | Add all ApplicationSettings attributes to the API See merge request !12851
| * Remove deprecated `repository_storage` attributebvl-add-all-settings-to-apiBob Van Landuyt2017-07-271-54/+1
| | | | | | | | In favor of the new `repository_storages`
| * Make the attribute list for application settings reusableBob Van Landuyt2017-07-272-32/+4
| |
* | DRY the branches API requirements definitionRémy Coutable2017-07-272-5/+10
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix the /projects/:id/repository/branches endpoint to handle dots in the ↵Rémy Coutable2017-07-271-7/+7
| | | | | | | | | | | | branch name when the project full patch contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-271-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
| * | Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-261-2/+2
| | |
| * | Add `rescue false`.blackst0ne2017-07-261-1/+1
| | |
| * | Refactor CSRF protectionblackst0ne2017-07-261-30/+2
| | |
| * | Add CSRF token verification to APIblackst0ne2017-07-261-4/+34
| |/
* | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-271-1/+7
|\ \ | |/ |/| | | | | | | | | Add author_id & assignee_id param to /issues API Closes #29430 See merge request !13004
| * Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+5
| |
| * Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+5
| | | | | | | | Allow issues filtering on `author_id` and `assignee_id`.
* | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-6/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove project_key from the JIRA configuration Closes #31129 See merge request !12050
| * | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-6/+0
| |/
* | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-252-10/+12
|\ \ | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
| * | Use struct instead of hashLin Jen-Shin2017-07-202-3/+3
| | |
| * | Use hash to return multiple objectsLin Jen-Shin2017-07-202-5/+5
| | |
| * | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-181-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (25 commits) Remove unneeded asserts and add tests for inactive RequestStore Rename the methods to make it fit with current name Follow feedback on the merge request Make sure it checks against the tag only when it's a tag Renamed Gitaly services fix transient rspec failure due to Poll.js race condition Refactor variables initialization in dropzone_input.js cache the cache key... avoid #respond_to? in Cache.id_for cache DeclarativePolicy.class_for at the class level Update 9.3-to-9.4.md fix padding on filtered search dropdown. Styles should only apply to li in list Cache Note#notable for commits and fix tests Add changelog entry Update the comments for the new functionality Use RequestStoreWrap for Commit#author Skip dead jobs queue for web hooks and project services Add RequestStoreWrap to cache via RequestStore Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker Add changelog entry ...
| * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1720-112/+364
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (638 commits) Simplify background migrations stealing code Expire cached user IDs that can see the performance after 5 minutes Promote visibility level helpers from Group to Namespace Fix off-by-one error in background migration retries Recover from all exceptions when stealing bg migration Fix label creation from new list for subgroup projects move click handler to button. when on the icon it wasn't triggered in firefox Fix incorrect AWS ELB metrics. Fix wrong link to docs in docs styleguide Update issue-related docs Refactor groups docs Add subgroups limitations to Pages docs Update Google launcher details Split docs on IP whitelist for monitoring access Update health check docs Bump fog-core to 1.44.3 and fog providers' plugins to latest Introduce have_gitlab_http_status Remove Repository#search_files Update Pipeline's badge count in Merge Request and Commits view to match real-time content Fixes the user order being overriden in the autocomplete controller ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-052-7/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (67 commits) Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Simplify authentication logic in the v4 users API for !12445. wait_for_requests is not needed when AJAX is not in play Don't resolve fork relationships for projects pending delete Clean up the ForkedProjectLink specs Remove unnecessary clear_stubs calls Add test for GitalyClient::Ref#find_ref_name DeleteMergedBranchesService should not delete protected branches Optimize creation of commit API by using Repository#commit instead of Repository#commits Update CHANGELOG.md for 9.3.4 Make autosize fields more performant and remove broken autosize handle Update GITLAB_SHELL_VERSION to 5.1.1 Fixed the y_label not setting correctly for each graph on the monitoring dashboard Refactor and copyedit "Using Docker images" docs ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-042-6/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (119 commits) Speed up operations performed by gitlab-shell Change the force flag to a keyword argument add image - issue boards - moving card copyedit == ee !2296 Reset @full_path to nil when cache expires Replace existing runner links with icons and tooltips, move into btn-group. add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Set force_remove_source_branch default to false. Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Make Project#ensure_repository force create a repo ...
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-2934-102/+185
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1168 commits) Job details won't scroll horizontally to show long lines Bring back branches badge to main project page Limit OpenGraph image size to 64x64 Improve changelog Split up MergeRequestsController Add parent_id back to the tests Make changelog more descriptive Improve tests text Rename members_count to members_count_with_descendants and expose only to group admins Fix a bug where an invalid sort param value was passed to Gitaly Drop default ORDER scope when calling a find method on a Sortable model Add tests for project import state transition: [:started] => [:finished] Add CHANGELOG Perform housekeeping only when an import of a fresh project is completed Strip trailing whitespace in relative submodule URL Adjust projects spec on namespace fields Add "members_count" and "parent_id" data on namespaces API Removes redundant pending delete checks Fix gitaly ref encoding bugs Add ProjectWiki#ensure_repository ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-075-33/+96
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Update explanation of job-level variable override to fit example Per discussion Make sketch dynamic and link back to production architecture
| * | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-062-7/+9
| | | | | | | | |
* | | | | | | | | Merge branch 'issue_34622' into 'master'Sean McGivern2017-07-257-157/+282
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones API endpoint Closes #34622 See merge request !12819
| * | | | | | | | | Add group milestones API endpointissue_34622Felipe Artur2017-07-217-157/+282
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-255-2/+112
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-242-10/+9
| | | | | | | |
* | | | | | | | Update grape gemdz-update-grapeDmitriy Zaporozhets2017-07-2021-0/+28
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New version of the gem returns 200 status code on delete with content instead of 204 so we explicitly set status code to keep existing behavior Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Renamed Gitaly servicesAndrew Newdigate2017-07-181-1/+1
|/ / / / / /
* | | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-144-6/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | | | | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-134-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | | | | | Handle case when BroadcastMessage.current is nilStan Hu2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094
* | | | | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-121-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Use view=simple for simplifying merge requests APIStan Hu2017-07-111-3/+3
| | | | | | |
* | | | | | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-112-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920
* | | | | | | Fix sort ordering with merge request APIsh-improve-mr-apiStan Hu2017-07-101-4/+3
| | | | | | |
* | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge ↵Stan Hu2017-07-101-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request Fixes a performance regression introduced in !12732
* | | | | | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-082-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | Closes #34159
* | | | | | Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove many N+1 queries with merge requests API See merge request !12726