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

Revert 1262 v2.13 maintenance #1279

Closed
wants to merge 4 commits into from
Closed

Revert 1262 v2.13 maintenance #1279

wants to merge 4 commits into from

Conversation

joelit
Copy link
Contributor

@joelit joelit commented Mar 2, 2022

Reasons for creating this PR

PR #1262 was merged in the maintenance branch needlessly, should be reverted.

janvanmansum and others added 4 commits January 5, 2022 10:07
@janvanmansum
Allow plugin robloach/component-installer, because it is required by …
5e32077 
…dependency (#1)

* Allow plugin robloach/component-installer, because it is required by components/handlebars.js

* Adding /.idea to .gitignore so project can be edited in IntelliJ

* Removed .idea files from PR

* newline at end of .gitignore
@janvanmansum
Dd 849 (#3)
75c962e 
* Allow plugin robloach/component-installer, because it is required by components/handlebars.js

* Adding /.idea to .gitignore so project can be edited in IntelliJ

* Removed .idea files from PR

* newline at end of .gitignore

* Upgraded Twig

* Added composer.lock
@joelit
Merge pull request #1262 from DANS-KNAW/v2.13-maintenance
68449a2 
Allow plugin robloach/component-installer, because it is required by components/handlebars.js
@joelit
Revert "Allow plugin robloach/component-installer, because it is requ…
3cc466f 
…ired by components/handlebars.js"
@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 2, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@osma
Copy link
Member

osma commented Mar 2, 2022

Wait, why are you merging these changes to master? The commits should be reverted on the maintenance branch!

@osma
Copy link
Member

osma commented Mar 2, 2022

I mean, this would just add clutter to the history master branch (first make changes, then revert them) but otherwise leave everything unchanged... The diff is 0 lines.

@codecov
Copy link

codecov bot commented Mar 2, 2022 •
edited
Loading

Codecov Report

Merging #1279 (3cc466f) into master (5b9a75c) will decrease coverage by 1.95%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1279      +/-   ##
============================================
- Coverage     69.33%   67.38%   -1.96%     
- Complexity     1647     1692      +45     
============================================
  Files            32       32              
  Lines          4044     4259     +215     
============================================
+ Hits           2804     2870      +66     
- Misses         1240     1389     +149
Impacted Files Coverage Δ
model/ConceptSearchParameters.php 85.55% <0.00%> (+1.11%) ⬆️
controller/RestController.php 24.67% <0.00%> (+2.15%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5b9a75c...3cc466f. Read the comment docs.

@joelit
Copy link
Contributor Author

joelit commented Mar 2, 2022

Created a new PR that applies the changes to maintenance branch. Closing this one.

@joelit joelit closed this Mar 2, 2022
@osma osma deleted the revert-1262-v2.13-maintenance branch March 2, 2022 13:13
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@joelit @osma @janvanmansum