summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
* Expose votes in merge request apiIslam Amer2013-10-081-1/+1
| | | | Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
* Check if LDAP user was removed or blocked when use git over sshDmitriy Zaporozhets2013-10-071-0/+1
|
* API: new feature - remove groupDmitriy Zaporozhets2013-10-071-2/+16
|
* Fix blob and repo stuff after gitlab_git v3Dmitriy Zaporozhets2013-10-011-3/+3
|
* Refactor API: project hooksDmitriy Zaporozhets2013-09-301-5/+1
|
* API: Protect project deploy keys from unauthorized accessDmitriy Zaporozhets2013-09-301-0/+1
|
* Merge pull request #5213 from bladealslayer/feature/user_api_extendedDmitriy Zaporozhets2013-09-293-8/+15
|\ | | | | Extended User API to expose admin and can_create_group for user creation...
| * Extended User API to expose admin and can_create_group for user ↵Boyan Tabakov2013-09-293-8/+15
| | | | | | | | | | | | | | creation/updating. Also, is_admin and can_create_group are exposed in the user information. Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
* | Respect authorization in Repository APIDmitriy Zaporozhets2013-09-292-19/+15
|/ | | | | * dont allow protect/unprotect branches for users without master permissions * dont allow access to Repository api for guests
* Used pagnation function from api helpersIzaak Alpert2013-09-241-6/+4
| | | | Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
* Added search for projects by name to apiIzaak Alpert2013-09-231-19/+34
| | | | | | | | | GITLAB-1283 (GITLAB-869) Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded Conflicts: config/initializers/1_settings.rb
* Fix API::MergeRequestHiroyuki Sato2013-09-221-1/+1
| | | | Fixes #5144 Refs #4996
* Drop support of root namespace in routingHiroyuki Sato2013-09-131-1/+1
|
* Update to only provide one way to get a default userIzaak Alpert2013-09-111-3/+2
| | | | | | -calling build_user will now apply defaults and only override them if as: :admin is set Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
* Update User api to respect default settingsIzaak Alpert2013-09-111-1/+1
| | | | | | -API now respects default_projects_limit, default_can_create_group, and default_can_create_team Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
* Some of the requested updates, rebase on masterIzaak Alpert2013-09-091-15/+8
| | | | Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
* API: admin users can sudo commands as other usersIzaak Alpert2013-09-091-5/+39
| | | | -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-3/+4
| | | | Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
* Add group membership apiIzaak Alpert2013-09-042-6/+73
| | | | Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
* Standardize commit diff api url, change blob api url, add get single commitAlex Van't Hof2013-08-271-4/+20
| | | | | | | | | | | | 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"
* Merge pull request #4916 from marbindrakon/merge_request_apiDmitriy Zaporozhets2013-08-271-1/+2
|\ | | | | Fix project_id field in MergeRequest API
| * Fix project_id field in MergeRequest APIAndrew Austin2013-08-271-1/+2
| |
* | Adds feature: get a diff via API.Gabor Nagy2013-08-251-0/+14
|/
* Allow specify path when create project via apiDmitriy Zaporozhets2013-08-141-7/+8
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-081-3/+7
|\ | | | | | | | | | | | | | | | | | | | | 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
| * extract server-side git commands to constantsJakub Zienkiewicz2013-07-301-3/+7
| |
| * allow all git-upload-* commands for deploy keysJakub Zienkiewicz2013-07-301-1/+1
| |
* | Refactor merge api createIzaak Alpert2013-07-171-5/+16
| | | | | | | | | | | | | | -Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
* | MR on Fork multiple fixesIzaak Alpert2013-07-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-171-4/+9
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add LDAP support to /api/sessionDmitriy Zaporozhets2013-07-161-8/+9
|
* enhance project creation apis to allow setting of public attributeAngus MacArthur2013-07-122-3/+7
| | | | Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-122-10/+14
|\
| * Merge pull request #3993 from bke-drewb/3599Dmitriy Zaporozhets2013-07-112-10/+14
| |\ | | | | | | Issue 3599: Add snippets_enabled flag to projects for API
| | * Issue 3599: Add snippets_enabled flag to projects for APIDrew Blessing2013-06-112-10/+14
| | | | | | | | | | | | | | | | | | s 3599: Add snippets_enabled flag to projects for API Replace missing comma
* | | Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-103-3/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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-083-3/+46
| |/ | | | | | | | | Added ability to add and remove the forked from/to relatioinship between existing repos.
* | Remove all team resources except models. Move models to deprecated directoryDmitriy Zaporozhets2013-06-183-281/+0
|/
* cattr_accessor is not threadsafe!Dmitriy Zaporozhets2013-06-112-3/+3
|
* API: project eventsDmitriy Zaporozhets2013-06-062-0/+20
|
* API: Add last_activity_at date to project entityDmitriy Zaporozhets2013-06-061-1/+1
|
* API: implement retrieve of repository treeDmitriy Zaporozhets2013-06-061-0/+25
|
* API: Fix repository commits paginationDmitriy Zaporozhets2013-06-061-1/+1
|
* Fix snippet raw content being escapedDmitriy Zaporozhets2013-06-061-0/+2
|
* Split Project api on several parts: deploy_keys, hooks, snippets etcDmitriy Zaporozhets2013-06-065-261/+316
|
* Fix milestone api docs: invalid param for closeDmitriy Zaporozhets2013-06-061-1/+1
|
* Fix wrong documentation for issue close api. Fixes #3548Dmitriy Zaporozhets2013-06-061-1/+1
|
* Selectable deploy keys contain master projectsbabatakao2013-06-051-1/+1
|
* Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into ↵Dmitriy Zaporozhets2013-06-041-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-3/+3
| |
View Lorry Controller Status