diff --git a/Gemfile b/Gemfile index 765f041550553ba6d92f57b4e264cb999838c09c..f498e83e4ac95bfb7618e2fa8cad0a0f651ddbe2 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,6 @@ gem "activerecord-import", "0.15.0" gem "carrierwave", "0.11.2" gem "fog", "1.38.0" gem "mini_magick", "4.5.1" -gem "remotipart", "1.2.1" # GUID generation gem "uuid", "2.3.8" diff --git a/Gemfile.lock b/Gemfile.lock index 951e23a39bd19a14eee413511932e78a28f767b7..ea2b6dfe9fab6fff25095ea463430e258e8ee49f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1019,7 +1019,6 @@ DEPENDENCIES rb-fsevent (= 0.9.7) rb-inotify (= 0.9.7) redcarpet (= 3.3.4) - remotipart (= 1.2.1) responders (= 2.2.0) rspec-rails (= 3.5.1) rubocop (= 0.40.0) diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index e5b5a8688e5f204cbe1b3e085fd0e888cc2bb0dc..36667eb553c0f85f92ea8a8d808e55152e5519c9 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -6,7 +6,6 @@ //= require js-routes //= require underscore //= require backbone -//= require jquery.remotipart //= require autosize //= require charcount //= require jquery-placeholder diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 33b15e5717fe1476b1d142a67e2670dcd10069da..d8b59fb4a480ba057e964799f9e5b6f326959095 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -43,18 +43,7 @@ class PhotosController < ApplicationController def create rescuing_photo_errors do - if remotipart_submitted? - @photo = current_user.build_post(:photo, photo_params) - if @photo.save - respond_to do |format| - format.json { render :json => {"success" => true, "data" => @photo.as_api_response(:backbone)} } - end - else - respond_with @photo, :location => photos_path, :error => message - end - else - legacy_create - end + legacy_create end end