Skip to content

Commit 7d0fbdb

Browse files
authored
Merge pull request #114 from dblock/require-relative
Use require-relative to avoid local collisions.
2 parents 9215626 + e0dcb94 commit 7d0fbdb

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* [#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).
88
* [#111](https://github.com/slack-ruby/slack-ruby-bot-server/pull/111): Removed dependency on Virtus - [@dblock](https://github.com/dblock).
99
* [#110](https://github.com/slack-ruby/slack-ruby-bot-server/pull/110): Fix ActiveRecord sample app - [@CeeBeeUK](https://github.com/CeeBeeUK).
10+
* [#114](https://github.com/slack-ruby/slack-ruby-bot-server/pull/114): Use `require_relative` to prevent local collisions - [@dblock](https://github.com/dblock).
1011

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

lib/slack-ruby-bot-server.rb

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
require 'grape-swagger'
44
require 'slack-ruby-bot'
5-
require 'slack-ruby-bot-server/service'
6-
require 'slack-ruby-bot-server/server'
7-
require 'slack-ruby-bot-server/config'
85

9-
require 'slack-ruby-bot-server/ext'
10-
require 'slack-ruby-bot-server/version'
11-
require 'slack-ruby-bot-server/info'
12-
13-
require "slack-ruby-bot-server/config/database_adapters/#{SlackRubyBotServer::Config.database_adapter}.rb"
14-
15-
require 'slack-ruby-bot-server/api'
16-
require 'slack-ruby-bot-server/app'
6+
require_relative 'slack-ruby-bot-server/service'
7+
require_relative 'slack-ruby-bot-server/server'
8+
require_relative 'slack-ruby-bot-server/config'
9+
require_relative 'slack-ruby-bot-server/ext'
10+
require_relative 'slack-ruby-bot-server/version'
11+
require_relative 'slack-ruby-bot-server/info'
12+
require_relative "slack-ruby-bot-server/config/database_adapters/#{SlackRubyBotServer::Config.database_adapter}.rb"
13+
require_relative 'slack-ruby-bot-server/api'
14+
require_relative 'slack-ruby-bot-server/app'

0 commit comments

Comments
 (0)