Merge branch 'fix-settings-spec' into 'master'

Fix settings_spec so that it can that run by itself Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`. See merge request !4893

Merge branch 'fix-settings-spec' into 'master'
4477dc24 · Stan Hu · 9e43fc15 · 6ba627f7 · 4477dc24
Commit 4477dc24 authored Jun 24, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

settings_spec.rb spec/initializers/settings_spec.rb +1 -0

No files found.
--- a/spec/initializers/settings_spec.rb
+++ b/spec/initializers/settings_spec.rb
+require 'spec_helper'
 require_relative '../../config/initializers/1_settings'
 describe Settings, lib: true do