Resolve easy conflicts
Signed-off-by: 
Rémy Coutable <remy@rymai.me>
显示
- .gitlab-ci.yml 0 个添加, 3 个删除.gitlab-ci.yml
- CHANGELOG.md 0 个添加, 3 个删除CHANGELOG.md
- Gemfile.lock 3 个添加, 11 个删除Gemfile.lock
- app/views/projects/blob/_header.html.haml 0 个添加, 3 个删除app/views/projects/blob/_header.html.haml
- config/database.yml.postgresql 0 个添加, 3 个删除config/database.yml.postgresql
- db/schema.rb 0 个添加, 4 个删除db/schema.rb
- scripts/prepare_build.sh 0 个添加, 12 个删除scripts/prepare_build.sh
- spec/features/protected_branches_spec.rb 0 个添加, 6 个删除spec/features/protected_branches_spec.rb
- spec/javascripts/blob/blob_fork_suggestion_spec.js 0 个添加, 8 个删除spec/javascripts/blob/blob_fork_suggestion_spec.js
- spec/support/test_env.rb 2 个添加, 5 个删除spec/support/test_env.rb
加载中
想要评论请 注册 或 登录