From 050a8ea4b6ebd81d3fa9fb9a782c009804fa7469 Mon Sep 17 00:00:00 2001 From: Sebastian Schuster Date: Thu, 20 Mar 2014 17:35:30 +0100 Subject: [PATCH 1/5] Added document journal data migration --- ...0320140001_legacy_document_journal_data.rb | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 db/migrate/20140320140001_legacy_document_journal_data.rb diff --git a/db/migrate/20140320140001_legacy_document_journal_data.rb b/db/migrate/20140320140001_legacy_document_journal_data.rb new file mode 100644 index 0000000000..1bd681729d --- /dev/null +++ b/db/migrate/20140320140001_legacy_document_journal_data.rb @@ -0,0 +1,36 @@ +#-- encoding: UTF-8 +#-- copyright +# OpenProject is a project management system. +# Copyright (C) 2011-2013 the OpenProject Foundation (OPF) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See doc/COPYRIGHT.md for more details. +#++ +# + +require Rails.root.join("db","migrate","migration_utils","legacy_journal_migrator").to_s + +class LegacyDocumentJournalData < ActiveRecord::Migration + def up + migrator.run + end + + def down + migrator.remove_journals_derived_from_legacy_journals 'document_journals' + end + + def migrator + @migrator ||= Migration::LegacyJournalMigrator.new "DocumentJournal", "document_journals" + end +end From 4a016925fd0caf856d3b9d4690ff8e1c3cc34f07 Mon Sep 17 00:00:00 2001 From: Sebastian Schuster Date: Fri, 21 Mar 2014 11:49:36 +0100 Subject: [PATCH 2/5] Pushed version, updated gemspec, readme and changelog --- README.md | 6 +++--- doc/CHANGELOG.md | 4 ++++ lib/open_project/documents/version.rb | 2 +- openproject-documents.gemspec | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a0a7ac93aa..ef2aaf2313 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,11 @@ Installation OpenProject Documents depends on OpenProject Plugins. Thus, if you haven't done it already, add the following line to the `Gemfile.plugins` in your OpenProject installation: -`gem "openproject-plugins", git: "https://github.com/opf/openproject-plugins.git", :branch => "dev"` +`gem "openproject-plugins", git: "https://github.com/opf/openproject-plugins.git", :branch => "stable"` For OpenProject Documents itself you need to add the following line to the `Gemfile.plugins` of OpenProject: -`gem "openproject-documents", git: "https://github.com/opf/openproject-documents.git", :branch => "dev"` +`gem "openproject-documents", git: "https://github.com/opf/openproject-documents.git", :branch => "stable"` Afterwards, run: @@ -44,7 +44,7 @@ Deinstallation Remove the line -`gem "openproject-documents", git: "https://github.com/opf/openproject-documents.git", :branch => "dev"` +`gem "openproject-documents", git: "https://github.com/opf/openproject-documents.git", :branch => "stable"` from the file `Gemfile.plugins` and run: diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 59b843c66b..772f781005 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -32,6 +32,10 @@ See doc/COPYRIGHT.rdoc for more details. # Changelog +## 1.0.1 + +* Add missing journal data migration + ## 1.0.0 * `#3329` Refactor Duplicated Code Journals diff --git a/lib/open_project/documents/version.rb b/lib/open_project/documents/version.rb index bd05ac224c..249747d1b6 100644 --- a/lib/open_project/documents/version.rb +++ b/lib/open_project/documents/version.rb @@ -31,6 +31,6 @@ module OpenProject module Documents - VERSION = "1.0.0" + VERSION = "1.0.1" end end diff --git a/openproject-documents.gemspec b/openproject-documents.gemspec index 9eb26791f1..9b3ec20108 100644 --- a/openproject-documents.gemspec +++ b/openproject-documents.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.authors = "Finn GmbH" s.email = "info@finn.de" s.homepage = "https://www.openproject.org/projects/documents" - s.summary = "An OpenProject plugin to allow creation of documents in projects" + s.summary = "OpenProject Documents" s.description = "An OpenProject plugin to allow creation of documents in projects" s.license = "GPLv3" From 3e0c4e12aa509830949147041d086bde3b09c862 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Fri, 21 Mar 2014 14:45:07 +0100 Subject: [PATCH 3/5] amended changelog entry --- doc/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 772f781005..294e1752bc 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details. ## 1.0.1 -* Add missing journal data migration +* `#5361` Add missing journal data migration ## 1.0.0 From f0e7a3879a2a12b07de67b03475d1d8833195a5f Mon Sep 17 00:00:00 2001 From: kgalli Date: Mon, 23 Jun 2014 17:01:29 +0200 Subject: [PATCH 4/5] Bump version to 3.0.8 Due to our (new) convention plugins inherit their versions from the OpenProject core. The next stable release of the OpenProject core is 3.0.8. --- doc/CHANGELOG.md | 2 +- lib/open_project/documents/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index e89d35a563..ab4a51fba3 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -32,7 +32,7 @@ See doc/COPYRIGHT.rdoc for more details. # Changelog -## 1.0.2 +## 3.0.8 * `#7679` Fix: Permissions not nested in 'documents' project module * `#5650` Fix: Acts as event datetime diff --git a/lib/open_project/documents/version.rb b/lib/open_project/documents/version.rb index 6102065f17..76fd41df0b 100644 --- a/lib/open_project/documents/version.rb +++ b/lib/open_project/documents/version.rb @@ -31,6 +31,6 @@ module OpenProject module Documents - VERSION = "1.0.2" + VERSION = "3.0.8" end end From 960be9e7fa541a8980232bd115da6b83989b2c4b Mon Sep 17 00:00:00 2001 From: Christian Ratz Date: Mon, 23 Jun 2014 17:06:54 +0200 Subject: [PATCH 5/5] fixed dep in gemspec --- openproject-documents.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openproject-documents.gemspec b/openproject-documents.gemspec index 9b3ec20108..c3adb6cb56 100644 --- a/openproject-documents.gemspec +++ b/openproject-documents.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.test_files = Dir["spec/**/*"] s.add_dependency "rails", "~> 3.2.9" - s.add_dependency "openproject-plugins", "~> 1.0.6" + s.add_dependency "openproject-plugins", "~> 3.0.8" s.add_development_dependency 'rspec-rails' s.add_development_dependency 'cucumber-rails'