-
- 下载
Merge remote-tracking branch 'origin/master' into network_graph
Conflicts: app/assets/stylesheets/projects.css.scss lib/commit_ext.rb
显示
- app/assets/stylesheets/application.css 31 个添加, 0 个删除app/assets/stylesheets/application.css
- app/assets/stylesheets/commits.css.scss 3 个添加, 1 个删除app/assets/stylesheets/commits.css.scss
- app/assets/stylesheets/issues.css.scss 12 个添加, 2 个删除app/assets/stylesheets/issues.css.scss
- app/assets/stylesheets/projects.css.scss 117 个添加, 213 个删除app/assets/stylesheets/projects.css.scss
- app/controllers/projects_controller.rb 2 个添加, 15 个删除app/controllers/projects_controller.rb
- app/models/repository.rb 2 个添加, 2 个删除app/models/repository.rb
- app/views/dashboard/index.html.haml 2 个添加, 0 个删除app/views/dashboard/index.html.haml
- app/views/layouts/project.html.haml 1 个添加, 1 个删除app/views/layouts/project.html.haml
- app/views/notes/_form.html.haml 1 个添加, 1 个删除app/views/notes/_form.html.haml
- app/views/projects/_feed.html.haml 15 个添加, 0 个删除app/views/projects/_feed.html.haml
- app/views/projects/_recent_commits.html.haml 0 个添加, 32 个删除app/views/projects/_recent_commits.html.haml
- app/views/projects/_recent_messages.html.haml 0 个添加, 27 个删除app/views/projects/_recent_messages.html.haml
- app/views/projects/show.html.haml 8 个添加, 4 个删除app/views/projects/show.html.haml
- app/views/snippets/_form.html.haml 3 个添加, 2 个删除app/views/snippets/_form.html.haml
- app/views/snippets/index.html.haml 1 个添加, 1 个删除app/views/snippets/index.html.haml
- lib/commit_ext.rb 1 个添加, 1 个删除lib/commit_ext.rb
- spec/requests/dashboard_spec.rb 1 个添加, 0 个删除spec/requests/dashboard_spec.rb
- spec/requests/projects_spec.rb 6 个添加, 3 个删除spec/requests/projects_spec.rb
加载中
想要评论请 注册 或 登录