rubyzip gem conflict with easyproject
This commit is contained in:
parent
29b33edad4
commit
a2e1bbba0c
2
Gemfile
2
Gemfile
@ -20,7 +20,6 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
gem 'rubyzip', '>= 1.1.3'
|
||||
gem 'zip-zip'
|
||||
gem 'simple_enum'
|
||||
gem 'uuidtools'
|
||||
@ -30,6 +29,7 @@ gem 'active_record_union'
|
||||
# Redmine extensions
|
||||
unless %w(easyproject easy_gantt).any? { |plugin| Dir.exist?(File.expand_path("../../#{plugin}", __FILE__)) }
|
||||
gem 'redmine_extensions', '~> 0.3.9'
|
||||
gem 'rubyzip', '>= 1.1.3'
|
||||
end
|
||||
|
||||
# Dav4Rack
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user