052a7cc9cd
Conflicts: app/controllers/projects/merge_requests_controller.rb |
||
|---|---|---|
| .. | ||
| application_controller.rb | ||
| blame_controller.rb | ||
| blob_controller.rb | ||
| branches_controller.rb | ||
| commit_controller.rb | ||
| commits_controller.rb | ||
| compare_controller.rb | ||
| deploy_keys_controller.rb | ||
| edit_tree_controller.rb | ||
| graphs_controller.rb | ||
| hooks_controller.rb | ||
| issues_controller.rb | ||
| labels_controller.rb | ||
| merge_requests_controller.rb | ||
| milestones_controller.rb | ||
| network_controller.rb | ||
| notes_controller.rb | ||
| protected_branches_controller.rb | ||
| raw_controller.rb | ||
| refs_controller.rb | ||
| repositories_controller.rb | ||
| services_controller.rb | ||
| snippets_controller.rb | ||
| tags_controller.rb | ||
| team_members_controller.rb | ||
| tree_controller.rb | ||
| walls_controller.rb | ||
| wikis_controller.rb | ||