diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 00:12:03 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 00:12:03 -0400 |
| commit | 4d373005968b8269a8d2fe56b7776820396127a4 (patch) | |
| tree | ea2ab17d2a68ddf7e6ce8bb7b43ee293a7e6220e /spec/models/project_spec.rb | |
| parent | 0a013adc4da162512b75d5ed20c338392af7577b (diff) | |
| download | gitlab-ce-4d373005968b8269a8d2fe56b7776820396127a4.tar.gz | |
Rebase on master
-Messed up part of the merge for _form.html.haml
-Probably need discussion about what the new/edit merge page should look like now that it involves projects
Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1
Diffstat (limited to 'spec/models/project_spec.rb')
0 files changed, 0 insertions, 0 deletions