diff options
| author | azul <azul@riseup.net> | 2016-09-16 12:07:27 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2016-09-16 12:07:27 +0000 |
| commit | e2aedcaade71dfe9103fdc8e705f59ece5f3a4d0 (patch) | |
| tree | a97f0608e4293d03a2c387c1ea250c725a550030 /lib/nickserver/server.rb | |
| parent | c9f785d3c4adb780bd61d8f5e3fd6414915cca0a (diff) | |
| parent | b2ddc9ffa9fdc880ca301817d59277343005fd5d (diff) | |
Merge branch 'bugfix/load-error-in-bin' into 'master'
bugfix: load order issue in server, include test
Includes our first functional test. This one only makes sure loading
the bin/nickserver actually works fine. Enough to catch this bug.
See merge request !4
Diffstat (limited to 'lib/nickserver/server.rb')
| -rw-r--r-- | lib/nickserver/server.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb index 11e7012..2139029 100644 --- a/lib/nickserver/server.rb +++ b/lib/nickserver/server.rb @@ -1,9 +1,9 @@ -require 'nickserver/config' -require 'nickserver/reel_server' - require 'kernel_ext' require 'json' +require 'nickserver/config' +require 'nickserver/reel_server' + # # This is the main HTTP server that clients connect to in order to fetch keys # |