summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-12 22:41:01 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-12 22:41:01 +0000
commit4735a753407b364f7034cf4dbd6ae621b25396c2 (patch)
tree649e64a0cf21ff1d733ef7a0d9f4c358deafc207 /config/initializers
parent5186f6e3bd541ffa13f9f907067c638790b9ebfe (diff)
parent9cc0937b3a41caca89fa6722149248a8f7b0a447 (diff)
downloadgitlab-ce-4735a753407b364f7034cf4dbd6ae621b25396c2.tar.gz
Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/carrierwave.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index df28d30d750..0d278717d6e 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -2,7 +2,7 @@ CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
aws_file = Rails.root.join('config', 'aws.yml')
-if File.exists?(aws_file)
+if File.exist?(aws_file)
AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
CarrierWave.configure do |config|