-
- Downloads
Merge branch 'master-ce-to-ee' into 'master'
Master CE to EE See merge request !480
Showing
- CHANGELOG 12 additions, 1 deletionCHANGELOG
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 2 additions, 2 deletionsGemfile.lock
- VERSION 1 addition, 1 deletionVERSION
- app/assets/javascripts/merge_request_widget.js.coffee 1 addition, 1 deletionapp/assets/javascripts/merge_request_widget.js.coffee
- app/assets/stylesheets/pages/issues.scss 1 addition, 12 deletionsapp/assets/stylesheets/pages/issues.scss
- app/controllers/help_controller.rb 4 additions, 2 deletionsapp/controllers/help_controller.rb
- app/controllers/projects/blob_controller.rb 30 additions, 30 deletionsapp/controllers/projects/blob_controller.rb
- app/controllers/projects/compare_controller.rb 2 additions, 7 deletionsapp/controllers/projects/compare_controller.rb
- app/controllers/projects/merge_requests_controller.rb 5 additions, 7 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/models/merge_request.rb 35 additions, 20 deletionsapp/models/merge_request.rb
- app/models/merge_request_diff.rb 20 additions, 12 deletionsapp/models/merge_request_diff.rb
- app/models/namespace.rb 2 additions, 3 deletionsapp/models/namespace.rb
- app/models/project.rb 1 addition, 13 deletionsapp/models/project.rb
- app/models/project_services/gitlab_ci_service.rb 4 additions, 0 deletionsapp/models/project_services/gitlab_ci_service.rb
- app/models/repository.rb 150 additions, 0 deletionsapp/models/repository.rb
- app/services/base_service.rb 4 additions, 0 deletionsapp/services/base_service.rb
- app/services/compare_service.rb 21 additions, 20 deletionsapp/services/compare_service.rb
- app/services/files/base_service.rb 65 additions, 7 deletionsapp/services/files/base_service.rb
- app/services/files/create_service.rb 11 additions, 33 deletionsapp/services/files/create_service.rb
Loading
Please register or sign in to comment