Skip to content

Commit

Permalink
Merge pull request #114 from dblock/require-relative
Browse files Browse the repository at this point in the history
Use require-relative to avoid local collisions.
  • Loading branch information
dblock committed Apr 26, 2020
2 parents 9215626 + e0dcb94 commit 7d0fbdb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,7 @@
* [#112](https://github.com/slack-ruby/slack-ruby-bot-server/pull/112): Added support for multiple `.on` events as an argument - [@dblock](https://github.com/dblock).
* [#111](https://github.com/slack-ruby/slack-ruby-bot-server/pull/111): Removed dependency on Virtus - [@dblock](https://github.com/dblock).
* [#110](https://github.com/slack-ruby/slack-ruby-bot-server/pull/110): Fix ActiveRecord sample app - [@CeeBeeUK](https://github.com/CeeBeeUK).
* [#114](https://github.com/slack-ruby/slack-ruby-bot-server/pull/114): Use `require_relative` to prevent local collisions - [@dblock](https://github.com/dblock).

#### 0.11.1 (2019/5/17)

Expand Down
20 changes: 9 additions & 11 deletions lib/slack-ruby-bot-server.rb
Expand Up @@ -2,15 +2,13 @@

require 'grape-swagger'
require 'slack-ruby-bot'
require 'slack-ruby-bot-server/service'
require 'slack-ruby-bot-server/server'
require 'slack-ruby-bot-server/config'

require 'slack-ruby-bot-server/ext'
require 'slack-ruby-bot-server/version'
require 'slack-ruby-bot-server/info'

require "slack-ruby-bot-server/config/database_adapters/#{SlackRubyBotServer::Config.database_adapter}.rb"

require 'slack-ruby-bot-server/api'
require 'slack-ruby-bot-server/app'
require_relative 'slack-ruby-bot-server/service'
require_relative 'slack-ruby-bot-server/server'
require_relative 'slack-ruby-bot-server/config'
require_relative 'slack-ruby-bot-server/ext'
require_relative 'slack-ruby-bot-server/version'
require_relative 'slack-ruby-bot-server/info'
require_relative "slack-ruby-bot-server/config/database_adapters/#{SlackRubyBotServer::Config.database_adapter}.rb"
require_relative 'slack-ruby-bot-server/api'
require_relative 'slack-ruby-bot-server/app'

0 comments on commit 7d0fbdb

Please sign in to comment.