Merge branch 'master' into simplify_controllers2

Conflicts: app/controllers/commits_controller.rb app/controllers/refs_controller.rb
2012-09-27 12:25:52 +02:00 · 2012-09-27 12:25:52 +02:00 · e563e948bb
commit e563e948bb
parent bdf317addc a8870e87e4
108 changed files with 1762 additions and 652 deletions
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@ -50,7 +50,6 @@ class SnippetsController < ProjectController

  def show
    @note = @project.notes.new(noteable: @snippet)
-    render_full_content
  end

  def destroy