diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:00:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:00:30 +0000 |
| commit | 67b0857d29d0ad56771ce5ea4316f6057c64db66 (patch) | |
| tree | b492c098f811d1cd3623cfc4ff9fe74a88564e2d /app/controllers/projects_controller.rb | |
| parent | a727d25eee91ac4a5ef4f6dc2ec63b073439758d (diff) | |
| parent | 3398e0a3d7a1bed8efb7e700dee92f95173d8334 (diff) | |
| download | gitlab-ce-67b0857d29d0ad56771ce5ea4316f6057c64db66.tar.gz | |
Merge branch 'revert-img-paste' into 'master'
Revert img paste
Fixes #1307
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6ea9b2cf27d..b9af36a0c7e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,8 +11,6 @@ class ProjectsController < ApplicationController layout 'navless', only: [:new, :create, :fork] before_filter :set_title, only: [:new, :create] - rescue_from CarrierWave::IntegrityError, with: :invalid_file - def new @project = Project.new end @@ -187,10 +185,6 @@ class ProjectsController < ApplicationController %w(png jpg jpeg gif) end - def invalid_file(error) - render json: { message: error.message }, status: :internal_server_error - end - def set_title @title = 'New Project' end |