Merge branch 'release/3.0' into dev

Conflicts: doc/CHANGELOG.md
11 years ago · a65e7f3aa1
parent 31815b0e9d 3fb7a1fd9b
commit a65e7f3aa1
3 changed files with 3 additions and 3 deletions
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@ -28,7 +28,7 @@ See doc/COPYRIGHT.md for more details.

 * `#8419` [PDF Export] Internal error when entering wrong YAML

-## 1.0.0
+## 3.0.8

 * * `#5357` Update readme and gemspec

--- a/lib/open_project/pdf_export/version.rb
+++ b/lib/open_project/pdf_export/version.rb
@ -25,6 +25,6 @@

 module OpenProject
  module PdfExport
-    VERSION = "1.0.0"
+    VERSION = "3.0.8"
  end
 end
--- a/openproject-pdf_export.gemspec
+++ b/openproject-pdf_export.gemspec
@ -16,7 +16,7 @@ Gem::Specification.new do |s|
  s.files = Dir["{app,config,db,lib,doc}/**/*", "README.md"]

  s.add_dependency "rails", "~> 3.2.14"
-  s.add_dependency "openproject-plugins", "~> 1.0.6"
+  s.add_dependency "openproject-plugins", "~> 3.0.8"
  s.add_dependency "prawn", "~> 0.14.0"

  s.add_development_dependency "pdf-inspector", "~>1.0.0"