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
This commit is contained in:
Rémy Coutable 2016-07-25 08:49:08 +00:00
commit 8318011034
10 changed files with 1 additions and 15 deletions

View File

@ -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

View File

@ -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.

View File

@ -1,4 +1,3 @@
# encoding: utf-8
class ArtifactUploader < CarrierWave::Uploader::Base
storage :file

View File

@ -1,5 +1,3 @@
# encoding: utf-8
class AttachmentUploader < CarrierWave::Uploader::Base
include UploaderHelper

View File

@ -1,5 +1,3 @@
# encoding: utf-8
class AvatarUploader < CarrierWave::Uploader::Base
include UploaderHelper

View File

@ -1,4 +1,3 @@
# encoding: utf-8
class FileUploader < CarrierWave::Uploader::Base
include UploaderHelper
MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)}

View File

@ -1,5 +1,3 @@
# encoding: utf-8
class LfsObjectUploader < CarrierWave::Uploader::Base
storage :file

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require 'spec_helper'
describe Banzai::Filter::RelativeLinkFilter, lib: true do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require 'spec_helper'
describe Banzai::Filter::TableOfContentsFilter, lib: true do

View File

@ -1,5 +1,3 @@
# encoding: UTF-8
require 'spec_helper'
describe Banzai::Filter::UploadLinkFilter, lib: true do