summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2020-09-01 03:04:00 +0200
committerGitHub <noreply@github.com>2020-09-01 03:04:00 +0200
commit8972e5f7f643c7a851de68b131b5b49844818ec5 (patch)
tree0b782e777a2611b8b45c5846489e71f43c8b9af7 /lib
parent10f180417e137e469eac3e7b11de90aa9edcaf13 (diff)
Bump rubocop from 0.86.0 to 0.88.0 (#14412)
* Bump rubocop from 0.86.0 to 0.88.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix for latest RuboCop Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/redis_config.rb2
-rw-r--r--lib/mastodon/version.rb6
-rw-r--r--lib/paperclip/color_extractor.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index e9db9122fab..c3c8ff8005d 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -23,7 +23,7 @@ end
setup_redis_env_url
setup_redis_env_url(:cache, false)
-namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
+namespace = ENV.fetch('REDIS_NAMESPACE', nil)
cache_namespace = namespace ? namespace + '_cache' : 'cache'
REDIS_CACHE_PARAMS = {
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 7aa6cb2c782..7b940d1f86e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -33,16 +33,16 @@ module Mastodon
end
def repository
- ENV.fetch('GITHUB_REPOSITORY') { 'tootsuite/mastodon' }
+ ENV.fetch('GITHUB_REPOSITORY', 'tootsuite/mastodon')
end
def source_base_url
- ENV.fetch('SOURCE_BASE_URL') { "https://github.com/#{repository}" }
+ ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
end
# specify git tag or commit hash here
def source_tag
- ENV.fetch('SOURCE_TAG') { nil }
+ ENV.fetch('SOURCE_TAG', nil)
end
def source_url
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index c8bb771a0bd..f850dc067c6 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -89,7 +89,7 @@ module Paperclip
end
end
- # rubocop:disable Style/MethodParameterName
+ # rubocop:disable Naming/MethodParameterName
def rgb_to_hsl(r, g, b)
r /= 255.0
g /= 255.0
@@ -156,7 +156,7 @@ module Paperclip
[(r * 255).round, (g * 255).round, (b * 255).round]
end
- # rubocop:enable Style/MethodParameterName
+ # rubocop:enable Naming/MethodParameterName
def lighten_or_darken(color, by)
hue, saturation, light = rgb_to_hsl(color.r, color.g, color.b)