diff options
| author | Cyril <jv.cyril@gmail.com> | 2012-09-27 12:25:52 +0200 |
|---|---|---|
| committer | Cyril <jv.cyril@gmail.com> | 2012-09-27 12:25:52 +0200 |
| commit | e563e948bb907a26c4a170eaec0f3976fdf11d74 (patch) | |
| tree | d828329fd0e73bc4ce8272a029cc41a7ddbde7f0 /app/controllers/snippets_controller.rb | |
| parent | bdf317addc2ae586c76f46ccb1aa8659513baf16 (diff) | |
| parent | a8870e87e4cc8ce441032dc6aa3dfa6e1812090e (diff) | |
| download | gitlab-ce-e563e948bb907a26c4a170eaec0f3976fdf11d74.tar.gz | |
Merge branch 'master' into simplify_controllers2
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 3d404e67a86..03e5cc73ce3 100644 --- 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 |