1. 08 Mar, 2016 1 commit
    • 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
  2. 04 Mar, 2016 3 commits
  3. 03 Mar, 2016 2 commits
  4. 02 Mar, 2016 8 commits
  5. 01 Mar, 2016 9 commits
  6. 29 Feb, 2016 1 commit
  7. 26 Feb, 2016 5 commits
    • Rémy Coutable's avatar
      Merge branch 'sidebar-hide-class' into 'master' · 3510569e
      Rémy Coutable authored
      Created helper class to hide content in issue sidebar when collapsed
      
      ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png)
      
      Closes #13764
      
      See merge request !2968
      3510569e
    • Robert Speicher's avatar
      Merge branch 'fix-gemfile-lock' into 'master' · dd114491
      Robert Speicher authored
      Fix order in Gemfile.lock
      
      See merge request !2969
      dd114491
    • Robert Speicher's avatar
      Merge branch 'fix-todos' into 'master' · 70090bd8
      Robert Speicher authored
      Does not create a Todo when commenting on commit or project snippet
      
      Closes #13733
      
      See merge request !2964
      70090bd8
    • Rémy Coutable's avatar
      Merge branch 'rs-crowd-form-view-spec' into 'master' · 184b4bc6
      Rémy Coutable authored
      Move "I should see Crowd login form" feature to a view spec
      
      We were doing all kinds of code gymnastics to "enable" Crowd in the
      feature spec and this would sometimes cause a transient failure.
      
      Really what it's testing is if the Crowd login form shows when Crowd's
      enabled, so this is much better suited to a view spec.
      
      See merge request !2963
      184b4bc6
    • Jacob Schatz's avatar
      Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' · b0864a9f
      Jacob Schatz authored
      Sidebar overlaps content when screen is below 1200px.
      
      When screen is below 1200px, the sidebar overlaps.
      When screen is above 1200px, the sidebar pushes content out.
      z-index change to make sure hamburger stays on top.
      Fixes #12717
      ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)
      
      ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)
      
      Also sorry I couldn't get the collapse button in the screen cap. It's there.
      
      See merge request !2620
      b0864a9f
  8. 24 Feb, 2016 11 commits