Commit f381308c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 03e517e0 f1be1374
...@@ -12,7 +12,6 @@ before_install: ...@@ -12,7 +12,6 @@ before_install:
branches: branches:
only: only:
- 'master' - 'master'
- 'rails4'
rvm: rvm:
- 2.0.0 - 2.0.0
services: services:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment