diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
| commit | 3398e0a3d7a1bed8efb7e700dee92f95173d8334 (patch) | |
| tree | 92817b5e9127c613b61a137e6add5d28cb42c4f0 /app/controllers/projects_controller.rb | |
| parent | 31fcac9ff9e1c3a0b08617bcc9d5e549c11634b6 (diff) | |
| download | gitlab-ce-3398e0a3d7a1bed8efb7e700dee92f95173d8334.tar.gz | |
Revert "Implements and refactors clipboard feature for markdown."
This reverts commit 2273234653924b731f9ef01432e392481ee1d4e2.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/issues/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/milestones/_form.html.haml
app/views/projects/notes/_form.html.haml
app/views/projects/wikis/_form.html.haml
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 |