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

1 files changed, 24 insertions, 0 deletions

diff --git a/doc/code/js/main.js b/doc/code/js/main.js
new file mode 100755
index 00000000000..859772b91d9
--- /dev/null
+++ b/doc/code/js/main.js
@@ -0,0 +1,24 @@
+function toggleSource(id)
+{
+  var src = $('#' + id).toggle();
+  var isVisible = src.is(':visible');
+  $('#l_' + id).html(isVisible ? 'hide' : 'show');
+  if (!src.data('syntax-higlighted')) {
+    src.data('syntax-higlighted', 1);
+    hljs.highlightBlock(src[0]);
+  }
+}
+
+window.highlight = function(url) {
+  var hash = url.match(/#([^#]+)$/)
+  if(hash) {
+    $('a[name=' + hash[1] + ']').parent().effect('highlight', {}, 'slow')
+  }
+}
+
+$(function() {
+  highlight('#' + location.hash);
+  $('.description pre').each(function() {
+    hljs.highlightBlock(this);
+  });
+});