Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-70010

Little discrepancies found between 310 and master

    XMLWordPrintable

    Details

      Description

      While performing some routine checks, it has been detected that there are, right now, a few differences between 310_STABLE and master that shouldn't be there.

      Note that this is only for these 2 branches, because they haven't diverged (other than version numbers). In the future, once diverged, this check won't be useful ever.

      This is the (one-liner) check:

      git diff MOODLE_310_STABLE master --stat | grep -v version.php | grep -v install/lang | grep -v 'files changed' | cut -d' ' -f2 | xargs git diff MOODLE_310_STABLE master
      

      And, inspecting the differences, after discarding all being just version / branch numbers, there are 3 cases that need to be verified and, if possible, fixed:

      1. lib/db/upgrade.php : There is an upgrade step that, for some reason seems to be in different order between the 2 branches. Worth checking it and see why that is happening.
      2. lib/phpunit/classes/phpunit_dataset.php : There is a phpdoc @param wrong in master (from_string() method.
      3. theme/boost/scss/moodle/core.scss : There is a discrepancy with one of the selectors (movehere).

      So this issue is about to examine those 3 changes and proceed to reconcile both branches (version numbers aside) so they look the same.

      Ciao

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              stronk7 Eloy Lafuente (stronk7)
              Reporter:
              stronk7 Eloy Lafuente (stronk7)
              Peer reviewer:
              Simey Lameze
              Integrator:
              Jake Dallimore
              Tester:
              CiBoT
              Participants:
              Component watchers:
              Adrian Greeve, Jake Dallimore, Mathew May, Mihail Geshoski, Peter Dias, Sujith Haridasan, Matteo Scaramuccia, Andrew Nicols, Jun Pataleta, Michael Hawkins, Shamim Rezaie, Simey Lameze, Bas Brands, Andrew Nicols, Jun Pataleta, Michael Hawkins, Shamim Rezaie, Simey Lameze
              Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Fix Release Date:
                9/Nov/20

                  Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - 0 minutes
                  0m
                  Logged:
                  Time Spent - 1 hour, 35 minutes
                  1h 35m