Commit Graph
175 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 10:01:43 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets 32d7332d2c API: delete file from repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:33:38 +02:00
Dmitriy Zaporozhets 434d276dba better wording for api doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-18 19:53:10 +02:00
Dmitriy Zaporozhets 11931bfb9c update projects api docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-18 16:49:29 +02:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets 79afb001ad Fix type in API doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets f64dd1b492 Add docs for create file API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-09 11:40:17 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 19:14:11 +02:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
2013-10-31 14:29:48 +02:00
Dmitriy Zaporozhets a430680ad5 Allow set ldap_cn and ldap_access for new group via API 2013-10-30 17:45:18 +02:00
Dmitriy Zaporozhets e0723f41b8 Docs for ldap_cn and ldap_access group attributes in API 2013-10-30 15:08:40 +02:00
Marin Jankovski 1712406f8a Add an example. 2013-10-18 09:11:37 +02:00
Marin Jankovski 7c3fd6941f Update project api doc. 2013-10-17 12:16:57 +02:00
Dmitriy Zaporozhets 02693b72a4 Explain iid in API 2013-10-14 16:40:16 +03:00
Sytse Sijbrandij 3888d94adc System hooks docs links to admin area. 2013-10-14 09:24:38 +02:00
Izaak Alpert a00c534c4c Fix a bug where the tgz returned got encoded utf8
Conflicts:
	doc/api/repositories.md

Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
2013-10-10 09:19:28 -04:00
Izaak Alpert ce21d8688d feature API call to download repo archive
defaults to HEAD

Conflicts:
	spec/requests/api/repositories_spec.rb

Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
2013-10-10 09:19:28 -04:00
Dmitriy Zaporozhets 51825e434e API: docs for remove project 2013-10-09 14:43:18 +03:00
Islam AmerandJacob Vosmaer 29c807ced3 Expose votes in merge request api
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
2013-10-08 09:32:00 +02:00
Dmitriy Zaporozhets f141711cfd API: new feature - remove group 2013-10-07 13:10:01 +03:00
Dmitriy Zaporozhets 073c8a2966 Merge pull request #5230 from cmckni3/patch-1
Fix invalid json in API docs
2013-10-06 22:44:03 -07:00
Dmitriy Zaporozhets 5bd0025790 API doc: Share project with group 2013-10-03 11:18:29 +03:00
Marin Jankovski da54a1e644 Update group access levels in docs. 2013-10-02 16:41:01 +02:00
Marin Jankovski d7ec7c794a Removed user teams api docs. 2013-10-02 12:51:43 +02:00
Marin Jankovski 55880751aa Update deploy keys, groups and system hooks api docs. 2013-10-02 12:50:01 +02:00
Marin Jankovski f1253fa710 Update issues, milestones, notes api docs. 2013-10-02 12:08:07 +02:00
Marin Jankovski 5e96d07021 Update snippets and merge request api documentation 2013-10-02 11:04:51 +02:00
Marin Jankovski f22e6c917d Update project api docs. 2013-10-01 23:13:09 +02:00
Marin Jankovski 1b205cbc39 Update user api documentation 2013-10-01 13:52:57 +02:00
Chris McKnight 4ee7834266 Fix json keys in groups API documentation 2013-09-30 21:45:15 -05:00
Chris McKnight 979dd2603c Fix invalid json in issues API doc 2013-09-30 17:39:33 -05:00
Tobias Bieniek 4692612b84 Fixed typo in groups.md 2013-09-30 11:01:57 +02:00
Boyan Tabakov 479631aafc Extended User API to expose admin and can_create_group for user 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).
2013-09-29 11:47:29 +03:00
Izaak Alpert 04c7c262a7 Used pagnation function from api helpers
Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
2013-09-24 09:22:46 -04:00
Izaak Alpert 9d06921ffb Added missing API documentation
Change-Id: I1337ee7ff51d018d6f62d447345032597e84269f
2013-09-23 19:36:39 -04:00
Izaak AlpertandIzaak Alpert e86e881832 API: admin users can sudo commands as other users
-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
2013-09-09 12:04:38 -04:00
Izaak Alpert 8248e1f2b8 Add group membership api
Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
2013-09-04 13:17:17 -04:00
Johannes Schleifenbaum cbae8097c0 add missing comma(s) in api examples 2013-08-30 21:10:26 +02:00
Alex Van't Hof 59f428dca2 Standardize commit diff api url, change blob api url, add get single commit
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"
2013-08-27 21:22:42 -04:00
Gabor Nagy d139cc6b32 Adds feature: get a diff via API. 2013-08-25 23:48:11 +02:00
MegaDiablo 90af8aa6fe add link on realisation api for java client 2013-08-20 14:35:49 +03:00
Itxaka Serrano bc3a4d3194 added python api wrapper 2013-08-07 09:40:26 +02:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
TJ Biddle 4261a5a1ea Adding links to the merge requests and group documentation. 2013-07-26 07:53:35 -07:00
Sean Zicari 87e8c2dc3d Update README.md
Updated the relative links in ## Contents to point to the correct documents.
2013-07-17 13:51:12 -07:00
Dmitriy Zaporozhets 247e095186 Update docs 2013-07-16 11:50:00 +03:00
Angus MacArthur ace5c54ab9 enhance project creation apis to allow setting of public attribute
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
2013-07-12 12:10:42 -04:00
Dmitriy Zaporozhets 8cdfa86b57 Merge pull request #3993 from bke-drewb/3599
Issue 3599: Add snippets_enabled flag to projects for API
2013-07-11 09:54:15 -07:00
Angus MacArthur ea5a006f27 Additon of apis for fork administration.
Added ability to add and remove the forked from/to relatioinship
between existing repos.
2013-07-08 17:34:00 -04:00