-
- 下载
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-06
# Conflicts: # spec/lib/gitlab/database_spec.rb [ci skip]
显示
- GITALY_SERVER_VERSION 1 个添加, 1 个删除GITALY_SERVER_VERSION
- GITLAB_PAGES_VERSION 1 个添加, 1 个删除GITLAB_PAGES_VERSION
- Gemfile 1 个添加, 1 个删除Gemfile
- Gemfile.lock 2 个添加, 2 个删除Gemfile.lock
- Gemfile.rails5.lock 2 个添加, 2 个删除Gemfile.rails5.lock
- app/assets/javascripts/diffs/components/inline_diff_view.vue 1 个添加, 4 个删除app/assets/javascripts/diffs/components/inline_diff_view.vue
- app/assets/javascripts/diffs/components/parallel_diff_view.vue 1 个添加, 4 个删除...ssets/javascripts/diffs/components/parallel_diff_view.vue
- app/assets/javascripts/diffs/store/getters.js 10 个添加, 14 个删除app/assets/javascripts/diffs/store/getters.js
- app/assets/javascripts/diffs/store/modules/diff_state.js 18 个添加, 0 个删除app/assets/javascripts/diffs/store/modules/diff_state.js
- app/assets/javascripts/diffs/store/modules/index.js 3 个添加, 18 个删除app/assets/javascripts/diffs/store/modules/index.js
- app/assets/javascripts/diffs/store/mutations.js 5 个添加, 10 个删除app/assets/javascripts/diffs/store/mutations.js
- app/assets/stylesheets/pages/boards.scss 5 个添加, 6 个删除app/assets/stylesheets/pages/boards.scss
- app/controllers/concerns/group_tree.rb 26 个添加, 14 个删除app/controllers/concerns/group_tree.rb
- app/models/concerns/group_descendant.rb 2 个添加, 2 个删除app/models/concerns/group_descendant.rb
- app/models/repository.rb 2 个添加, 2 个删除app/models/repository.rb
- app/workers/repository_check/batch_worker.rb 18 个添加, 2 个删除app/workers/repository_check/batch_worker.rb
- app/workers/repository_check/dispatch_worker.rb 11 个添加, 2 个删除app/workers/repository_check/dispatch_worker.rb
- changelogs/unreleased/bvl-preload-parents-after-pagination.yml 5 个添加, 0 个删除...elogs/unreleased/bvl-preload-parents-after-pagination.yml
- changelogs/unreleased/fl-mr-refactor-performance-improvements.yml 5 个添加, 0 个删除...gs/unreleased/fl-mr-refactor-performance-improvements.yml
- changelogs/unreleased/rosulk-patch-12.yml 0 个添加, 5 个删除changelogs/unreleased/rosulk-patch-12.yml
加载中
想要评论请 注册 或 登录