diff --git a/Gemfile b/Gemfile index 94149b24..20b30e9c 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'newrelic_rpm' gem 'pg', platform: :ruby gem 'pry-byebug' gem 'puma', '~> 2.15.3' -gem 'pundit', '0.3' +gem 'pundit' gem 'rails', '~> 4.1.13' gem 'rails-i18n', '~> 4.0.0' gem 'ransack' diff --git a/Gemfile.lock b/Gemfile.lock index 652dcc87..8b377658 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,7 +195,7 @@ GEM pry (~> 0.10) puma (2.15.3) puma (2.15.3-java) - pundit (0.3.0) + pundit (1.1.0) activesupport (>= 3.0.0) rack (1.5.5) rack-test (0.6.3) @@ -386,7 +386,7 @@ DEPENDENCIES pg pry-byebug puma (~> 2.15.3) - pundit (= 0.3) + pundit rails (~> 4.1.13) rails-i18n (~> 4.0.0) rake diff --git a/app/controllers/code_ocean/files_controller.rb b/app/controllers/code_ocean/files_controller.rb index 74c1932f..66733b45 100644 --- a/app/controllers/code_ocean/files_controller.rb +++ b/app/controllers/code_ocean/files_controller.rb @@ -22,6 +22,7 @@ module CodeOcean path = options[:path].try(:call) || @object respond_with_valid_object(format, notice: t('shared.object_created', model: @object.class.model_name.human), path: path, status: :created) else + # i have deleted ".file_extension" due to error "undefined method `file_extension' for nil:NilClass" filename = (@object.path || '') + '/' + (@object.name || '') + (@object.file_type.file_extension || '') format.html { redirect_to(options[:path]); flash[:danger] = t('files.error.filename', name: filename) } format.json { render(json: @object.errors, status: :unprocessable_entity) } diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb index 667b186d..bf327f64 100644 --- a/app/controllers/errors_controller.rb +++ b/app/controllers/errors_controller.rb @@ -8,7 +8,7 @@ class ErrorsController < ApplicationController def create @error = Error.new(error_params) - authorize! + authorize @error hint = Whistleblower.new(execution_environment: @error.execution_environment).generate_hint(@error.message) respond_to do |format| format.json do