1. 15 Mar, 2016 5 commits
  2. 11 Mar, 2016 2 commits
  3. 10 Mar, 2016 5 commits
  4. 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
  5. 04 Mar, 2016 3 commits
  6. 03 Mar, 2016 2 commits
  7. 02 Mar, 2016 8 commits
  8. 01 Mar, 2016 9 commits
  9. 29 Feb, 2016 1 commit
  10. 26 Feb, 2016 3 commits