1. 02 Jan, 2020 1 commit
  2. 17 Oct, 2018 1 commit
  3. 12 Sep, 2018 3 commits
  4. 23 Aug, 2018 9 commits
    • Kirill Smelkov's avatar
      NXD Teach GitLab about patches · bacb76d2
      Kirill Smelkov authored
      Teach GitLab not only to merge changes from a merge-request, but also to
      apply patches posted to merge-request in a way like `git am` would do -
      without merge commit and directly on top of current branch. Which way to
      go is selected by user in web UI, and apply patches is the first option.
      There are 3 cases:
      - only 1 commit is present in MR -> the only available option is to
        apply that single commit as one patch without a merge
        ( There is no need for merge commit in this case at all: information
          about user who applied the patch goes to "Committer" field in resultant
          commit. Avoiding 1 merge per 1 patch results in cleaner history )
        It is also possible to review patch description directly in web UI,
        before doing the actual application, and correct / amend it as needed.
      - several commits are present in MR:
        * it is possible to apply the patches directly on top of current
          branch. Again information about who applied what goes to "Committer"
        * it is possible to merge MR changes with making a merge commit.
          This variant is useful, when patches from a MR do several logical
          steps to reach one goal, and MR description contain cover letter for
          whole patch series.
          in this case original commits stay untouched and resulting merge
          will contain MR author as author, user who accepted MR as committer,
          and cover letter as merge commit message.
          NOTE we avoid useless "Merge branch X into Y" in merge message, and
              just put MR title into merge subject and MR description into merge
              This way it is more logical with more important information in
              merge subject and thus e.g. more handy to oversee what a merge brings,
              just by it subject, e.g. via looking at updates via
                  gitk --first-parent ...
              or via web.
      NOTE for pre-generated references to merge-request we now use full MR
          URL, instead of !<MR-n>. Full URLs work everywhere, not only on
          original site where MR was created, or even only in original repo
          and not its fork on the same site.
    • Kirill Smelkov's avatar
      NXD Show ICP on front page & on footer of every other pages · 8f33ee57
      Kirill Smelkov authored
      TODO detect whether request comes from China and only then show ICP (?).
    • Kirill Smelkov's avatar
      NXD Show "about" footer on every page · 69854ee9
      Kirill Smelkov authored
      We show in small font size the same info that is shown on sign_in page:
          "GitLab Nexedi Edition", "About GitLab" and "About Nexedi"
      This is good to have and hereby-introduced about-footer area will be
      also used in the next patch for ICP too.
      XXX placement of .about-footer to be near bottom is done not very
    • Kirill Smelkov's avatar
      NXD gitlab:app:check : Don't check for init script · 817e16ec
      Kirill Smelkov authored
      Like Omnibus, SlapOS version does not have init script - nothing to
      check here.
    • Kirill Smelkov's avatar
      NXD lib/tasks/gitlab/check: Exit with non-zero code, if something failed in a check task · d2ef8b46
      Kirill Smelkov authored
      This is handy for monitoring tools, which could e.g. periodically call check
      tasks and instead of parsing output, rely on exit code.
      The way we detect if something failed is via hooking into String#red, and if
      anything was ever printed in red - that's an error.
    • Kirill Smelkov's avatar
    • Kirill Smelkov's avatar
      NXD clone_panel: Remove SSH option completely · 433d2b36
      Kirill Smelkov authored
      The default was switched to HTTP in the previous patch, but let's completely
      remove SSH option - we support only HTTP for git fetch/push.
    • Kirill Smelkov's avatar
      NXD Make HTTP to be the default clone protocol · 02761a98
      Kirill Smelkov authored
      Both fetch and push are possible over https, which is selected by http if
      gitlab was configured to use https in external url.
      This way to reduce security vectors and possible ways to interact with gitlab
      we use https only without ssh at all.
    • Kirill Smelkov's avatar
      NXD GitLab Nexedi Edition · 095f3161
      Kirill Smelkov authored
      = GitLab Community Edition + Nexedi patches
  5. 09 Aug, 2017 2 commits
  6. 08 Aug, 2017 4 commits
  7. 19 Jul, 2017 5 commits
  8. 05 May, 2017 4 commits
  9. 04 May, 2017 10 commits
  10. 06 Apr, 2017 1 commit