1. 21 Feb, 2021 5 commits
  2. 20 Feb, 2021 4 commits
    • Georges Racinet's avatar
      Started Heptapod 0.20 release/support branch · da3d3d773e6b
      Georges Racinet authored
      --HG--
      branch : heptapod-0-20
      da3d3d773e6b
    • Georges Racinet's avatar
      Bumped Heptapod Shell version for GitLab 13.9 · e8e86554697e
      Georges Racinet authored
      --HG--
      branch : heptapod
      e8e86554697e
    • Georges Racinet's avatar
      Merge with v13.9.0-rc42 and adaptation · 1278b404cf27
      Georges Racinet authored
      Conflicts and other points of interest:
      
      - the revert and cherry-pick modals in
        app/views/projects/commit/_change.html.haml have been migrated upstream
        to VueJS.
        Heptapod changes were just adding messages telling the user that these
        features are not implemented for Mercurial.
        With the current structure, it was much simpler to hide the possibility
        for Mercurial projects completely, which we did.
      - `GitAccess`: check_otp! removed upstream, because it was supposed to be
        an Enterprise Edition feature (https://gitlab.com/gitlab-org/gitlab!53166).
      - `HgAccess`: resynced RSpec tests with those for `GitAccess` to accomodate
        the new `admin_mode` (control of instance Administrators authorizations on
        Projects they aren't explicitely member of.
      - Unhid the Web IDE on tree displays: the Web IDE was almost
        everywhere else anyway, and it's working when committing to the current
        branch. Starting a new branch and creating a MR will have to be corrected
        (not re...
      1278b404cf27
    • Georges Racinet's avatar
      Heptapod CI: updated cache key for GitLab 13.9 · 8b06644e4612
      Georges Racinet authored
      We don't want to poison 0.19 builds with unappropriate prepared
      dependencies.
      
      --HG--
      branch : heptapod
      8b06644e4612
  3. 19 Feb, 2021 2 commits
  4. 18 Feb, 2021 9 commits
  5. 14 Feb, 2021 2 commits
    • Georges Racinet's avatar
      Workhorse: use VERSION if not from a Mercurial repo · 4870292f9ae2
      Georges Racinet authored
      With this, the `compute_version` script will behave as upstream's
      Makefile: default to the version file if not from VCS.
      
      A difference is that we go straight to the main Heptapod version,
      to be consistent with the VCS case and avoid maintaining a separate
      HEPTAPOD_VERSION file. We'll have to watch what upstream does and
      what their scenarios for separate compilation are. For the time
      being, our compilations will be from the whole source. If we decide
      to produce separate source tarballs for Heptapod Workhorse at some
      point, we can revise this (and copy the main HEPTAPOD_VERSION as
      part of metadata there).
      
      --HG--
      branch : heptapod
      4870292f9ae2
    • Georges Racinet's avatar
      Workhorse: applied Heptapod Workhorse changes · 32ffb45fea62
      Georges Racinet authored
      So far we are on upstream v8.58.0 (current heptapod branch is
      for 0.19), and a simple patch apply from Heptapod 8.58.0 works
      right away.
      
      The odd thing is the version logic: upstream is still using the
      `git describe`, even in v0.19.0-rc41. That means that for upstream,
      the Workhorse version is directly derived from the Rails version if
      Git is present, only defaulting to the VERSION string if not, hence
      something way different, such as 8.58.0. Probably they will resync
      soon or just read from `../gitlab/VERSION`.
      
      If we are in a Mercurial repo, the Heptapod specific `compute_version`
      script mimics `git-describe` in a Mercurial way,
      also adding the `heptapod-` prefix. It also has logic for tarballs
      of Workhorse produced by `hg archive`, which we'll replace by using
      a `VERSION` file in a later move.
      
      Our end result for The repo case is a bit weird right now on the
      heptapod branch: the latest tag is heptapod-0.16.0.pre. After we merge
      13.8 or 13.9, we will add a heptapod-0.20.0.pre tag so that it's neat,
      and we'll have to make this a common practice.
      
      --HG--
      branch : heptapod
      32ffb45fea62
  6. 13 Feb, 2021 1 commit
  7. 11 Feb, 2021 4 commits
  8. 10 Feb, 2021 5 commits
  9. 08 Feb, 2021 3 commits
  10. 05 Feb, 2021 3 commits
  11. 04 Feb, 2021 2 commits