diff --git a/CHANGELOG b/CHANGELOG index 700d6e37cd7ea2ea57236bc250479fe6952c5736..698fbf6a1604ac6d588e99625ce4ef40360caf69 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.0 (unreleased) + - Remove magic comments (`# encoding: UTF-8`) from Ruby files !5456 (winniehell) - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Limit git rev-list output count to one in forced push check - Retrieve rendered HTML from cache in one request diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 052ce56809e775b96d152449c401b67cbae05a0d..f497626e21aa6425494c4723298ad7981b6ecbdb 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 module CommitsHelper # Returns a link to the commit author. If the author has a matching user and # is a member of the current @project it will link to the team member page. diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb index 1cd93263c9f42974f91d056231676205b83f5dbe..b6c52ddac7a6a5a16a9e7d327e1ffbcae8a1d35b 100644 --- a/app/uploaders/artifact_uploader.rb +++ b/app/uploaders/artifact_uploader.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 class ArtifactUploader < CarrierWave::Uploader::Base storage :file diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb index a65a896e41e597394003888e50d217c7a5dfc9d8..fb3b5dfecd06a1d69613ea95a536d5c775dad9a7 100644 --- a/app/uploaders/attachment_uploader.rb +++ b/app/uploaders/attachment_uploader.rb @@ -1,5 +1,3 @@ -# encoding: utf-8 - class AttachmentUploader < CarrierWave::Uploader::Base include UploaderHelper diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 03d9329a14eaa25c7a635ecfa4d796033be3b169..71ff14a3f20d497b2bfccc78820ce433c8395c1e 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -1,5 +1,3 @@ -# encoding: utf-8 - class AvatarUploader < CarrierWave::Uploader::Base include UploaderHelper diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index 2f5f49f7de716fada04f7dfadf83afa4fcadb5dd..3ac6030c21c747a2b76b64bf292876bdfce1e820 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 class FileUploader < CarrierWave::Uploader::Base include UploaderHelper MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)} diff --git a/app/uploaders/lfs_object_uploader.rb b/app/uploaders/lfs_object_uploader.rb index 046a1d641a92c7e77b07e99dc5d2e23346e75dd9..4f356dd663ee303920027b11dce1b4707259918a 100644 --- a/app/uploaders/lfs_object_uploader.rb +++ b/app/uploaders/lfs_object_uploader.rb @@ -1,5 +1,3 @@ -# encoding: utf-8 - class LfsObjectUploader < CarrierWave::Uploader::Base storage :file diff --git a/spec/lib/banzai/filter/relative_link_filter_spec.rb b/spec/lib/banzai/filter/relative_link_filter_spec.rb index b9e4a4eaf0ecd54ce4ed5306f2f6956e8be37160..2401875a0574796042aa064520f2fb8ad3e10277 100644 --- a/spec/lib/banzai/filter/relative_link_filter_spec.rb +++ b/spec/lib/banzai/filter/relative_link_filter_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require 'spec_helper' describe Banzai::Filter::RelativeLinkFilter, lib: true do diff --git a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb index 6a5d003e87f048190f15202478b7bcb2ec9f7161..356dd01a03a81014ecaac3a92792f215c58bddfe 100644 --- a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb +++ b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require 'spec_helper' describe Banzai::Filter::TableOfContentsFilter, lib: true do diff --git a/spec/lib/banzai/filter/upload_link_filter_spec.rb b/spec/lib/banzai/filter/upload_link_filter_spec.rb index 273d2ed709adf387a16134d1de0787f2915848f3..8b76c1d73c993b5824821e14435f71483a2cbf12 100644 --- a/spec/lib/banzai/filter/upload_link_filter_spec.rb +++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb @@ -1,5 +1,3 @@ -# encoding: UTF-8 - require 'spec_helper' describe Banzai::Filter::UploadLinkFilter, lib: true do