kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects/merge_requests/show.js.haml

3 lines
97 B
Plaintext
Raw Normal View History

Merge Request -> show. Refactored. f5 support for diff
2012-06-29 18:55:22 +00:00
:plain
Merge commit 'master' into discussions Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
2013-01-14 23:52:25 +00:00
merge_request.$(".notes").html("#{escape_javascript(render "notes/notes_with_form")}");