diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-08-15 14:49:56 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-15 14:49:56 +0900 |
commit | 7e3a0a947faeecee03d2714789084addbcf7e414 (patch) | |
tree | b4a7a367c46321d3903971b47fbe6be4fc1b5b4f | |
parent | 111643b8a36bcb0e24eee91cd66a4e983d4b64be (diff) | |
parent | ea37ccddba06466ddcde67d6c2814e401d1e2c5c (diff) | |
download | rails-7e3a0a947faeecee03d2714789084addbcf7e414.tar.gz rails-7e3a0a947faeecee03d2714789084addbcf7e414.tar.bz2 rails-7e3a0a947faeecee03d2714789084addbcf7e414.zip |
Merge pull request #33620 from bogdanvlviv/fix-rubocop-offenses
Fix rubocop offenses
-rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 2 | ||||
-rw-r--r-- | tasks/release.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index ea637c8150..7ed7b9d546 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -46,7 +46,7 @@ module ActionController #:nodoc: # allowed via {CORS}[https://en.wikipedia.org/wiki/Cross-origin_resource_sharing] # will also be able to create XHR requests. Be sure to check your # CORS whitelist before disabling forgery protection for XHR. - # + # # CSRF protection is turned on with the <tt>protect_from_forgery</tt> method. # By default <tt>protect_from_forgery</tt> protects your session with # <tt>:null_session</tt> method, which provides an empty session diff --git a/tasks/release.rb b/tasks/release.rb index f13342b90c..1e83814bae 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -105,7 +105,7 @@ namespace :changelog do current_contents = File.read(fname) header = "## Rails #{version} (#{Date.today.strftime('%B %d, %Y')}) ##\n\n" - header += "* No changes.\n\n\n" if current_contents =~ /\A##/ + header += "* No changes.\n\n\n" if current_contents.start_with?("##") contents = header + current_contents File.write(fname, contents) end |