1. 05 Apr, 2016 1 commit
  2. 17 Mar, 2016 4 commits
  3. 15 Mar, 2016 5 commits
  4. 11 Mar, 2016 2 commits
  5. 10 Mar, 2016 5 commits
  6. 08 Mar, 2016 2 commits
    • Rémy Coutable's avatar
      Version 8.5.5-rc1 · 62fc5b6a
      Rémy Coutable authored
      62fc5b6a
    • Robert Speicher's avatar
      Merge branch 'add_show_role_boolean_to_group_member_view' into 'master' · f38f5797
      Robert Speicher authored
      Only show group member roles if explicitly requested
      
      This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges.
      
      In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE.
      
      ![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png)
      
      ![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png)
      
      See merge request !3044
      f38f5797
  7. 04 Mar, 2016 3 commits
  8. 03 Mar, 2016 2 commits
  9. 02 Mar, 2016 8 commits
  10. 01 Mar, 2016 8 commits
    • Douwe Maan's avatar
      Merge branch 'rel-url-fix' into 'master' · 58e247d8
      Douwe Maan authored
      Fix relative URL
      
      See https://github.com/gitlabhq/gitlabhq/issues/10053
      
       1. Same configuration way for relative URL like with Omnibus
       2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`
      
      First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration
      
       - [x] tests on the source based installation
       - [x] tests on the centos&ubuntu omnibus packages
      
      Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053
      
      See merge request !2979
      58e247d8
    • Dmitriy Zaporozhets's avatar
      Merge branch 'sidebar-overlap-fix' into 'master' · c081928d
      Dmitriy Zaporozhets authored
      Fix issue with overlap of sidebar links.
      
      Thanks @iamphill for the help with this one. 
      
      ![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png)
      
      cc @iamphill @alfredo1 @dzaporozhets @rymai 
      
      See merge request !3043
      c081928d
    • Douwe Maan's avatar
      Merge branch 'rs-improve-grace-period' into 'master' · c05bb007
      Douwe Maan authored
      Don't show any "2FA required" message if it's not actually required
      
      Prior, if the user had enabled and then disabled 2FA, they would be
      shown a "You must enable Two-factor Authentication for your account."
      message when going back to re-activate it, even if 2FA enforcement was
      disabled.
      
      See merge request !3014
      c05bb007
    • Dmitriy Zaporozhets's avatar
      Merge branch 'issue_13648' into 'master' · e11ab453
      Dmitriy Zaporozhets authored
      Improve implementation to check read access to forks and add pagination.
      
      Fixes #13648
      
      The following optimizations where made:
      
      - Pagination was added.
      - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.
      
      See merge request !2991
      e11ab453
    • Douwe Maan's avatar
      Merge branch 'issue_13621' into 'master' · 9052086d
      Douwe Maan authored
      Don't repeat labels listed on Labels tab.
      
      Fixes #13622
      
      See merge request !2924
      9052086d
    • Rémy Coutable's avatar
      Merge branch 'issue_13851' into 'master' · 5c8f6ba3
      Rémy Coutable authored
      Brings back missing "Gitlab" text on the logo
      
      Closes #13851 
      
      See merge request !2989
      5c8f6ba3
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-migration' into 'master' · 710b3356
      Dmitriy Zaporozhets authored
      Fix broken migration
      Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      
      For !2927 
      
      See merge request !3011
      710b3356
    • Douwe Maan's avatar
      Merge branch '11489-branded-appearance-to-ce' into 'master' · 5a3c5ace
      Douwe Maan authored
      Branded appearance to CE
      
      Closes #11489
      
      The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.
      
      TODO:
      - [x] Copy docs
      - [x] Make new screenshots
      - [ ] Remove Custom Welcome message feature?
      
      @rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉
      
      /cc @DouweM
      
      See merge request !2927
      5a3c5ace