diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
| commit | 8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b (patch) | |
| tree | 38118628101e0b9281a07c295d15d0c9f075197b /spec/models/user_spec.rb | |
| parent | f39ff54290abe224b0b79accc0da48c1cd2d2109 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
| download | gitlab-ce-8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b.tar.gz | |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
Diffstat (limited to 'spec/models/user_spec.rb')
0 files changed, 0 insertions, 0 deletions