Commit 83180110 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'remove-magic-comments' into 'master'

Remove magic comments from Ruby files

## What does this MR do?

Remove magic comments (`# encoding: UTF-8`) from Ruby files.

## Why was this MR needed?

Since Ruby 2, UTF-8 is the default encoding and those comments are no longer necessary.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5163#note_13134307

cc @rymai 

See merge request !5456
parents 20209565 58c562a9
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.11.0 (unreleased) 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' - 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 - Limit git rev-list output count to one in forced push check
- Retrieve rendered HTML from cache in one request - Retrieve rendered HTML from cache in one request
......
# encoding: utf-8
module CommitsHelper module CommitsHelper
# Returns a link to the commit author. If the author has a matching user and # 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. # is a member of the current @project it will link to the team member page.
......
# encoding: utf-8
class ArtifactUploader < CarrierWave::Uploader::Base class ArtifactUploader < CarrierWave::Uploader::Base
storage :file storage :file
......
# encoding: utf-8
class AttachmentUploader < CarrierWave::Uploader::Base class AttachmentUploader < CarrierWave::Uploader::Base
include UploaderHelper include UploaderHelper
......
# encoding: utf-8
class AvatarUploader < CarrierWave::Uploader::Base class AvatarUploader < CarrierWave::Uploader::Base
include UploaderHelper include UploaderHelper
......
# encoding: utf-8
class FileUploader < CarrierWave::Uploader::Base class FileUploader < CarrierWave::Uploader::Base
include UploaderHelper include UploaderHelper
MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)} MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)}
......
# encoding: utf-8
class LfsObjectUploader < CarrierWave::Uploader::Base class LfsObjectUploader < CarrierWave::Uploader::Base
storage :file storage :file
......
# encoding: UTF-8
require 'spec_helper' require 'spec_helper'
describe Banzai::Filter::RelativeLinkFilter, lib: true do describe Banzai::Filter::RelativeLinkFilter, lib: true do
......
# encoding: UTF-8
require 'spec_helper' require 'spec_helper'
describe Banzai::Filter::TableOfContentsFilter, lib: true do describe Banzai::Filter::TableOfContentsFilter, lib: true do
......
# encoding: UTF-8
require 'spec_helper' require 'spec_helper'
describe Banzai::Filter::UploadLinkFilter, lib: true do describe Banzai::Filter::UploadLinkFilter, lib: true do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment