Download as
Browse Code »

Commit 5ca12a8140abdfd40d4837acf41b93d378614d79

Authored by Sytse Sijbrandij
2 parents b446c619 fb283ecf
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'no_advanced_features' into 'master' 

No Advanced Features
Showing 1 changed file with 8 additions and 5 deletions   Show diff stats
@@ -186,9 +186,10 @@ Run `sudo gitlab-ctl reconfigure` for the change to take effect. @@ -186,9 +186,10 @@ Run `sudo gitlab-ctl reconfigure` for the change to take effect.
186 186
187 ### Changing gitlab.yml settings 187 ### Changing gitlab.yml settings
188 188
189 -This is an advanced topic. If you are already familiar with configuring GitLab  
190 -and you want to change a `gitlab.yml` setting, you need to do so via  
191 -`/etc/gitlab/gitlab.rb`. The translation works as follows. 189 +Some of GitLab's features can be customized through
  190 +[gitlab.yml][gitlab.yml.example]. If you want to change a `gitlab.yml` setting
  191 +with omnibus-gitlab, you need to do so via `/etc/gitlab/gitlab.rb`. The
  192 +translation works as follows.
192 193
193 In `gitlab.yml`, you will find structure like this: 194 In `gitlab.yml`, you will find structure like this:
194 195
@@ -299,8 +300,9 @@ Omnibus-gitlab uses four different directories. @@ -299,8 +300,9 @@ Omnibus-gitlab uses four different directories.
299 300
300 ## Starting a Rails console session 301 ## Starting a Rails console session
301 302
302 -For advanced users only. If you need access to a Rails production console for your  
303 -GitLab installation you can start one with the following command: 303 +If you need access to a Rails production console for your GitLab installation
  304 +you can start one with the command below. Please be warned that it is very easy
  305 +to inadvertently modify, corrupt or destroy data from the console.
304 306
305 ```shell 307 ```shell
306 sudo /opt/gitlab/bin/gitlab-rails console 308 sudo /opt/gitlab/bin/gitlab-rails console
@@ -373,3 +375,4 @@ This omnibus installer project is based on the awesome work done by Chef in @@ -373,3 +375,4 @@ This omnibus installer project is based on the awesome work done by Chef in
373 [gitlab.yml.erb]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb 375 [gitlab.yml.erb]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
374 [database.yml.postgresql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.postgresql 376 [database.yml.postgresql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.postgresql
375 [database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.mysql 377 [database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.mysql
  378 +[gitlab.yml.example]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example