summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'internal_recovery_api' into 'master' Douwe Maan2016-09-021-5/+9
|\ | | | | | | | | | | | | Minor edits to two_factor_recovery_codes API error catching Minor fixes to the `two_factor_recovery_codes` internal API making the conditionals more sane. Thanks @DouweM for pointing it out. See merge request !6000
| * Minor edits to two_factor_recovery_codes API error catchingDrew Blessing2016-08-311-5/+9
| |
* | Merge branch 'issue_19734' into 'master' Douwe Maan2016-09-013-4/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project tools visibility level ## part of #19734 ![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5606
| * | Project tools visibility levelFelipe Artur2016-09-013-4/+12
| | |
* | | Merge branch 'merge-request-sha-info' into 'master' Douwe Maan2016-09-011-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request sha info ## What does this MR do? Exposes `sha` and `merge_commit_sha` items in `MergeRequest` API endpoint data. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? It's useful information. ## What are the relevant issue numbers? Closes #20456. ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5966
| * | entities: expose {,merge_commit_}sha in MergeRequestBen Boeckel2016-08-311-0/+2
| | | | | | | | | | | | Fixes #20456.
* | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-312-11/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ability.rb into Policies ## What does this MR do? Factors out `ability.rb` into a new abstraction - the "policy" (stored in `app/policies`). A policy is a class named `#{class_name}Policy` (looked up automatically as needed) that implements `rules` as follows: ``` ruby class ThingPolicy < BasePolicy def rules @user # this is a user to determine abilities for, optionally nil in the anonymous case @subject # this is the subject of the ability, guaranteed to be an instance of `Thing` can! :some_ability # grant the :some_ability permission cannot! :some_ability # ensure that :some_ability is not allowed. this overrides any `can!` that is called before or after delegate! @subject.other_thing # merge the abilities (can!) and prohibitions (cannot!) from `@subject.other_thing` can? :some_ability # test whether, so far, :some_ability is allowed end def anonymous_rules # optional. if not implemented `rules` is called where `@user` is nil. otherwise this method is called when `@user` is nil. end end ``` See merge request !5796
| * | | use a nil subject when we want to check global abilitieshttp://jneen.net/2016-08-302-2/+2
| | | |
| * | | remove Ability.abilitieshttp://jneen.net/2016-08-301-5/+1
| | | |
| * | | remove six, and use a Set insteadhttp://jneen.net/2016-08-301-5/+1
| | | |
* | | | Add BroadcastMessage API implementationRobert Speicher2016-08-313-0/+105
| | | |
* | | | Merge branch 'api-confidential-issues' into 'master' Robert Speicher2016-08-312-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose issue confidentiality flag. ## What does this MR do? This MR adds support for confidential issues the the API. The property as exposed and users can create or update confidential issues. ## What are the relevant issue numbers? Closes #17199 See merge request !5384
| * | | | API: Expose issue#confidentialapi-confidential-issuesRobert Schilling2016-08-312-2/+13
| | |/ / | |/| |
* | | | Don't expose a user's private token in the `/api/v3/user` API.Timothy Andrew2016-08-311-1/+1
|/ / / | | | | | | | | | | | | | | | - This would allow anyone with a personal access token (even a read-only token, once scopes are implemented) to escalate their access by obtaining the private token.
* | | Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-302-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
| * | | Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-302-6/+8
| | | |
| * | | Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-302-3/+7
| | | |
* | | | Merge branch 'prevent_authored_awardable_votes' into 'master' Robert Speicher2016-08-301-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent authored awardable thumbs votes ## What does this MR do? This MR should prevent users from upvoting or downvoting issues/merge requests/notes authored by them. ## What are the relevant issue numbers? Closes #20913 See merge request !5841
| * | | Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-301-1/+1
| |\ \ \ | | |/ /
| * | | prevent authored awardable thumbs votesbarthc2016-08-281-1/+5
| | |/ | |/| | | | | | | | | | | | | prevent authored awardable thumbs votes prevent authored awardable thumbs votes
* | | Merge branch ↵Douwe Maan2016-08-301-16/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19721-issues-created-through-api-do-not-notify-label-subscribers' into 'master' user is now notified when creating an issue through the api Previously when a issue was created through our API it would not mail label subscribers, this MR aims to fix that - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19721 See merge request !5720
| * | if issue is not valid we revert back to the old labels when updatingtiagonbotelho2016-08-302-17/+2
| | |
| * | refactors update issue api request and some minor commentstiagonbotelho2016-08-302-16/+18
| | |
| * | adds test to check whether or not an email is sent to label subscribers ↵tiagonbotelho2016-08-301-19/+6
| | | | | | | | | | | | after creating a new issue through the api
| * | user is now notified when creating an issue through the apitiagonbotelho2016-08-301-2/+16
| |/
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-267-14/+140
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifacts-from-ref-and-build-name * upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
| * Merge branch 'dz-merge-request-version'Douwe Maan2016-08-253-0/+59
| |\
| | * Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-222-3/+10
| | |\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1910-29/+200
| | |\ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1513-278/+363
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-122-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Fix project id param for merge request version APIDmitriy Zaporozhets2016-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Update merge request versions API to match styleguideDmitriy Zaporozhets2016-08-031-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-033-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-241-0/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add internal API to recovery 2FA ## What does this MR do? Add an internal API to make SSH 2FA recovery possible. Related to gitlab-org/gitlab-shell!74 See merge request !5510
| | * | | | | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-241-0/+25
| | | | | | |
| * | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-242-10/+34
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Sentry logging to API calls ## What does this MR do? This MR adds support for Sentry logging in the API. ## Are there points in the code the reviewer needs to double check? Since the `Grape::Middleware` doesn't have a `params` method, I had to define one using the Rack Request. ## Why was this MR needed? We are missing a lot of useful errors in the API causing git push/pull errors ## What are the relevant issue numbers? #21043 See merge request !5882
| | * | | | | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-242-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21043
| * | | | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-242-3/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the API ## What does this MR do? Adds the 'only_allow_merge_if_build_succeeds' project setting in the API. ## Are there points in the code the reviewer needs to double check? No, but maybe this code is not enough for ACLs or the like. ## Why was this MR needed? Because that's a very useful setting to change via automation (through the API) ## What are the relevant issue numbers? Closes #21085, closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20088. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5930
| | * | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-242-3/+7
| | | | | | | |
| * | | | | | | Merge branch 'entity-api-web-url' into 'master' Douwe Maan2016-08-241-0/+12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api: expose web_url for project entities ## What does this MR do? Adds a `web_url` field to project snippet, issues, and merge request API returned objects. ## Are there points in the code the reviewer needs to double check? Tests. Are they sufficient? (I'm working on getting them to pass.) ## Why was this MR needed? Creating the URL for an MR or issue from the MR is tedious in API libraries; it's easy for Gitlab to just provide it. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5631
| | * | | | | | api: expose web_url for project entitiesBen Boeckel2016-08-241-0/+12
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows web hooks to have a URL back to entities without having to generate it themselves.
| * | | | | | api: expose wiki_page_events project hook field in the APIBen Boeckel2016-08-242-1/+3
| |/ / / / /
* | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-242-7/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | artifacts-from-ref-and-build-name * upstream/master: (192 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
| * | | | | entities: make Environment inherit EnvironmentBasicBen Boeckel2016-08-231-4/+3
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-185-0/+157
| |\ \ \ \
| * | | | | Add expiration date to group membershipsSean McGivern2016-08-182-6/+9
| | | | | |
| * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1818-308/+496
| |\ \ \ \ \