Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[28728] Merge OpenProject CE plugins under modules/ #6826

Merged
merged 10,000 commits into from
Nov 15, 2018
Merged

[28728] Merge OpenProject CE plugins under modules/ #6826

merged 10,000 commits into from
Nov 15, 2018

Conversation

oliverguenther
Copy link
Member

@oliverguenther oliverguenther commented Nov 14, 2018 •
edited
Loading

  • Merges all CE plugins into modules/*, dropping the openproject prefix of all previous plugins.
  • Creates a new Gemfile.modules definition that is automatically sourced and lives next to Gemfile.plugins (which can be used by downstream to add to the Gemfile as it's done now).
  • Merges the CE .travis.yml to provide full CE testing.
  • Adds a conditional branch check to skip plugin builds when branch starts with core/*
  • Maintains full history of each plugin by merging with --allow-unrelated-histories from temporary remote

/cc @opf/developers

oliverguenther and others added 30 commits August 2, 2018 08:10
@oliverguenther
Updating generated .travis.yml from devkit
3806591 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
cd06a52 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
6c8a9e0 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
09bbfc3 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
a33fd31 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
f84560e 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
8a056a8 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
a40e4b0 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
cce9198 
[ci skip]
@oliverguenther
Rename responsible to accountable
e957ba4
@oliverguenther
Merge pull request #312 from finnlabs/feature/attachments_on_new_reso…
4456165 
…urce

enable uploading attachments for budgets

[ci skip]
@oliverguenther
Merge pull request #107 from finnlabs/feature/attachments_on_new_reso…
e02aa6c 
…urce

Feature/attachments on new resource

[ci skip]
@oliverguenther
Merge pull request #75 from opf/feature/attachments_on_new_resource
9d212a8 
implement wysiwyg attachment upload


[ci skip]
@ulferts
use helper for attachments list
ef509e9
@ulferts
use helper for attachments list
1f8109e
@ulferts
use helper for attachments list
08d59e6
@ulferts
Merge pull request #109 from finnlabs/fix/attachment_destruction
68d7def 
use helper for attachments list
@ulferts
Merge pull request #313 from finnlabs/fix/attachment_destruction
93b4b8b 
use helper for attachments list
@ulferts
Merge pull request #76 from opf/fix/attachment_destruction
2e628ef 
use helper for attachments list
update locales from crowdin
eebf101
@machisuji
removed teaser pictures
b79c453
update locales from crowdin
0940689
update locales from crowdin
4cbca05
@oliverguenther
Set which setting values need to be included in cache key
d06de10
@oliverguenther
Merge pull request #6 from opf/fix/fix/cached-avatar-image
1e70efa 
Set which setting values need to be included in cache key

[ci skip]
@oliverguenther
Remove calendar_for entries
7cbeba9 
#6497
@oliverguenther
Remove calendar_for
84cd86c 
#6497
@oliverguenther
Remove calendar_for
0acf7d3 
#6497
@ulferts @oliverguenther
no menu on global cost reports (#128)
514f04b 
[ci skip]
@oliverguenther
Updating generated .travis.yml from devkit
85ea063 
[ci skip]
This was referenced Nov 14, 2018
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@crohr
Copy link
Member

crohr commented Nov 14, 2018

@oliverguenther Could you describe what happens to the openproject-ce project once that change lands? From what I understand it will no longer have any specific plugins not already found in core?

@oliverguenther
Copy link
Member Author

oliverguenther commented Nov 14, 2018 •
edited
Loading

@crohr for the current form of this PR, CE would only be an identical mirror of this repository. I'm not sure we should have all of these included (looking at openproject-auth_plugins primarily), but

@ulferts ulferts merged commit 550c87a into dev Nov 15, 2018
@ulferts ulferts deleted the housekeeping/merge-plugins-as-modules branch November 15, 2018 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
maintenance
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@oliverguenther @crohr @ulferts @machisuji @HDinger