1. 21 Sep, 2016 7 commits
    • Douwe Maan's avatar
      Merge branch 'restrict_attrs_inc_ssh_pubkey' into 'master' · abccac4b
      Douwe Maan authored
      Add ssh key attribute to return attributes
      
      I realized that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/712 would cause a regression with the SSH public key sync. This merge request fixes that functionality. 
      
      Also, this uses the `Module#prepend` method that @DouweM told me about a while ago. It ends up being a **really** slick way to override a CE method and make future merges really smooth. I like this a lot!
      
      Part of this has to be changed in CE because the `#user_attributes` method didn't exist before. I made that change here, and in CE at <LINK MR HERE>.
      
      @DouweM What do you think about this usage of `prepend`?
      
      cc/ @jacobvosmaer-gitlab
      
      See merge request !736
      abccac4b
    • Douwe Maan's avatar
      Merge branch 'repository-size-restrictions' into 'master' · cb0a370b
      Douwe Maan authored
      Enforce repository size limit across all projects and groups, includes LFS objects in that limit.
      
      Limit can be set globally, and overridden per group, and/or project.
      
      Backend functionality is there and comprehensive tests are included, but there is still some frontend work to be done and documentation to be added. I'm submitting early for review as we are close to the release.
      
      @DouweM @dbalexandre I'd appreciate it if you both could start with the review while I finish the documentation and the missing frontend parts.
      
      /cc @JobV @regisF 
      
      Fixes #559
      
      Replaces gitlab-org/gitlab-ce!6020
      
      ## Screenshots (see gitlab-org/gitlab-ce!6020 for more)
      
      ![Screen_Shot_2016-09-18_at_9.55.38_PM](/uploads/66eeaced1f27c7e2115feaa4775a6e99/Screen_Shot_2016-09-18_at_9.55.38_PM.png)
      
      ![Screen_Shot_2016-09-18_at_9.57.12_PM](/uploads/d811d6c184044df527bd2f81cff651ce/Screen_Shot_2016-09-18_at_9.57.12_PM.png)
      
      ![Screen_Shot_2016-09-18_at_9.58.03_PM](/uploads/a2c5b2695454dda639537304a1bcd99b/Screen_Shot_2016-09-18_at_9.58.03_PM.png)
      
      ![Screen_Shot_2016-09-19_at_1.44.19_PM](/uploads/4cc6cca7536787bde49c0b086086cbcb/Screen_Shot_2016-09-19_at_1.44.19_PM.png)
      
      See merge request !740
      cb0a370b
    • Patricio Cano's avatar
      34a55c90
    • Drew Blessing's avatar
      Add ssh key attr to return attrs · 2c8d2b08
      Drew Blessing authored
      2c8d2b08
    • Patricio Cano's avatar
    • Patricio Cano's avatar
      Merge branch 'repository-size-restrictions' of gitlab.com:gitlab-org/gitlab-ee... · c22d40fb
      Patricio Cano authored
      Merge branch 'repository-size-restrictions' of gitlab.com:gitlab-org/gitlab-ee into repository-size-restrictions
      c22d40fb
    • Patricio Cano's avatar
      981b6269
  2. 20 Sep, 2016 33 commits