1. 23 Feb, 2016 6 commits
  2. 22 Feb, 2016 6 commits
  3. 21 Feb, 2016 6 commits
  4. 19 Feb, 2016 20 commits
  5. 18 Feb, 2016 2 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' · 76558919
      Dmitriy Zaporozhets authored
      Uses cross browser niceScroll to do scrolling on sidebar.
      
      Fixes: #13544 
      
      Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. 
      
      This also leaves the default scrollbar as is. 
      
      ![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png)
      
      Also fixes horz scroll issue: 
      
      ![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png)
      
      cc @creamzy @dzaporozhets 
      
      See merge request !2873
      76558919
    • Douwe Maan's avatar
      Merge branch 'fix/gitpushservice-complexity-issue' into 'master' · df205697
      Douwe Maan authored
      Reduce code complexity on GitPushService#execute
      
      Code complexity for gitlab-ce after this has been refactored:
      ```
        27.3: GitPushService#execute
      ```
      This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that?
      
      I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327
      
      
      See merge request !2784
      df205697