diff options
author | miks <miks@cubesystems.lv> | 2012-09-08 11:50:24 +0400 |
---|---|---|
committer | miks <miks@cubesystems.lv> | 2012-09-08 11:50:24 +0400 |
commit | 4226458fafc0cd64422c77691a2c802d2347ea2d (patch) | |
tree | 405ddc364a355d0882d9cf9cdc9f8f07270bd08e /doc | |
parent | 909c8c345dff0851e15d81917efe7817c7f89e22 (diff) | |
parent | 7cc4b3f632dbd2ab9c0096e4f5e6fcd0b4c6b071 (diff) |
Merge branch 'master' into project_users_api
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/README.md | 4 | ||||
-rw-r--r-- | doc/api/projects.md | 6 | ||||
-rw-r--r-- | doc/installation.md | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index dece3e23619..93919b42852 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -1,4 +1,4 @@ -# Gitlab API +# GitLab API All API requests require authentication. You need to pass a `private_token` parameter to authenticate. You can find or reset your private token in your profile. @@ -10,7 +10,7 @@ If no, or an invalid, `private_token` is provided then an error message will be } ``` -API requests should be prefixed with `api` and the API version. The API version is equal to the Gitlab major version number, which is defined in `lib/api.rb`. +API requests should be prefixed with `api` and the API version. The API version is equal to the GitLab major version number, which is defined in `lib/api.rb`. Example of a valid API request: diff --git a/doc/api/projects.md b/doc/api/projects.md index b26305b140f..72874e59682 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -102,6 +102,12 @@ Parameters: + `name` (required) - new project name + `code` (optional) - new project code, uses project name if not set + `path` (optional) - new project path, uses project name if not set ++ `description (optional) - short project description ++ `default_branch` (optional) - 'master' by default ++ `issues_enabled` (optional) - enabled by default ++ `wall_enabled` (optional) - enabled by default ++ `merge_requests_enabled` (optional) - enabled by default ++ `wiki_enabled` (optional) - enabled by default Will return created project with status `201 Created` on success, or `404 Not found` on fail. diff --git a/doc/installation.md b/doc/installation.md index 327fc192822..e14ec711e7b 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -167,7 +167,7 @@ and ensure you have followed all of the above steps carefully. # Login to MySQL $ mysql -u root -p - # Create the gitlabhq production database + # Create the GitLab production database mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; # Create the MySQL User change $password to a real password |