1. 18 Nov, 2015 3 commits
    • Douwe Maan's avatar
      Merge branch 'mirror-repository' into 'master' · 6967bad3
      Douwe Maan authored
      Add option to mirror an upstream repository.
      
      Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/279
      
      Depends on gitlab-org/gitlab-shell!29
      
      To do:
      
      - [x] Decide on what user should be the author of the activity feed events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.
      - [x] Write specs!
      - [x] Write documentation
      - [x] Port back relevant commits to CE: gitlab-org/gitlab-ce!1822
      
      ----
      
      ## Mirror status on project homepage
      
      ![Screen_Shot_2015-11-12_at_12.48.15](/uploads/39666b0e4a14723407b0f66e2aaddb46/Screen_Shot_2015-11-12_at_12.48.15.png)
      
      
      ## Settings navigation item
      
      ![Screen_Shot_2015-11-10_at_17.32.27](/uploads/116ece85f65681bbd3c7c5e282ab3b3c/Screen_Shot_2015-11-10_at_17.32.27.png)
      
      ## Mirroring settings
      
      ![Screen_Shot_2015-11-17_at_11.17.17](/uploads/ff57c89831524435ec6a063c3c470203/Screen_Shot_2015-11-17_at_11.17.17.png)
      
      
      ## Activity feed with new "pushes" (mirror updates)
      ![activity_feed](/uploads/04754251f2142fd06b1fddc2aae45232/activity_feed.png)
      
      I have yet to decide on what user should be the author of these events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.
      
      ## Warning that branch has diverged from upstream
      ![diverged](/uploads/ecf7ae6c5709f626c750695f45ca521a/diverged.png)
      
      ## Commits heading after failed update
      ![commits_failure](/uploads/d1b3e1f6796431c839ee9e2f67499283/commits_failure.png)
      
      Link send user to the mirroring settings if they are a project admin.
      
      ## Mirroring settings after failed update
      
      ![Screen_Shot_2015-11-12_at_12.43.09](/uploads/ece68d5021c9a4c374bf6d973cf9fafa/Screen_Shot_2015-11-12_at_12.43.09.png)
      
      ## New project page
      ![new_project](/uploads/296beb6c7faf390a9b7e1facc9c1d4d6/new_project.png)
      
      ## Import form after failed import
      (Screenshot outdated)
      
      ![new_import_failure](/uploads/ac0ebfc8ec23232603126fe0a6e10171/new_import_failure.png)
      
      Shown when the initial import of a project fails, not when an update of an existing project fails.
      
      cc @dzaporozhets @sytses @JobV
      
      See merge request !51
      6967bad3
    • Douwe Maan's avatar
      Merge branch 'master' into mirror-repository · 19996fec
      Douwe Maan authored
      19996fec
    • Douwe Maan's avatar
      Be more inclusive of commits · 22832637
      Douwe Maan authored
      [ci skip]
      22832637
  2. 17 Nov, 2015 10 commits
  3. 16 Nov, 2015 26 commits
  4. 15 Nov, 2015 1 commit
    • Robert Speicher's avatar
      Merge branch 'relative_links_default_branch' into 'master' · 3777b233
      Robert Speicher authored
      Relative links in project README should point to default branch, not master
      
      Relative links in the README shown on a project's main page currently always point to the "master" branch.  This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file.
      
      This patch changes the relative links to instead point to the default branch.
      
      Resolves #2707, #1134, #1852
      
      See merge request !1801
      3777b233