Download as
Browse Code »

Commit b3bb558501c52ac6cc9d478133eedff8b7384e20

Authored by Dmitriy Zaporozhets
2 parents b945f57f 603720e3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4075 from bbodenmiller/patch-6 

remove branch dependencies in README where not necessary
Showing 2 changed files with 21 additions and 21 deletions   Show diff stats
@@ -28,9 +28,9 @@ @@ -28,9 +28,9 @@
28 28
29 ### Resources 29 ### Resources
30 30
31 -* GitLab.org community site: [Homepage](http://gitlab.org) [Screenshots](http://gitlab.org/screenshots/) [Blog](http://blog.gitlab.org/) [Demo](http://demo.gitlabhq.com/users/sign_in) 31 +* GitLab.org community site: [Homepage](http://gitlab.org) | [Screenshots](http://gitlab.org/screenshots/) | [Blog](http://blog.gitlab.org/) | [Demo](http://demo.gitlabhq.com/users/sign_in)
32 32
33 -* GitLab.com commercial services: [Homepage](http://www.gitlab.com/) [Subscription](http://www.gitlab.com/subscription/) [Consultancy](http://www.gitlab.com/consultancy/) [GitLab Cloud](http://www.gitlab.com/cloud/) [Blog](http://blog.gitlab.com/) 33 +* GitLab.com commercial services: [Homepage](http://www.gitlab.com/) | [Subscription](http://www.gitlab.com/subscription/) | [Consultancy](http://www.gitlab.com/consultancy/) | [GitLab Cloud](http://www.gitlab.com/cloud/) | [Blog](http://blog.gitlab.com/)
34 34
35 * GitLab CI: [Readme](https://github.com/gitlabhq/gitlab-ci/blob/master/README.md) of the GitLab open-source continuous integration server 35 * GitLab CI: [Readme](https://github.com/gitlabhq/gitlab-ci/blob/master/README.md) of the GitLab open-source continuous integration server
36 36
@@ -43,13 +43,13 @@ @@ -43,13 +43,13 @@
43 * gitlab-shell 43 * gitlab-shell
44 * redis 44 * redis
45 45
46 -** More details are in the [requirements doc](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/requirements.md) 46 +** More details are in the [requirements doc](doc/install/requirements.md)
47 47
48 ### Installation 48 ### Installation
49 49
50 #### Official production installation 50 #### Official production installation
51 51
52 -* [Installation guide for a production server](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md) 52 +* [Installation guide for a production server](doc/install/installation.md)
53 53
54 54
55 #### Official development installation 55 #### Official development installation
@@ -74,16 +74,16 @@ If you want to contribute, please first read our [Contributing Guidelines](https @@ -74,16 +74,16 @@ If you want to contribute, please first read our [Contributing Guidelines](https
74 74
75 Each month on the 22nd a new version is released together with an upgrade guide. 75 Each month on the 22nd a new version is released together with an upgrade guide.
76 76
77 -* [Upgrade guides](https://github.com/gitlabhq/gitlabhq/tree/master/doc/update) 77 +* [Upgrade guides](doc/update)
78 78
79 -* [Changelog](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) 79 +* [Changelog](CHANGELOG)
80 80
81 * Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456). 81 * Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456).
82 82
83 83
84 ### Run in production mode 84 ### Run in production mode
85 85
86 -1. The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually: 86 + The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually:
87 87
88 sudo service gitlab start 88 sudo service gitlab start
89 89
@@ -124,13 +124,13 @@ Start it with [Foreman](https://github.com/ddollar/foreman) @@ -124,13 +124,13 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
124 124
125 ### GitLab interfaces 125 ### GitLab interfaces
126 126
127 -* [GitLab API](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/README.md) 127 +* [GitLab API](doc/api/README.md)
128 128
129 -* [Rake tasks](https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks) 129 +* [Rake tasks](doc/raketasks)
130 130
131 -* [Directory structure](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/structure.md) 131 +* [Directory structure](doc/install/structure.md)
132 132
133 -* [Databases](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/databases.md) 133 +* [Databases](doc/install/databases.md)
134 134
135 135
136 ### Getting help 136 ### Getting help
doc/api/README.md
  Diff comments   View file @b3bb558
@@ -69,13 +69,13 @@ When listing resources you can pass the following parameters: @@ -69,13 +69,13 @@ When listing resources you can pass the following parameters:
69 69
70 ## Contents 70 ## Contents
71 71
72 -+ [Users](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/users.md)  
73 -+ [Session](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/session.md)  
74 -+ [Projects](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/projects.md)  
75 -+ [Groups](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/groups.md)  
76 -+ [Snippets](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/snippets.md)  
77 -+ [Repositories](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/repositories.md)  
78 -+ [Issues](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/issues.md)  
79 -+ [Milestones](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/milestones.md)  
80 -+ [Notes](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/notes.md)  
81 -+ [System Hooks](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/system_hooks.md) 72 ++ [Users](doc/api/users.md)
  73 ++ [Session](doc/api/session.md)
  74 ++ [Projects](doc/api/projects.md)
  75 ++ [Groups](doc/api/groups.md)
  76 ++ [Snippets](doc/api/snippets.md)
  77 ++ [Repositories](doc/api/repositories.md)
  78 ++ [Issues](doc/api/issues.md)
  79 ++ [Milestones](doc/api/milestones.md)
  80 ++ [Notes](doc/api/notes.md)
  81 ++ [System Hooks](doc/api/system_hooks.md)