1. 03 Aug, 2016 6 commits
    • Ruben Davila's avatar
      Merge branch 'master' into ce-to-ee · b9c7011a
      Ruben Davila authored
      b9c7011a
    • Douwe Maan's avatar
      Merge branch 'hide-ssh-repo-mirroring' into 'master' · 9ae5e95d
      Douwe Maan authored
      Hide SSH repository mirroring
      
      ## What does this MR do?
      Removes reference to `ssh://` URLs from the repository mirror settings page
      
      ## Are there points in the code the reviewer needs to double check?
      
      - [ ] Is the screenshot now used in the documentation an appropriate resolution?
      - [ ] Do the remaining screenshots need re-doing to match?
      
      Repository mirroring is also referenced from the 'Import project by URL' functionality, where much of the text of `_instructions.html.haml` is duplicated in a separate partial. It doesn't mention `ssh://`, though.
      
      ## Why was this MR needed?
      
      Mirroring repositories over SSH needs more work before it's generally useful.
      
      Currently, these URLs are interpreted with the implicit context of the SSH client configuration for the GitLab installation's `git` user, particularly `known_hosts` and any SSH private keys it has access to. Unless the user manually alters these details  - especially `known_hosts` - then `ssh://` URLs just don't work. 
      
      We don't wish to support and document manual SSH configuration management, and the naive approach (a single `id_rsa` file used when mirroring all repositories) is insecure - especially for GitLab.com or similar deployments.
      
      Future MRs will re-add documentation for `ssh://` URLs for both password and public-key authentication once `known_hosts` and unique SSH keys for repository mirroring are handled automatically.
      
      Disabling support for `ssh://` URLs entirely would break existing customer setups.
      
      ## What are the relevant issue numbers?
      
      #98 #621
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-08-02_at_10.58.23](/uploads/940bce89b6e8cc109f5df766cd287c7d/Screen_Shot_2016-08-02_at_10.58.23.png)
      
      See merge request !608
      9ae5e95d
    • Nick Thomas's avatar
      Use a full-width, HiDPI screenshot of repository mirroring to more closely... · 149fb1c9
      Nick Thomas authored
      Use a full-width, HiDPI screenshot of repository mirroring to more closely match existing screenshots
      149fb1c9
    • Achilleas Pipinellis's avatar
      Merge branch 'doc-markdown-move' into 'master' · 5bf1a2d4
      Achilleas Pipinellis authored
      Move markdown doc to the right location
      
      
      
      See merge request !612
      5bf1a2d4
    • Achilleas Pipinellis's avatar
      Move markdown doc to the right location · ee025ef8
      Achilleas Pipinellis authored
      [ci skip]
      ee025ef8
    • Robert Speicher's avatar
      Merge branch 'gitlab-git-update' into 'ce-to-ee' · dee5e5e8
      Robert Speicher authored
      Fix EE code after gitlab_git update from CE
      
      Closes #842
      
      See merge request !610
      dee5e5e8
  2. 02 Aug, 2016 33 commits
  3. 01 Aug, 2016 1 commit