diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-10 14:03:00 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-10 14:03:00 +0300 |
| commit | 6a9aed1e878bc8651243d645d0a9d2f7da33f248 (patch) | |
| tree | b70a5bb88b89676130271207029df4eaba0dc573 /doc | |
| parent | 223d26405128a64f624b78e7d4b03565d1e85a69 (diff) | |
| parent | 381638b77f68004dd9b5607eacceb3cee5b2bf3c (diff) | |
| download | gitlab-ce-6a9aed1e878bc8651243d645d0a9d2f7da33f248.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
CHANGELOG
VERSION
app/views/admin/teams/projects/new.html.haml
app/views/projects/teams/available.html.haml
doc/install/installation.md
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/README.md | 24 | ||||
| -rw-r--r-- | doc/api/projects.md | 25 | ||||
| -rw-r--r-- | doc/install/installation.md | 16 |
3 files changed, 46 insertions, 19 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index 4bcd89949df..9d6e229e4cb 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -69,18 +69,18 @@ When listing resources you can pass the following parameters: ## Contents -+ [Users](users.md) -+ [Session](session.md) -+ [Projects](projects.md) -+ [Project Snippets](project_snippets.md) -+ [Repositories](repositories.md) -+ [Issues](issues.md) -+ [Milestones](milestones.md) -+ [Notes](notes.md) -+ [Deploy Keys](deploy_keys.md) -+ [System Hooks](system_hooks.md) -+ [Groups](groups.md) -+ [User Teams](user_teams.md) ++ [Users](api/users.md) ++ [Session](api/session.md) ++ [Projects](api/projects.md) ++ [Project Snippets](api/project_snippets.md) ++ [Repositories](api/repositories.md) ++ [Issues](api/issues.md) ++ [Milestones](api/milestones.md) ++ [Notes](api/notes.md) ++ [Deploy Keys](api/deploy_keys.md) ++ [System Hooks](api/system_hooks.md) ++ [Groups](api/groups.md) ++ [User Teams](api/user_teams.md) ## Clients diff --git a/doc/api/projects.md b/doc/api/projects.md index 323c0be63a4..41b6b6add39 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -453,3 +453,28 @@ Parameters: + `id` (required) - The ID of the project. + `branch` (required) - The name of the branch. + +## Admin fork relation + +Allows modification of the forked relationship between existing projects. . Available only for admins. + +### Create a forked from/to relation between existing projects. + +``` +POST /projects/:id/fork/:forked_from_id +``` + +Parameters: + ++ `id` (required) - The ID of the project ++ `forked_from_id:` (required) - The ID of the project that was forked from + +### Delete an existing forked from relationship + +``` +DELETE /projects/:id/fork +``` + +Parameter: + ++ `id` (required) - The ID of the project
\ No newline at end of file diff --git a/doc/install/installation.md b/doc/install/installation.md index 9200d597259..65865e1635b 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -42,11 +42,13 @@ up-to-date and install it. apt-get install sudo -y **Note:** -Vim is an editor that is used here whenever there are files that need to be -edited by hand. But, you can use any editor you like instead. +During this installation some files will need to be edited manually. +If you are familiar with vim set it as default editor with the commands below. +If you are not familiar with vim please skip this and keep using the default editor. - # Install vim + # Install vim and set as default editor sudo apt-get install -y vim + sudo update-alternatives --set editor /usr/bin/vim.basic Install the required packages: @@ -123,7 +125,7 @@ GitLab Shell is a ssh access and repository management software developed specia # Edit config and replace gitlab_url # with something like 'http://domain.com/' - sudo -u git -H vim config.yml + sudo -u git -H editor config.yml # Do setup sudo -u git -H ./bin/install @@ -162,7 +164,7 @@ You can change `5-3-stable` to `master` if you want the *bleeding edge* version, # Make sure to change "localhost" to the fully-qualified domain name of your # host serving GitLab where necessary - sudo -u git -H vim config/gitlab.yml + sudo -u git -H editor config/gitlab.yml # Make sure GitLab can write to the log/ and tmp/ directories sudo chown -R git log/ @@ -214,7 +216,7 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup. # Change 'root' to 'gitlab' # Change 'secure password' with the value you have given to $password # You can keep the double quotes around the password - sudo -u git -H vim config/database.yml + sudo -u git -H editor config/database.yml # Make config/database.yml readable to git only sudo -u git -H chmod o-rwx config/database.yml @@ -295,7 +297,7 @@ Make sure to edit the config file to match your setup: # Change YOUR_SERVER_FQDN to the fully-qualified # domain name of your host serving GitLab. - sudo vim /etc/nginx/sites-available/gitlab + sudo editor /etc/nginx/sites-available/gitlab ## Restart |