-
- 下载
Merge branch 'assets-refactoring' into dev
Conflicts: app/controllers/issues_controller.rb app/views/issues/index.html.haml
显示
- app/assets/javascripts/application.js 4 个添加, 1 个删除app/assets/javascripts/application.js
- app/assets/javascripts/jquery.ui.selectmenu.js 0 个添加, 845 个删除app/assets/javascripts/jquery.ui.selectmenu.js
- app/assets/javascripts/projects.js 1 个添加, 1 个删除app/assets/javascripts/projects.js
- app/assets/stylesheets/application.css 3 个添加, 1 个删除app/assets/stylesheets/application.css
- app/assets/stylesheets/highlight.css.scss 7 个添加, 9 个删除app/assets/stylesheets/highlight.css.scss
- app/assets/stylesheets/projects.css.scss 93 个添加, 98 个删除app/assets/stylesheets/projects.css.scss
- app/controllers/admin/mailer_controller.rb 3 个添加, 3 个删除app/controllers/admin/mailer_controller.rb
- app/controllers/admin/users_controller.rb 3 个添加, 3 个删除app/controllers/admin/users_controller.rb
- app/controllers/application_controller.rb 3 个添加, 3 个删除app/controllers/application_controller.rb
- app/controllers/issues_controller.rb 4 个添加, 5 个删除app/controllers/issues_controller.rb
- app/controllers/keys_controller.rb 1 个添加, 1 个删除app/controllers/keys_controller.rb
- app/controllers/notes_controller.rb 5 个添加, 6 个删除app/controllers/notes_controller.rb
- app/controllers/profile_controller.rb 1 个添加, 1 个删除app/controllers/profile_controller.rb
- app/controllers/projects_controller.rb 12 个添加, 12 个删除app/controllers/projects_controller.rb
- app/controllers/snippets_controller.rb 3 个添加, 3 个删除app/controllers/snippets_controller.rb
- app/controllers/team_members_controller.rb 4 个添加, 4 个删除app/controllers/team_members_controller.rb
- app/helpers/application_helper.rb 8 个添加, 8 个删除app/helpers/application_helper.rb
- app/helpers/commits_helper.rb 3 个添加, 3 个删除app/helpers/commits_helper.rb
- app/helpers/projects_helper.rb 1 个添加, 1 个删除app/helpers/projects_helper.rb
- app/models/ability.rb 5 个添加, 5 个删除app/models/ability.rb
加载中
想要评论请 注册 或 登录