summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/development.md39
1 files changed, 15 insertions, 24 deletions
diff --git a/doc/development.md b/doc/development.md
index 67bcb8e1c96..ef6a9b02757 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -1,45 +1,36 @@
-## Development tips:
+## Development tips:
-### Start application in development mode
-#### 1. Via foreman
+### Installation
- bundle exec foreman -p 3000
+Install the Gitlab development in a virtual machine with the [Gitlab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm). Installing it in a virtual machine makes it much easier to set up all the dependencies for integration testing.
-#### 2. Via gitlab cli
- ./gitlab start
+### Start application in development mode
-#### 3. Manually
+#### 1. Via gitlab cli
- bundle exec rails s
- bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
+ ./gitlab start
+#### 2. Manually
-### Run tests:
-
-#### 1. Packages
+ bundle exec rails s
+ bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
- # ubuntu
- sudo apt-get install libqt4-dev libqtwebkit-dev
- sudo apt-get install xvfb
-
- # Mac
- brew install qt
- brew install xvfb
-#### 2. DB & seeds
+### Test DB seutup & seed
bundle exec rake db:setup RAILS_ENV=test
bundle exec rake db:seed_fu RAILS_ENV=test
-### 3. Run Tests
+
+### Run the Tests
# All in one
bundle exec rake gitlab:test
-
- # Rspec
+
+ # Rspec
bundle exec rake spec
-
+
# Spinach
bundle exec rake spinach