search

spacebase / spacebasenz

Website for SpaceBase New Zealand
http://dev-spacebasenz.pantheonsite.io/
GNU General Public License v2.0
0 stars 0 forks source link

326 - Rollback composer.lock from merge 254 #332

Closed treasuretron closed 4 years ago

treasuretron commented 4 years ago

In GitLab by @thomasmurphy on Feb 28, 2019, 20:44

It looks like we need composer.lock from e870e78cc29ba82e6188ec9fe2ca7bb75f714470

From the git log:

commit 2ffe24099273783e4507b33a5ec5ddf84be85af6 Merge: e870e78 923719a Author: Stephen Cataldo stephencataldo@gmail.com Date: Tue Feb 26 14:59:10 2019 -0800

Refs #306 Fix composer.json error, rebuild composer.lock, and merge to dev

commit 923719af68a2655aacad33aee93e83753e37e3f2 Author: Stephen Cataldo stephencataldo@gmail.com Date: Thu Feb 21 12:19:04 2019 -0800

update for Rich to do work

commit e870e78cc29ba82e6188ec9fe2ca7bb75f714470 Merge: bf47691 0758ef7 Author: Thomas Murphy tom@xequals.co.nz Date: Thu Feb 21 00:08:40 2019 +0000

Merge branch '320-Core-security-update' into 'dev'

320 - core and module security updates

Closes #320

See merge request spacebase/spacebase!267
treasuretron commented 4 years ago

In GitLab by @thomasmurphy on Feb 28, 2019, 20:44

changed title from Rollback composer.lock from merge 254 to {+326 - +}Rollback composer.lock from merge 254

treasuretron commented 4 years ago

In GitLab by @thomasmurphy on Feb 28, 2019, 20:50

@StephenCataldo from 2ffe24099273783e4507b33a5ec5ddf84be85af6 you mention Refs #306 Fix composer.json error but #306 doesn't contain any description of the errors or the fix, could you fill us in? Thanks!

treasuretron commented 4 years ago

In GitLab by @thomasmurphy on Feb 28, 2019, 21:30

@jayelless diff on composer.json is

"behat/mink-goutte-driver": "~1.2", "jcalderonzumba/gastonjs": "~1.0.2", "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",

Looks OK to me, second opinion welcome.

treasuretron commented 4 years ago

In GitLab by @jayelless on Mar 3, 2019, 16:58

Because a full revert of the commit "2ffe240: Refs #306 Fix composer.json error, rebuild composer.lock, and merge to dev" was performed (refer commit c77d109: Revert "Refs #306 Fix composer.json error, rebuild composer.lock, and merge to dev"), this issue is no longer relevant.

Closing.

treasuretron commented 4 years ago

In GitLab by @jayelless on Mar 3, 2019, 16:58

closed