diff options
| author | Adam Jacob <adam@opscode.com> | 2010-03-31 14:33:55 -0700 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2010-03-31 14:33:55 -0700 |
| commit | 4a9278b9b4db22fdd1e8de67d29af278b3bb3f47 (patch) | |
| tree | e6ab5d96c239f7dfc905d7ea74912ee31d4cf58c | |
| parent | 877fa98aa50c464e7db3e423329cf30ef325dba5 (diff) | |
| parent | 192911590baa4b526e9ddd94a6d81a0a7d87f498 (diff) | |
| download | chef-4a9278b9b4db22fdd1e8de67d29af278b3bb3f47.tar.gz | |
Merge branch 'CHEF-1083' of git://github.com/danielsdeleo/chef into danielsdeleo/CHEF-1083
| -rw-r--r-- | chef-server/config/dependencies-webui.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chef-server/config/dependencies-webui.rb b/chef-server/config/dependencies-webui.rb index 14ba2796e7..392e1dbf86 100644 --- a/chef-server/config/dependencies-webui.rb +++ b/chef-server/config/dependencies-webui.rb @@ -10,7 +10,7 @@ dependency "chef", :immediate=>true unless defined?(Chef) begin require 'chef' require 'chef-server-webui' -rescue +rescue LoadError end # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components |