Merge branch 'ticket/master/30-upstream-code-review' into upstream-master
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .hgignore 23 additions, 0 deletions.hgignore
- app/controllers/account_controller.rb 14 additions, 2 deletionsapp/controllers/account_controller.rb
- app/controllers/activities_controller.rb 1 addition, 1 deletionapp/controllers/activities_controller.rb
- app/controllers/application_controller.rb 69 additions, 4 deletionsapp/controllers/application_controller.rb
- app/controllers/auto_completes_controller.rb 4 additions, 2 deletionsapp/controllers/auto_completes_controller.rb
- app/controllers/context_menus_controller.rb 2 additions, 1 deletionapp/controllers/context_menus_controller.rb
- app/controllers/issue_relations_controller.rb 5 additions, 1 deletionapp/controllers/issue_relations_controller.rb
- app/controllers/issues_controller.rb 22 additions, 25 deletionsapp/controllers/issues_controller.rb
- app/controllers/journals_controller.rb 1 addition, 0 deletionsapp/controllers/journals_controller.rb
- app/controllers/my_controller.rb 3 additions, 5 deletionsapp/controllers/my_controller.rb
- app/controllers/news_controller.rb 18 additions, 7 deletionsapp/controllers/news_controller.rb
- app/controllers/projects_controller.rb 24 additions, 25 deletionsapp/controllers/projects_controller.rb
- app/controllers/repositories_controller.rb 22 additions, 5 deletionsapp/controllers/repositories_controller.rb
- app/controllers/timelog_controller.rb 63 additions, 17 deletionsapp/controllers/timelog_controller.rb
- app/controllers/users_controller.rb 82 additions, 54 deletionsapp/controllers/users_controller.rb
- app/helpers/application_helper.rb 86 additions, 32 deletionsapp/helpers/application_helper.rb
- app/helpers/attachments_helper.rb 13 additions, 1 deletionapp/helpers/attachments_helper.rb
- app/helpers/custom_fields_helper.rb 11 additions, 0 deletionsapp/helpers/custom_fields_helper.rb
- app/helpers/issues_helper.rb 14 additions, 0 deletionsapp/helpers/issues_helper.rb
Please register or sign in to comment