-
- Downloads
Merge branch 'revert-satellites' into 'master'
Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
Showing
- CHANGELOG 0 additions, 4 deletionsCHANGELOG
- Gemfile.lock 1 addition, 1 deletionGemfile.lock
- app/assets/javascripts/merge_request_widget.js.coffee 5 additions, 3 deletionsapp/assets/javascripts/merge_request_widget.js.coffee
- app/assets/stylesheets/pages/merge_requests.scss 79 additions, 69 deletionsapp/assets/stylesheets/pages/merge_requests.scss
- app/controllers/projects/blob_controller.rb 30 additions, 30 deletionsapp/controllers/projects/blob_controller.rb
- app/controllers/projects/compare_controller.rb 7 additions, 2 deletionsapp/controllers/projects/compare_controller.rb
- app/controllers/projects/merge_requests_controller.rb 7 additions, 5 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/helpers/merge_requests_helper.rb 0 additions, 10 deletionsapp/helpers/merge_requests_helper.rb
- app/models/merge_request.rb 20 additions, 35 deletionsapp/models/merge_request.rb
- app/models/merge_request_diff.rb 12 additions, 20 deletionsapp/models/merge_request_diff.rb
- app/models/namespace.rb 3 additions, 2 deletionsapp/models/namespace.rb
- app/models/project.rb 13 additions, 1 deletionapp/models/project.rb
- app/models/project_services/gitlab_ci_service.rb 0 additions, 4 deletionsapp/models/project_services/gitlab_ci_service.rb
- app/models/repository.rb 0 additions, 82 deletionsapp/models/repository.rb
- app/services/base_service.rb 0 additions, 4 deletionsapp/services/base_service.rb
- app/services/compare_service.rb 20 additions, 21 deletionsapp/services/compare_service.rb
- app/services/files/base_service.rb 7 additions, 70 deletionsapp/services/files/base_service.rb
- app/services/files/create_service.rb 33 additions, 11 deletionsapp/services/files/create_service.rb
- app/services/files/delete_service.rb 30 additions, 3 deletionsapp/services/files/delete_service.rb
- app/services/files/update_service.rb 33 additions, 3 deletionsapp/services/files/update_service.rb
Loading
Please register or sign in to comment