Merge branch 'add_update_commands' into 'master'

[WIP] Update gitlab and gitlab-shell repos in Makefile

AFAIK, currently there is no reference how to update the source files of `gitlab` and `gitlab-shell`. I gave this a brief test and it works. If anyone can also test this it would be cool. If we decide to merge it, a section in README will be added as well.

See merge request !23

Makefile

@@ -48,6 +48,25 @@ gitlab-shell/config.yml:
 gitlab-shell/.bundle:
 	cd ${gitlab_development_root}/gitlab-shell && bundle install --without production --jobs 4
+# Update gitlab and gitlab-shell
+
+update: gitlab-update gitlab-shell-update
+
+gitlab-update: gitlab/.git/pull
+	cd ${gitlab_development_root}/gitlab && \
+	bundle install --without mysql production --jobs 4 && \
+	bundle exec rake db:migrate
+
+gitlab-shell-update: gitlab-shell/.git/pull
+	cd ${gitlab_development_root}/gitlab-shell && \
+	bundle install --without production --jobs 4
+
+gitlab/.git/pull:
+	cd ${gitlab_development_root}/gitlab && git pull --ff-only
+
+gitlab-shell/.git/pull:
+	cd ${gitlab_development_root}/gitlab-shell && git pull --ff-only
+
 # Set up supporting services
 support-setup: Procfile redis postgresql .bundle

README.md

@@ -116,6 +116,22 @@ bundle exec foreman start
 Now you can go to http://localhost:3000 in your browser.
+## Update gitlab and gitlab-shell repositories
+
+When working on a new feature, always check that your `gitlab` repository is up
+to date with the upstream master branch.
+
+In order to fetch the latest code, first make sure that `foreman` for
+postgres is runnning (needed for db migration) and then run:
+
+```
+make update
+```
+
+This will update both `gitlab` and `gitlab-shell` and run any possible migrations.
+You can also update them separately by running `make gitlab-update` and
+`make gitlab-shell-update` respectively.
+
 ## Troubleshooting
 ### Rails cannot connect to Postgres