1. 09 Jun, 2016 30 commits
  2. 08 Jun, 2016 10 commits
    • Jacob Schatz's avatar
      Merge branch 'mention-loading-indicator' into 'master' · f5818baf
      Jacob Schatz authored
      Show loading indicator for autocomplete
      
      ![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif)
      
      Closes #15435
      
      See merge request !4182
      f5818baf
    • Jacob Schatz's avatar
      Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' · e382f130
      Jacob Schatz authored
      #17284 Edit form does not cancel correctly
      
      ## What does this MR do?
      
      Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No
      
      ## Why was this MR needed?
      
      Allows the user to revert back to the original note text, as expected, using cancel.
      
      ## What are the relevant issue numbers?
      
      Fixes #17284.
      
      ## Screenshots
      
      ![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif)
      
      See merge request !4175
      e382f130
    • Jacob Schatz's avatar
      Merge branch 'nav-scroll-bug' into 'master' · cc54b74a
      Jacob Schatz authored
      Side nav scrolls if content height taller than screen
      
      ## What does this MR do?
      Header logo is now fixed at top; put back scrolling functionality in side nav
      
      ## Screenshots (if relevant)
      <img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px">
      
      See merge request !4513
      cc54b74a
    • Robert Speicher's avatar
      Merge branch 'git-http-no-authenticity-token' into 'master' · 5d66e0e0
      Robert Speicher authored
      Disable CSRF protection when serving Git HTTP clients
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18331
      
      See merge request !4538
      5d66e0e0
    • Connor Shea's avatar
    • Patricio Cano's avatar
    • Jacob Schatz's avatar
      Merge branch '17240-svg' into 'master' · 0001a0cf
      Jacob Schatz authored
      Add new icons in left sidebar and layout nav
      
      Closes #17609    
      Closes #17240    
      Closes #17321    
      
      ![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png)
      ![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png)
      
      @skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?
      
      See merge request !4268
      0001a0cf
    • Jacob Schatz's avatar
      Merge branch '18333-layout-bug' into 'master' · 8578f401
      Jacob Schatz authored
      Use container helper instead of hard coded container
      
      ## What does this MR do?
      Add `container_class` helper class to fix layout bug
      
      ## What are the relevant issue numbers?
      #18333 
      ## Screenshots (if relevant)
      Fixed:    
      ![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
      Fluid:     
      ![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)
      
      See merge request !4543
      8578f401
    • Annabel Dunstone's avatar
      Fix activity SVG · a280116a
      Annabel Dunstone authored
      a280116a
    • Jacob Schatz's avatar
      Merge branch 'dropdown-link-lineheight' into 'master' · b4812e2e
      Jacob Schatz authored
      Fixed dropdown link line-height
      
      ## What does this MR do?
      
      Fixes line-height issue on dropdown menu links
      
      ## Why was this MR needed?
      
      The line-height of some dropdown links were taking the parent, most noticeable the commit header
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png)
      
      After:
      
      ![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png)
      
      See merge request !4531
      b4812e2e