Merge branch 'ticket/master/30-upstream-code-review-cherry-pick' into...
Merge branch 'ticket/master/30-upstream-code-review-cherry-pick' into ticket/master/30-upstream-code-review
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .hgignore 1 addition, 0 deletions.hgignore
- app/controllers/account_controller.rb 14 additions, 2 deletionsapp/controllers/account_controller.rb
- app/controllers/issue_relations_controller.rb 5 additions, 1 deletionapp/controllers/issue_relations_controller.rb
- app/controllers/issues_controller.rb 1 addition, 0 deletionsapp/controllers/issues_controller.rb
- app/controllers/repositories_controller.rb 5 additions, 2 deletionsapp/controllers/repositories_controller.rb
- app/helpers/application_helper.rb 40 additions, 22 deletionsapp/helpers/application_helper.rb
- app/helpers/messages_helper.rb 0 additions, 10 deletionsapp/helpers/messages_helper.rb
- app/models/attachment.rb 1 addition, 1 deletionapp/models/attachment.rb
- app/models/document.rb 3 additions, 0 deletionsapp/models/document.rb
- app/models/issue.rb 1 addition, 10 deletionsapp/models/issue.rb
- app/models/mailer.rb 1 addition, 1 deletionapp/models/mailer.rb
- app/models/message.rb 3 additions, 0 deletionsapp/models/message.rb
- app/models/repository/cvs.rb 17 additions, 8 deletionsapp/models/repository/cvs.rb
- app/models/user.rb 13 additions, 4 deletionsapp/models/user.rb
- app/views/issues/_relations.rhtml 2 additions, 2 deletionsapp/views/issues/_relations.rhtml
- app/views/issues/show.api.rsb 2 additions, 2 deletionsapp/views/issues/show.api.rsb
- app/views/layouts/base.rhtml 1 addition, 1 deletionapp/views/layouts/base.rhtml
- app/views/repositories/_breadcrumbs.rhtml 1 addition, 1 deletionapp/views/repositories/_breadcrumbs.rhtml
- app/views/settings/_notifications.rhtml 1 addition, 1 deletionapp/views/settings/_notifications.rhtml
Please register or sign in to comment