-
- Downloads
Merge branch 'master' into new-sidebar
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
No related branches found
No related tags found
Showing
- .rubocop.yml 1 addition, 1 deletion.rubocop.yml
- CHANGELOG 3 additions, 2 deletionsCHANGELOG
- Gemfile 6 additions, 5 deletionsGemfile
- Gemfile.lock 19 additions, 17 deletionsGemfile.lock
- app/assets/javascripts/application.js.coffee 2 additions, 1 deletionapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/confirm_danger_modal.js.coffee 2 additions, 0 deletionsapp/assets/javascripts/confirm_danger_modal.js.coffee
- app/assets/javascripts/dispatcher.js.coffee 2 additions, 2 deletionsapp/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/shortcuts_issuable.coffee 48 additions, 0 deletionsapp/assets/javascripts/shortcuts_issuable.coffee
- app/assets/javascripts/shortcuts_issueable.coffee 0 additions, 19 deletionsapp/assets/javascripts/shortcuts_issueable.coffee
- app/assets/javascripts/stat_graph_contributors.js.coffee 4 additions, 0 deletionsapp/assets/javascripts/stat_graph_contributors.js.coffee
- app/assets/javascripts/stat_graph_contributors_graph.js.coffee 4 additions, 0 deletions...ssets/javascripts/stat_graph_contributors_graph.js.coffee
- app/controllers/admin/application_controller.rb 1 addition, 1 deletionapp/controllers/admin/application_controller.rb
- app/controllers/admin/application_settings_controller.rb 1 addition, 1 deletionapp/controllers/admin/application_settings_controller.rb
- app/controllers/admin/broadcast_messages_controller.rb 1 addition, 1 deletionapp/controllers/admin/broadcast_messages_controller.rb
- app/controllers/admin/deploy_keys_controller.rb 3 additions, 3 deletionsapp/controllers/admin/deploy_keys_controller.rb
- app/controllers/admin/groups_controller.rb 1 addition, 1 deletionapp/controllers/admin/groups_controller.rb
- app/controllers/admin/keys_controller.rb 1 addition, 1 deletionapp/controllers/admin/keys_controller.rb
- app/controllers/admin/projects_controller.rb 3 additions, 3 deletionsapp/controllers/admin/projects_controller.rb
- app/controllers/admin/services_controller.rb 1 addition, 1 deletionapp/controllers/admin/services_controller.rb
- app/controllers/admin/users_controller.rb 1 addition, 1 deletionapp/controllers/admin/users_controller.rb
Loading
Please register or sign in to comment