-
- Downloads
An error occurred while retrieving diff files
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
No related branches found
No related tags found
Showing
- app/assets/stylesheets/common.scss 12 additions, 0 deletionsapp/assets/stylesheets/common.scss
- app/contexts/filter_context.rb 1 addition, 1 deletionapp/contexts/filter_context.rb
- app/contexts/merge_requests_load_context.rb 1 addition, 1 deletionapp/contexts/merge_requests_load_context.rb
- app/contexts/search_context.rb 1 addition, 1 deletionapp/contexts/search_context.rb
- app/controllers/projects/merge_requests_controller.rb 37 additions, 14 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/commits_helper.rb 2 additions, 2 deletionsapp/helpers/commits_helper.rb
- app/helpers/merge_requests_helper.rb 27 additions, 6 deletionsapp/helpers/merge_requests_helper.rb
- app/mailers/emails/merge_requests.rb 41 additions, 4 deletionsapp/mailers/emails/merge_requests.rb
- app/mailers/notify.rb 1 addition, 0 deletionsapp/mailers/notify.rb
- app/models/concerns/issuable.rb 0 additions, 5 deletionsapp/models/concerns/issuable.rb
- app/models/issue.rb 10 additions, 0 deletionsapp/models/issue.rb
- app/models/merge_request.rb 66 additions, 32 deletionsapp/models/merge_request.rb
- app/models/note.rb 5 additions, 5 deletionsapp/models/note.rb
- app/models/project.rb 1 addition, 1 deletionapp/models/project.rb
- app/observers/activity_observer.rb 11 additions, 31 deletionsapp/observers/activity_observer.rb
- app/observers/issue_observer.rb 1 addition, 1 deletionapp/observers/issue_observer.rb
- app/observers/merge_request_observer.rb 33 additions, 3 deletionsapp/observers/merge_request_observer.rb
- app/services/notification_service.rb 17 additions, 17 deletionsapp/services/notification_service.rb
- app/views/events/_event_last_push.html.haml 4 additions, 1 deletionapp/views/events/_event_last_push.html.haml
- app/views/notify/closed_merge_request_email.html.haml 2 additions, 2 deletionsapp/views/notify/closed_merge_request_email.html.haml
Loading
Please register or sign in to comment