155703c613
Conflicts: app/models/issue.rb app/models/merge_request.rb |
||
|---|---|---|
| .. | ||
| concerns | ||
| commit_spec.rb | ||
| event_spec.rb | ||
| gitlab_ci_service_spec.rb | ||
| group_spec.rb | ||
| issue_spec.rb | ||
| key_spec.rb | ||
| merge_request_spec.rb | ||
| milestone_spec.rb | ||
| namespace_spec.rb | ||
| note_spec.rb | ||
| project_hooks_spec.rb | ||
| project_security_spec.rb | ||
| project_spec.rb | ||
| project_team_spec.rb | ||
| protected_branch_spec.rb | ||
| repository_spec.rb | ||
| service_hook_spec.rb | ||
| service_spec.rb | ||
| snippet_spec.rb | ||
| system_hook_spec.rb | ||
| user_spec.rb | ||
| user_team_project_relationship_spec.rb | ||
| user_team_spec.rb | ||
| user_team_user_relationship_spec.rb | ||
| users_project_spec.rb | ||
| web_hook_spec.rb | ||
| wiki_spec.rb | ||