Skip to content

Commit 9965f1d

Browse files
danielsdeleodanielsdeleo
committed
Merge branch 'CHEF-1380'
2 parents d338485 + 5992220 commit 9965f1d

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎chef-server-api/Rakefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/lib/chef-server-api/version'
33
require 'rubygems'
44
require 'rake/gempackagetask'
55

6-
require 'merb-core'
7-
require 'merb-core/tasks/merb'
6+
begin
7+
require 'merb-core'
8+
require 'merb-core/tasks/merb'
9+
rescue LoadError
10+
STDERR.puts "merb is not installed, merb rake tasks will not be available."
11+
end
812

913
GEM_NAME = "chef-server-api"
1014
AUTHOR = "Opscode"

‎chef-server-webui/Rakefile‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/lib/chef-server-webui/version'
33
require 'rubygems'
44
require 'rake/gempackagetask'
55

6-
require 'merb-core'
7-
require 'merb-core/tasks/merb'
6+
begin
7+
require 'merb-core'
8+
require 'merb-core/tasks/merb'
9+
rescue LoadError
10+
STDERR.puts "merb is not installed, merb rake tasks will not be available."
11+
end
812

913
GEM_NAME = "chef-server-webui"
1014
AUTHOR = "Opscode"
@@ -24,12 +28,12 @@ spec = Gem::Specification.new do |s|
2428
s.email = EMAIL
2529
s.homepage = HOMEPAGE
2630

27-
s.add_dependency "merb-core", "~> 1.0"
28-
s.add_dependency "merb-slices", "~> 1.0"
29-
s.add_dependency "merb-assets", "~> 1.0"
30-
s.add_dependency "merb-helpers", "~> 1.0"
31-
s.add_dependency "merb-haml", "~> 1.0"
32-
s.add_dependency "merb-param-protection", "~> 1.0"
31+
s.add_dependency "merb-core", "~> 1.1.0"
32+
s.add_dependency "merb-slices", "~> 1.1.0"
33+
s.add_dependency "merb-assets", "~> 1.1.0"
34+
s.add_dependency "merb-helpers", "~> 1.1.0"
35+
s.add_dependency "merb-haml", "~> 1.1.0"
36+
s.add_dependency "merb-param-protection", "~> 1.1.0"
3337

3438
s.add_dependency "json", "<= 1.4.2"
3539

0 commit comments

Comments
 (0)