Skip to content

Commit

Permalink
Merge 98bc694 into 4ec6af4
Browse files Browse the repository at this point in the history
  • Loading branch information
lbeder committed May 9, 2019
2 parents 4ec6af4 + 98bc694 commit c555215
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Layout/AlignArray:
Layout/MultilineOperationIndentation:
EnforcedStyle: indented

Layout/IndentHash:
Layout/IndentFirstHashElement:
EnforcedStyle: consistent

Style/Documentation:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: ruby
rvm:
- 2.3.6
- 2.4.3
- 2.5.1
- 2.3.8
- 2.4.5
- 2.5.3
- ruby-head
gemfile:
- gemfiles/rails_5.0.gemfile
Expand Down
10 changes: 3 additions & 7 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
appraise 'rails-4.2' do
gem 'rails', '~> 4.2.10'
end

appraise 'rails-5.0' do
gem 'rails', '~> 5.0.7'
gem 'rails', '~> 5.0.7.1'
end

appraise 'rails-5.1' do
gem 'rails', '~> 5.1.6'
gem 'rails', '~> 5.1.6.1'
end

appraise 'rails-5.2' do
gem 'rails', '~> 5.2.0'
gem 'rails', '~> 5.2.2'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 8.6.0 (2019-05-09)

- Fix engine autoloading and updated CI.

## 8.5.0 (2019-02-19)

- Fix default Sidekiq configuration setting.
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
source 'https://rubygems.org'

gem 'rdoc'

# Specify your gem's dependencies in rediska.gemspec
gemspec
6 changes: 4 additions & 2 deletions bin/rails
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/usr/bin/env ruby
# This command will automatically be run when you run "rails" with Rails 3/4 gems installed from the
# root of your application.

ENGINE_ROOT = File.expand_path('..', __dir__)
ENGINE_PATH = File.expand_path('../lib/health_monitor/engine', __dir__)

# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

require 'rails/all'
require 'rails/engine/commands'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.0.7'
gem 'rails', '~> 5.0.7.1'
gem 'rdoc'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.1.6'
gem 'rails', '~> 5.1.6.1'
gem 'rdoc'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.2.0'
gem 'rails', '~> 5.2.2'
gem 'rdoc'

gemspec path: '../'
1 change: 1 addition & 0 deletions lib/health-monitor-rails.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require 'health_monitor/engine' # rubocop:disable Naming/FileName
2 changes: 1 addition & 1 deletion lib/health_monitor/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module HealthMonitor
VERSION = '8.5.0'.freeze
VERSION = '8.6.0'.freeze
end
4 changes: 0 additions & 4 deletions lib/health_monitor_rails.rb

This file was deleted.

2 changes: 1 addition & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'rails/all'

Bundler.require(*Rails.groups)
require 'health_monitor_rails'
require 'health-monitor-rails'

module Dummy
class Application < Rails::Application
Expand Down

0 comments on commit c555215

Please sign in to comment.