Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-development-kit

Procfile.example

@@ -4,6 +4,7 @@ postgresql: support/postgresql-signal-wrapper postgres -D /home/git/postgresql/d
 #openldap: support/exec-cd gitlab-openldap libexec/slapd -F slapd.d -d2 -h "ldap://127.0.0.1:3890"
 gitlab-workhorse: support/path-unshift /home/git/gitlab-workhorse gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr $host:$port -documentRoot /home/git/gitlab/public -developmentMode
 rails-web: RAILS_ENV=development support/exec-cd gitlab bin/web start_foreground
+#rails-web: RAILS_ENV=development support/exec-cd gitlab bundle exec thin --socket=/home/git/gitlab.socket start
 rails-background-jobs: SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=development support/exec-cd gitlab bin/background_jobs start_foreground
 #influxdb: influxdb/bin/influxd -config influxdb/influxdb.conf
 #grafana: support/wait-postgresql-ready support/exec-cd grafana bin/grafana-server -config grafana.ini

README.md

@@ -32,6 +32,7 @@ sockets to avoid port conflicts.
   - [Running the tests](#running-the-tests)
   - [Simulating Broken Storage Devices](#simulating-broken-storage-devices)
   - [Simulating Slow Filesystems](#simulating-slow-filesystems)
+  - [Local Network Binding](#local-network-binding)
 - [Update gitlab and gitlab-shell repositories](#update-gitlab-and-gitlab-shell-repositories)
 - [Update configuration files created by gitlab-development-kit](#update-configuration-files-created-by-gitlab-development-kit)
 - [MySQL](#mysql)
@@ -383,6 +384,24 @@ script can be used to mount a local directory via SSHFS and slow down access to
 the files in this directory. For more information see
 [mount-slow-fs](#mount-slow-fs).
+### Local Network Binding
+
+The default host binding for the rails application is `localhost`, if you
+would like to use other devices on your local network to test the rails
+application then run:
+
+```
+echo 0.0.0.0 > host
+./run
+```
+
+If you would like to revert back to the `localhost` network then run:
+
+```
+rm host
+./run
+```
+
 ## Update gitlab and gitlab-shell repositories
 When working on a new feature, always check that your `gitlab` repository is up

doc/howto/pry.md

+# Debugging with Pry
+
+[Pry](http://pryrepl.org/) allows you to set breakpoints in Ruby code
+for interactive debugging. Just drop in the magic word `binding.pry`.
+
+When running tests Pry's interactive debugging prompt appears in the
+terminal window where you start your test command (`rake`, `rspec`
+etc.).
+
+If you want to get a debugging prompt while browsing on your local
+development server (localhost:3000) you need to make a change to the
+Procfile in your GDK root directory because Unicorn is not compatible
+with Pry.
+
+There are two `rails-web` lines in the Procfile, one containing
+`bin/web` and one containing `thin`. Comment out the line containing
+`bin/web` and uncomment the line containing `thin`. Now when you start
+GDK with `./run` or `./run app` the Rails web application runs in Thin
+instead of Unicorn.