-
- 下载
Merge branch 'master' into new-sidebar
Signed-off-by: 
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
显示
- .rubocop.yml 1 个添加, 1 个删除.rubocop.yml
- CHANGELOG 3 个添加, 2 个删除CHANGELOG
- Gemfile 6 个添加, 5 个删除Gemfile
- Gemfile.lock 19 个添加, 17 个删除Gemfile.lock
- app/assets/javascripts/application.js.coffee 2 个添加, 1 个删除app/assets/javascripts/application.js.coffee
- app/assets/javascripts/confirm_danger_modal.js.coffee 2 个添加, 0 个删除app/assets/javascripts/confirm_danger_modal.js.coffee
- app/assets/javascripts/dispatcher.js.coffee 2 个添加, 2 个删除app/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/shortcuts_issuable.coffee 48 个添加, 0 个删除app/assets/javascripts/shortcuts_issuable.coffee
- app/assets/javascripts/shortcuts_issueable.coffee 0 个添加, 19 个删除app/assets/javascripts/shortcuts_issueable.coffee
- app/assets/javascripts/stat_graph_contributors.js.coffee 4 个添加, 0 个删除app/assets/javascripts/stat_graph_contributors.js.coffee
- app/assets/javascripts/stat_graph_contributors_graph.js.coffee 4 个添加, 0 个删除...ssets/javascripts/stat_graph_contributors_graph.js.coffee
- app/controllers/admin/application_controller.rb 1 个添加, 1 个删除app/controllers/admin/application_controller.rb
- app/controllers/admin/application_settings_controller.rb 1 个添加, 1 个删除app/controllers/admin/application_settings_controller.rb
- app/controllers/admin/broadcast_messages_controller.rb 1 个添加, 1 个删除app/controllers/admin/broadcast_messages_controller.rb
- app/controllers/admin/deploy_keys_controller.rb 3 个添加, 3 个删除app/controllers/admin/deploy_keys_controller.rb
- app/controllers/admin/groups_controller.rb 1 个添加, 1 个删除app/controllers/admin/groups_controller.rb
- app/controllers/admin/keys_controller.rb 1 个添加, 1 个删除app/controllers/admin/keys_controller.rb
- app/controllers/admin/projects_controller.rb 3 个添加, 3 个删除app/controllers/admin/projects_controller.rb
- app/controllers/admin/services_controller.rb 1 个添加, 1 个删除app/controllers/admin/services_controller.rb
- app/controllers/admin/users_controller.rb 1 个添加, 1 个删除app/controllers/admin/users_controller.rb
加载中
想要评论请 注册 或 登录