summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Modify build pagination to use 'paginate' helperTomasz Maczukin2015-12-282-6/+5
| | | | | | | |
| | * | | | | | Add some fixes to builds APITomasz Maczukin2015-12-282-20/+27
| | | | | | | |
| | * | | | | | Fix example request urlTomasz Maczukin2015-12-241-1/+1
| | | | | | | |
| | * | | | | | Add builds API (listing, showing trace)Tomasz Maczukin2015-12-243-0/+95
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-145-6/+112
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | add-pagination-headers-to-api
| | * \ \ \ \ \ \ Merge branch 'ci/view-build-artifacts' into 'master' Grzegorz Bizon2016-01-141-1/+3
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add browser for build artifacts Discussion in #3426, closes #3426. See merge request !2123
| | | * | | | | | Refactor build artifacts upload API endpointGrzegorz Bizon2016-01-141-1/+3
| | | | | | | | |
| * | | | | | | | Revert changes to how the notes are paginated in the APIRémy Coutable2016-01-141-3/+9
| | | | | | | | |
| * | | | | | | | Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-142-20/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-143-0/+100
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix version Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Modify builds API documentation style [ci skip] Modify :ci_variable factory Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add some fixes after review Remove blank line Update ./doc/api Change :variable_id to :key as resource ID in API Fix a typo in method description Add create feature to variables API Add missing 'not_found' checks in variables API Add delete feature to variables API Add update feature for variables API Add features for list and show details of variables in API Conflicts: doc/api/README.md lib/api/entities.rb
| * | | | | | | | Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-142-7/+28
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-135-10/+47
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (285 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * | | | | | | | Fix some typosTomasz Maczukin2016-01-131-2/+2
| | | | | | | | |
| * | | | | | | | Add some fixes after reviewTomasz Maczukin2016-01-131-13/+16
| | | | | | | | |
| * | | | | | | | Remove blank lineTomasz Maczukin2016-01-121-1/+0
| | | | | | | | |
| * | | | | | | | Update ./doc/apiTomasz Maczukin2016-01-071-1/+1
| | | | | | | | |
| * | | | | | | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-25/+16
| | | | | | | | |
| * | | | | | | | Fix a typo in method descriptionTomasz Maczukin2015-12-311-1/+1
| | | | | | | | |
| * | | | | | | | Add create feature to variables APITomasz Maczukin2015-12-311-0/+20
| | | | | | | | |
| * | | | | | | | Add missing 'not_found' checks in variables APITomasz Maczukin2015-12-311-0/+7
| | | | | | | | |
| * | | | | | | | Add delete feature to variables APITomasz Maczukin2015-12-311-0/+12
| | | | | | | | |
| * | | | | | | | Add update feature for variables APITomasz Maczukin2015-12-311-1/+20
| | | | | | | | |
| * | | | | | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-313-0/+49
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-142-7/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Fix specs and rubocop warnings fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Ensure the API doesn't return notes that the current user shouldn't see Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG Broadcast Messages can now be edited Update Broadcast Message features Update BroadcastMessage model Update broadcast_message helper Simplify BroadcastMessage factory Simplify broadcast message JS Remove alert_type attribute from BroadcastMessage Move broadcast message form to a partial ...
| * | | | | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-5/+9
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| | * | | | | | Codestyle changesGabriel Mazetto2016-01-121-3/+3
| | | | | | | |
| | * | | | | | Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-081-4/+8
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-132-6/+12
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | fix/private-references
| * | | | | | | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-131-2/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-145-10/+47
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (280 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * | | | | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-132-6/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend projects API with CI data Reference #4264 See merge request !2303
| | * | | | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-113-31/+16
| | | | | | |
| | * | | | | Update ./doc/apiTomasz Maczukin2016-01-071-0/+9
| | | | | | |
| | * | | | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| | | | | | |
| | * | | | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-1/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | * | | | Add API project upload endpointDouwe Maan2016-01-071-1/+11
| | | | | |
| * | | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+21
| |/ / / /
| * | | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-061-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | https://gitlab.com/Michi302/gitlab-ce
| | | * | | Make single user API endpoint return Entities::User instead of ↵Michi3022015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Entities::UserBasic
| * | | | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | target branch while builds were running
| * | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* | | | Add some fixes after reviewTomasz Maczukin2016-01-132-13/+6
| | | |
* | | | Change 'trigger_id' to 'token' as resource ID in triggers APITomasz Maczukin2016-01-072-18/+9
| | | |
* | | | Get show details feature to triggers APITomasz Maczukin2016-01-051-0/+26
| | | |
* | | | Add create feature to triggers APITomasz Maczukin2016-01-051-0/+16
| | | |
* | | | Add delete feature to triggers APITomasz Maczukin2016-01-051-0/+19
| | | |
* | | | Add triggers feature to APITomasz Maczukin2016-01-042-0/+28
|/ / /
* | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-1/+0
|/ /
View Lorry Controller Status