summaryrefslogtreecommitdiff
path: root/spec/requests
Commit message (Collapse)AuthorAgeFilesLines
* Some of the requested updates, rebase on masterIzaak Alpert2013-09-091-12/+12
| | | | Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
* API: admin users can sudo commands as other usersIzaak Alpert2013-09-091-0/+159
| | | | -Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
* Fixes for @randxIzaak Alpert2013-09-051-2/+6
| | | | Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
* Add group membership apiIzaak Alpert2013-09-041-8/+108
| | | | Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
* Standardize commit diff api url, change blob api url, add get single commitAlex Van't Hof2013-08-271-8/+44
| | | | | | | | | | | | Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line with existing api urls (e.g. "/projects/:id", etc.) Fix 500 error resulting from a diff api call with an invalid commit hash Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for backwards compatibility. Add ability to get a single commit via "/commits/:sha"
* Adds feature: get a diff via API.Gabor Nagy2013-08-251-0/+22
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-081-0/+36
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
| * allow all git-upload-* commands for deploy keysJakub Zienkiewicz2013-07-301-0/+36
| |
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-305-33/+106
|\ \ | |/ |/| | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * Style changes from review with @randxIzaak Alpert2013-07-171-38/+36
| | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
| * Fix intermittently failing notification_service testIzaak Alpert2013-07-171-0/+1
| | | | | | | | Change-Id: Ic23cb46901f8adc77943bf3cc79566587364e22a
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
| * Merge Request on forked projectsIzaak Alpert2013-07-174-68/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* | Fix typosJohannes Schleifenbaum2013-07-291-1/+1
|/
* enhance project creation apis to allow setting of public attributeAngus MacArthur2013-07-121-0/+30
| | | | Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-101-0/+67
|\ | | | | | | | | | | | | | | | | Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md
| * Additon of apis for fork administration.Angus MacArthur2013-07-081-0/+67
| | | | | | | | | | Added ability to add and remove the forked from/to relatioinship between existing repos.
* | remove useless routing tests. Added symlink creation for project with codeDmitriy Zaporozhets2013-06-221-1/+1
| |
* | Remove all team resources except models. Move models to deprecated directoryDmitriy Zaporozhets2013-06-181-360/+0
|/
* API: project eventsDmitriy Zaporozhets2013-06-061-0/+23
|
* API: implement retrieve of repository treeDmitriy Zaporozhets2013-06-061-0/+23
|
* Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into ↵Dmitriy Zaporozhets2013-06-042-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Andrew8xx8-gist Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb
| * Tests fixedAndrew8xx82013-03-252-2/+2
| |
* | Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq ↵Dmitriy Zaporozhets2013-05-271-0/+360
|\ \ | | | | | | | | | | | | | | | | | | into former03-feature_teams_api Conflicts: doc/api/README.md
| * | [FEATURE] Basic user_teams apiChristian Simon2013-05-211-0/+360
| | | | | | | | | | | | | | | * Closing #3066 * Closing #3609
* | | fix missing user2 in api:repositories specsDmitriy Zaporozhets2013-05-231-0/+1
| | |
* | | split repositories and projects apiDmitriy Zaporozhets2013-05-232-120/+134
|/ /
* | Refactor API classes. So api classes like Gitlab::Issues become API::IssuesDmitriy Zaporozhets2013-05-1410-11/+11
| |
* | fix api delete hook testDmitriy Zaporozhets2013-05-071-2/+2
| |
* | Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashesDmitriy Zaporozhets2013-05-072-94/+94
|\ \ | | | | | | Code cleanup: Replace old hashes and remove trailing spaces
| * | remove trailing spacesAndrey Kumanyaev2013-05-052-91/+91
| | |
| * | Replace old hashes with new 1.9 ruby hashes (rebase)Andrey Kumanyaev2013-05-051-3/+3
| | |
* | | fix API route to delete project hookNihad Abbasov2013-05-071-4/+4
| | |
* | | modify api to work with new deploy keysDmitriy Zaporozhets2013-05-061-44/+46
|/ /
* | fix testDmitriy Zaporozhets2013-05-021-1/+1
| |
* | Update all gems!Dmitriy Zaporozhets2013-05-011-1/+1
| |
* | Specs refactoring to reduce test time. Disabled observers by default for specsDmitriy Zaporozhets2013-04-102-0/+2
| |
* | fixed test using repo with commits but old factoryDmitriy Zaporozhets2013-04-012-2/+2
| |
* | Prepare UI for notification settingsDmitriy Zaporozhets2013-03-271-11/+0
| |
* | notification scaffoldDmitriy Zaporozhets2013-03-271-0/+11
|/
* Abilities added to /user and /sign_in requestsAlex Denisov2013-03-182-0/+8
|
* Result of misspellings run.Kevin Lyda2013-03-171-1/+1
| | | | | | | | | Most of these are comments but a few are strings for users. Might be an idea to run this from time to time: https://github.com/lyda/misspell-check It runs mostly clean now.
* fix api internal testDmitriy Zaporozhets2013-03-111-1/+1
|
* Merge branch 'master' into api/system_hooks_adjustmentsSebastian Ziebell2013-03-071-28/+49
|\
| * Merge pull request #2835 from Asquera/fixes/apiDmitriy Zaporozhets2013-03-078-21/+510
| |\ | | | | | | Fix API return codes
| * | block user should not be able to pushDmitriy Zaporozhets2013-03-071-28/+49
| | |
* | | API: system hooks API functions and documentation updatedSebastian Ziebell2013-03-071-2/+14
| |/ |/| | | | | | | | | * updated system hooks documentation and code comments * fixed access to system hooks if no user given resulting in a `500 Server Error` * added tests
* | Merge branch 'master' into fixes/api, code clean up and tests fixedSebastian Ziebell2013-03-075-14/+206
|\ \ | |/ | | | | | | | | Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
| * Merge pull request #3146 from amacarthur/AdminAPIsDmitriy Zaporozhets2013-03-063-0/+80
| |\ | | | | | | Additional Admin APIs
| | * Additional Admin APIsAngus MacArthur2013-03-053-0/+80
| | |
View Lorry Controller Status