summaryrefslogtreecommitdiff
path: root/spec/requests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-142-5/+70
|\
| * Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-5/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Prevent ldap_blocked users from being blocked/unblocked by the APIGabriel Mazetto2016-01-081-5/+18
| | |
| * | Fix specs and rubocop warningsfix/private-referencesRémy Coutable2016-01-141-5/+6
| | |
| * | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-131-0/+51
| | |
* | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-132-0/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-0/+14
| |\ \ | | |/ | |/| | | | | | | | | | | | | 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-0/+14
| | |
| * | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+21
| |/
| * Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Modify :ci_variable factoryTomasz Maczukin2016-01-131-2/+2
| |
* | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-27/+15
| |
* | Add create feature to variables APITomasz Maczukin2015-12-311-0/+38
| |
* | Add missing 'not_found' checks in variables APITomasz Maczukin2015-12-311-0/+18
| |
* | Add delete feature to variables APITomasz Maczukin2015-12-311-1/+28
| |
* | Add update feature for variables APITomasz Maczukin2015-12-311-8/+44
| |
* | Add features for list and show details of variables in APITomasz Maczukin2015-12-311-0/+75
|/
* Add API support for looking up a user by usernameStan Hu2015-12-241-0/+7
| | | | Needed to support Huboard
* Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-241-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
| * Fix specDouglas Barbosa Alexandre2015-12-181-1/+1
| |
* | Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-231-0/+13
|\ \ | | | | | | | | | | | | | | | | | | Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
| * | Add project permissions to all project API endpointsStan Hu2015-12-221-0/+13
| |/ | | | | | | This standardizes all the project API formats. Also needed to support Huboard.
* | Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+0
|/ | | | `runners_registration_token` now creates a new token if it is blank.
* Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-1/+20
| | | | Fixes #4112
* Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-0/+16
|\ | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add open_issues_count to project APIStan Hu2015-12-111-0/+16
| | | | | | | | This is needed to support Huboard and a generally useful value.
* | Fixed Rubocop offensesGabriel Mazetto2015-12-152-2/+2
| |
* | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-148-368/+121
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| * | Fix after column renameKamil Trzcinski2015-12-112-9/+9
| | |
| * | Fix triggers testsKamil Trzcinski2015-12-112-19/+13
| | |
| * | Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+80
| | |
| * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-112-3/+3
| | |
| * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-116-287/+31
| | |
| * | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-102-75/+10
| |/
* | Stub also `ensure_*` method in CI runners API specsci/persist-registration-tokenGrzegorz Bizon2015-12-111-0/+1
| |
* | Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-111-3/+6
|/
* Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-2/+57
|\ | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| * Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-083-7/+19
| |\
| * | Add API group projects specsDouwe Maan2015-12-081-2/+57
| | |
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-083-7/+19
|\ \ \ | | |/ | |/|
| * | Add custom NamespaceValidatorRobert Speicher2015-12-071-2/+2
| | |
| * | Add custom ColorValidatorRobert Speicher2015-12-071-5/+5
| | |
| * | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-051-0/+12
| |/ | | | | | | Closes #3864
* | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-073-12/+106
|\ \ | |/
| * Merge branch 'extend-events-api'Dmitriy Zaporozhets2015-12-041-7/+23
| |\
| | * Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+17
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Allow editing a release in API via PUT methodRobert Schilling2015-11-211-0/+38
| |
| * Only allow to create a release if it does not exist yetRobert Schilling2015-11-211-1/+16
| |
| * Use POST to create a new release instead of PUTRobert Schilling2015-11-211-4/+4
| |
View Lorry Controller Status