d7b667fee2
Conflicts: app/models/merge_request.rb |
||
|---|---|---|
| .. | ||
| concerns | ||
| .gitkeep | ||
| ability.rb | ||
| commit.rb | ||
| event.rb | ||
| gitlab_ci_service.rb | ||
| group.rb | ||
| issue.rb | ||
| key.rb | ||
| merge_request.rb | ||
| milestone.rb | ||
| namespace.rb | ||
| note.rb | ||
| project.rb | ||
| project_hook.rb | ||
| project_team.rb | ||
| protected_branch.rb | ||
| repository.rb | ||
| service.rb | ||
| service_hook.rb | ||
| snippet.rb | ||
| system_hook.rb | ||
| tree.rb | ||
| user.rb | ||
| user_team.rb | ||
| user_team_project_relationship.rb | ||
| user_team_user_relationship.rb | ||
| users_project.rb | ||
| web_hook.rb | ||
| wiki.rb | ||