-
- 下载
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-09
# Conflicts: # app/assets/javascripts/boards/index.js [ci skip]
显示
- Gemfile 1 个添加, 0 个删除Gemfile
- Gemfile.rails5.lock 5 个添加, 0 个删除Gemfile.rails5.lock
- app/assets/javascripts/blob/file_template_mediator.js 1 个添加, 1 个删除app/assets/javascripts/blob/file_template_mediator.js
- app/assets/javascripts/blob/file_template_selector.js 4 个添加, 0 个删除app/assets/javascripts/blob/file_template_selector.js
- app/assets/javascripts/boards/index.js 3 个添加, 0 个删除app/assets/javascripts/boards/index.js
- app/controllers/projects/repositories_controller.rb 7 个添加, 2 个删除app/controllers/projects/repositories_controller.rb
- app/models/service.rb 5 个添加, 1 个删除app/models/service.rb
- app/views/notify/push_to_merge_request_email.html.haml 1 个添加, 1 个删除app/views/notify/push_to_merge_request_email.html.haml
- app/views/notify/push_to_merge_request_email.text.haml 1 个添加, 1 个删除app/views/notify/push_to_merge_request_email.text.haml
- changelogs/unreleased/32617-fix-template-selector-menu-visibility.yml 6 个添加, 0 个删除...nreleased/32617-fix-template-selector-menu-visibility.yml
- spec/controllers/projects/repositories_controller_spec.rb 6 个添加, 0 个删除spec/controllers/projects/repositories_controller_spec.rb
- spec/features/projects/files/template_selector_menu_spec.rb 66 个添加, 0 个删除spec/features/projects/files/template_selector_menu_spec.rb
- spec/mailers/notify_spec.rb 14 个添加, 2 个删除spec/mailers/notify_spec.rb
加载中
想要评论请 注册 或 登录