8b551ee318
Conflicts: app/controllers/projects/services_controller.rb app/models/project_services/emails_on_push_service.rb |
||
|---|---|---|
| .. | ||
| _diffs.html.haml | ||
| _file.html.haml | ||
| _image.html.haml | ||
| _match_line.html.haml | ||
| _match_line_parallel.html.haml | ||
| _parallel_view.html.haml | ||
| _stats.html.haml | ||
| _text_file.html.haml | ||
| _warning.html.haml | ||