Merge branch 'schemarb' into 'master'

checkout schema.rb if changed before pull

See merge request !45

Makefile

@@ -113,13 +113,15 @@ gitlab-runner-update: gitlab-runner/.git/pull
 	bundle install
 gitlab/.git/pull:
-	cd ${gitlab_development_root}/gitlab && git pull --ff-only
+	cd ${gitlab_development_root}/gitlab && git checkout -- db/schema.rb && \
+		git pull --ff-only
 gitlab-shell/.git/pull:
 	cd ${gitlab_development_root}/gitlab-shell && git pull --ff-only
 gitlab-ci/.git/pull:
-	cd ${gitlab_development_root}/gitlab-ci && git pull --ff-only
+	cd ${gitlab_development_root}/gitlab-ci &&  git checkout -- db/schema.rb && \
+		git pull --ff-only
 gitlab-runner/.git/pull:
 	cd ${gitlab_development_root}/gitlab-runner && git pull --ff-only