diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
| commit | 0452e0a57e24fdd65f559cc1a8629892714adc7a (patch) | |
| tree | bf33ca472a3d434770783d80b5d10211383e706c /app/controllers/projects_controller.rb | |
| parent | 7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff) | |
| parent | f76596380fb545c54b14c6bfc339a68a1dc162d3 (diff) | |
| download | gitlab-ce-faster-diffs.tar.gz | |
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 12e0d5a8413..1803aa8eab4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -53,11 +53,11 @@ class ProjectsController < Projects::ApplicationController notice: "Project '#{@project.name}' was successfully updated." ) end - format.js else format.html { render 'edit' } - format.js end + + format.js end end |