Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / controllers / api / changeset_comments_controller.rb

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index 756e56dccdfb706d8d6e7c4456683fcc232eb08c..c180571c58b10b0184e1f3dd98ab86f4fb5d8d27 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,15 +1,13 @@
 module Api
   class ChangesetCommentsController < ApiController
     before_action :check_api_writable
 module Api
   class ChangesetCommentsController < ApiController
     before_action :check_api_writable

-    before_action :check_api_readable, :except => [:create]

     before_action :authorize
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]
     before_action :authorize
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]

+

     before_action :set_request_formats
     before_action :set_request_formats

-    around_action :api_call_handle_error
-    around_action :api_call_timeout

 
     ##
     # Add a comment to a changeset
 
     ##
     # Add a comment to a changeset


@@ -105,7 +103,7 @@ module Api
     ##
     # Check if the current user has exceed the rate limit for comments
     def rate_limit_exceeded?
     ##
     # Check if the current user has exceed the rate limit for comments
     def rate_limit_exceeded?

-      recent_comments = current_user.changeset_comments.where("created_at >= ?", Time.now.utc - 1.hour).count
+      recent_comments = current_user.changeset_comments.where(:created_at => Time.now.utc - 1.hour..).count

 
       recent_comments >= current_user.max_changeset_comments_per_hour
     end
 
       recent_comments >= current_user.max_changeset_comments_per_hour
     end