-
- 下载
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts: Gemfile VERSION app/models/service.rb
显示
- CHANGELOG 5 个添加, 0 个删除CHANGELOG
- Gemfile 1 个添加, 1 个删除Gemfile
- Gemfile.lock 5 个添加, 5 个删除Gemfile.lock
- VERSION 1 个添加, 1 个删除VERSION
- app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee 0 个添加, 14 个删除...vascripts/behaviors/toggle_diff_line_wrap_behavior.coffee
- app/assets/javascripts/calendar.js.coffee 14 个添加, 3 个删除app/assets/javascripts/calendar.js.coffee
- app/assets/stylesheets/base/gl_variables.scss 6 个添加, 749 个删除app/assets/stylesheets/base/gl_variables.scss
- app/assets/stylesheets/base/variables.scss 5 个添加, 9 个删除app/assets/stylesheets/base/variables.scss
- app/assets/stylesheets/generic/calendar.scss 39 个添加, 23 个删除app/assets/stylesheets/generic/calendar.scss
- app/assets/stylesheets/generic/files.scss 1 个添加, 1 个删除app/assets/stylesheets/generic/files.scss
- app/assets/stylesheets/generic/forms.scss 2 个添加, 2 个删除app/assets/stylesheets/generic/forms.scss
- app/assets/stylesheets/generic/lists.scss 6 个添加, 5 个删除app/assets/stylesheets/generic/lists.scss
- app/assets/stylesheets/generic/nav_sidebar.scss 15 个添加, 17 个删除app/assets/stylesheets/generic/nav_sidebar.scss
- app/assets/stylesheets/generic/timeline.scss 2 个添加, 2 个删除app/assets/stylesheets/generic/timeline.scss
- app/assets/stylesheets/generic/typography.scss 1 个添加, 2 个删除app/assets/stylesheets/generic/typography.scss
- app/assets/stylesheets/pages/diff.scss 1 个添加, 1 个删除app/assets/stylesheets/pages/diff.scss
- app/assets/stylesheets/pages/editor.scss 1 个添加, 1 个删除app/assets/stylesheets/pages/editor.scss
- app/assets/stylesheets/pages/events.scss 4 个添加, 2 个删除app/assets/stylesheets/pages/events.scss
- app/assets/stylesheets/pages/merge_requests.scss 1 个添加, 1 个删除app/assets/stylesheets/pages/merge_requests.scss
- app/assets/stylesheets/pages/tree.scss 1 个添加, 1 个删除app/assets/stylesheets/pages/tree.scss
加载中
想要评论请 注册 或 登录