-
- Downloads
Merge branch 'rs-revert-gh-9820' into 'master'
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd0, reversing changes made to 8ab5df9d. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
Showing
- app/assets/javascripts/notes.js.coffee 7 additions, 6 deletionsapp/assets/javascripts/notes.js.coffee
- app/controllers/projects/notes_controller.rb 1 addition, 6 deletionsapp/controllers/projects/notes_controller.rb
- app/views/projects/notes/_note.html.haml 4 additions, 1 deletionapp/views/projects/notes/_note.html.haml
- app/views/projects/notes/_notes_with_form.html.haml 1 addition, 1 deletionapp/views/projects/notes/_notes_with_form.html.haml
- app/views/projects/notes/edit.js.erb 0 additions, 2 deletionsapp/views/projects/notes/edit.js.erb
- config/routes.rb 1 addition, 1 deletionconfig/routes.rb
- features/steps/project/issues/issues.rb 1 addition, 1 deletionfeatures/steps/project/issues/issues.rb
- spec/features/notes_on_merge_requests_spec.rb 6 additions, 0 deletionsspec/features/notes_on_merge_requests_spec.rb
- spec/features/task_lists_spec.rb 3 additions, 0 deletionsspec/features/task_lists_spec.rb
Loading
Please register or sign in to comment