Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rubocop-rails from 2.3.2 to 2.4.0 #115

Merged
merged 2 commits into from
Dec 2, 2019
Merged

Bump rubocop-rails from 2.3.2 to 2.4.0 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2206c45
Bump rubocop-rails from 2.3.2 to 2.4.0
dependabot-preview[bot] Dec 2, 2019
9d7cdc2
rubocop changes
digitaltom Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ GEM
nio4r (2.5.2)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
parallel (1.18.0)
parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
pi_piper (2.0.0)
Expand Down Expand Up @@ -189,7 +189,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.3.2)
rubocop-rails (2.4.0)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)
Expand Down
2 changes: 1 addition & 1 deletion app/models/picture_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class PictureSet
POLAROID_SUFFIX = '_polaroid.png'
ANIMATION_SUFFIX = '_animation.gif'
COMBINED_SUFFIX = '_combined.jpg'
PICTURE_PATH = Rails.root.join('public', 'picture_sets').to_s
PICTURE_PATH = Rails.root.join('public/picture_sets').to_s

attr_accessor :date, :dir, :animation, :combined, :pictures, :next, :last

Expand Down
4 changes: 2 additions & 2 deletions config/initializers/gpio.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

# rubocop:disable Output
# rubocop:disable Rails/Output
# rubocop:disable Lint/RescueException
begin
$VERBOSE = nil
Expand All @@ -13,5 +13,5 @@
ensure
$VERBOSE = false
end
# rubocop:enable Output
# rubocop:enable Rails/Output
# rubocop:enable Lint/RescueException
2 changes: 1 addition & 1 deletion config/initializers/locale.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

# Where the I18n library should search for translation files
I18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
I18n.load_path += Dir[Rails.root.join('config/locales/*.{rb,yml}')]

# Whitelist locales available for the application
I18n.available_locales = %i[en de]
Expand Down
6 changes: 3 additions & 3 deletions spec/models/picture_set_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

require 'rails_helper'

# rubocop:disable BlockLength
# rubocop:disable Metrics/BlockLength
RSpec.describe PictureSet, type: :model do

before do
stub_const('PictureSet::PICTURE_PATH', Rails.root.join('spec', 'fixtures', 'filesystem'))
stub_const('PictureSet::PICTURE_PATH', Rails.root.join('spec/fixtures/filesystem'))
end

describe '#all' do
Expand Down Expand Up @@ -126,4 +126,4 @@
end

end
# rubocop:enable BlockLength
# rubocop:enable Metrics/BlockLength