-
- 下载
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts: # README.md # app/controllers/projects_controller.rb # db/schema.rb # doc/workflow/README.md # lib/gitlab/satellite/merge_action.rb
显示
- CHANGELOG 21 个添加, 4 个删除CHANGELOG
- Gemfile 5 个添加, 5 个删除Gemfile
- README.md 38 个添加, 34 个删除README.md
- app/assets/javascripts/dispatcher.js.coffee 4 个添加, 1 个删除app/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/line_highlighter.js.coffee 1 个添加, 1 个删除app/assets/javascripts/line_highlighter.js.coffee
- app/assets/javascripts/merge_request.js.coffee 9 个添加, 3 个删除app/assets/javascripts/merge_request.js.coffee
- app/assets/javascripts/notes.js.coffee 1 个添加, 1 个删除app/assets/javascripts/notes.js.coffee
- app/controllers/projects/milestones_controller.rb 6 个添加, 1 个删除app/controllers/projects/milestones_controller.rb
- app/controllers/projects/tree_controller.rb 3 个添加, 1 个删除app/controllers/projects/tree_controller.rb
- app/controllers/projects_controller.rb 2 个添加, 2 个删除app/controllers/projects_controller.rb
- app/helpers/projects_helper.rb 19 个添加, 1 个删除app/helpers/projects_helper.rb
- app/models/ability.rb 32 个添加, 23 个删除app/models/ability.rb
- app/models/merge_request.rb 4 个添加, 0 个删除app/models/merge_request.rb
- app/models/project.rb 4 个添加, 0 个删除app/models/project.rb
- app/models/project_services/gitlab_ci_service.rb 6 个添加, 2 个删除app/models/project_services/gitlab_ci_service.rb
- app/models/repository.rb 23 个添加, 35 个删除app/models/repository.rb
- app/services/files/base_service.rb 1 个添加, 1 个删除app/services/files/base_service.rb
- app/services/git_push_service.rb 1 个添加, 1 个删除app/services/git_push_service.rb
- app/services/git_tag_push_service.rb 3 个添加, 3 个删除app/services/git_tag_push_service.rb
- app/services/merge_requests/auto_merge_service.rb 9 个添加, 1 个删除app/services/merge_requests/auto_merge_service.rb
加载中
想要评论请 注册 或 登录