The SIO2 project
  1. The SIO2 project
  2. SIO-2486

Merge hotfixes from szkopul to master branch of oioioi

    Details

    • Type: Improvement Improvement
    • Status: New New
    • Priority: Major Major
    • Resolution: Unresolved
    • Affects Version/s: TAG 2021/22 Summer Sprint 1
    • Fix Version/s: None
    • Component/s: OIOIOI
    • Labels:
      None
    • Sprint:
      TAG 2021/22 Summer Sprint 1

      Description

      Repository
        ssh://gerrit.sio2project.mimuw.edu.pl:29418/szkopul
      contains several hotfixes and changes dedicated to szkopul.edu.pl.
      On every deployment changes from main repository are rebased on top of szkopuł repo (see https://hudson.sio2project.mimuw.edu.pl/job/szkopul-rebase/).

      This procedure is inconvenient (i.e. hotfixes are not tested, sometimes there are conflicts during rebasing).
      We should try to move as many hotfixes as possible to main code and/or move some functionality controlled by system settings.

      Results of `git diff github/master origin/master -- ':!*/npm-shrinkwrap.json'` attached to a ticket.

      Commits on szopul & not in oioioi/master (git log --no-merges origin/master ^github/master):

      a69d242557b550206540a50e0477648a9e8b4816 (HEAD -> master, origin/master, origin/HEAD) Add a command for gathering submissions statistics.
      53295c08dc66bccd813b33467a9cf155a07b1e98 Add command for finding SE submissions.
      ecfd2f625dee1fc4018835012af5a2003b430b55 PRODFIX set c++17 for non-makefile sinol packages
      77ac6145c33d7af9e8d01a117920b52c74ee5803 (temporary) Allow lorys to manage packages inside his contest
      bc92854a40cdf5a0fa46ccac03d51f36eb246b6c (no-ticket) Fix unicode handling in StatusSaver
      9f5843072dad127840dc27ed03d22b9028304854 [to-master] fixed available_compilers default
      e86d89707e118a934ea7800e09572da4b066f023 (to-master) added select_related
      fd2e8c22a9b9e4571e6bfe0f45b84924a9697204 (to-master) usercontests should not be public
      00a2e301caab91ce94e6eb73b2e0cebe6029a6a1 (to-master) show_info_about_workers update API
      a8df27c215923fe175c1e92f7e76e02b9464e1a9 (no-ticket) Fix utf-8-related crash in exportszu
      b47a36a71c9c3ac56d151c44c705cd04156adb4c (to-master) Added ingen failure handling
      403da241c78e2101cd86432fc0e2c1034cca9e80 [tmp] instrument The Queries for perf measure
      b07d69f2b97ea179d46feac1e0565cb82cc3af3c [PRODFIX] Change oioioi/notifications/server/npm-shrinkwrap.json
      dc4a0637a8a17d04290c9aea1eef2012b0e24f0a [HOTFIX] Fix statistics breaking for model solutions
      4c6fa0e3a31af72157bf3f492d67a3e7094525e2 Added Main importer
      042f6e24a67c344c10f4aa38b61e9678883fba28 [TEMPFIX] Print where the empty controller hack is needed
      49ce358f401c0ca1c1545f953e97f5b9e6141957 TEMPFIX
      53897253372ba58cbe113cef3a29c54163db8eca TMPHACK
      04e4cc83ab5b1f293cc8bb086c10d6d1b03c9091 [DEBUG] Added more workers debug
      f1793381beb9f60434c4b4177c1b3f4be7d60448 [DEBUG][IMPORTANT] Add some debug messages to receive_from_workers
      aabc74edd7823b0ba977a781bd26266a66552177 HOTFIX: Teachers & forum
      62e9fe2ded38323db451c35e444ff6d7496f7b1e Uncommited changes
      1c2d21c14223dd1008a48169d8bf77b5f2e26a06 [HOTFIX] Some localchanges to sharingcli on Szkopuł
      82896619f41cc73fc0d0c26b1426e193cb077b91 [HOTFIX] Remove oi dependency from participants migration

      Aktualizacja na podstawie emaila od Pawła Dietricha (2022-03-14):

      wydaje się, że następujące zmiany można dodać do mastera:

      bc92854a40cdf5a0fa46ccac03d51f36eb246b6c
      9f5843072dad127840dc27ed03d22b9028304854
      e86d89707e118a934ea7800e09572da4b066f023
      00a2e301caab91ce94e6eb73b2e0cebe6029a6a1
      a8df27c215923fe175c1e92f7e76e02b9464e1a9
      b47a36a71c9c3ac56d151c44c705cd04156adb4c
      dc4a0637a8a17d04290c9aea1eef2012b0e24f0a

        Activity

        Connect your code to JIRA

        Link every code change to JIRA just by adding an issue keys in commit messages. Bridge the gap back to your source and know which changes fixed which JIRA issues.

        Git & Mercurial in the cloud

        Collaborate across unlimited private code repositories.

        Git behind the firewall

        Manage and collaborate on Git repositories behind a firewall.

        Browse and search code

        Browse, search, and track source code repositories.

          People

          • Assignee:
            Andrzej Radzimiński
            Reporter:
            Tomek Waleń
          • Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

            • Created:
              Updated:

              Agile