spec/models/project_spec.rb · 34c97a311c6463bb171a46eaf4a5357aed41964d · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork · 0d715bcd
Dmitriy Zaporozhets authored Jul 30, 2013
```
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
```
0d715bcd

project_spec.rb 9.01 KB