1. 23 Feb, 2016 1 commit
  2. 22 Feb, 2016 6 commits
  3. 21 Feb, 2016 6 commits
  4. 19 Feb, 2016 20 commits
  5. 18 Feb, 2016 7 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
    • Kamil Trzciński's avatar
      Merge branch 'fix/ci-first-job-allow-failure' into 'master' · bdbe892e
      Kamil Trzciński authored
      Fix CI builds scheduler when first build in stage is allowed to fail
      
      This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.
      
      Closes #3192
      
      See merge request !2869
      bdbe892e
    • Kamil Trzciński's avatar
      Merge branch 'rs-git-fetch-labels' into 'master' · fcedf80f
      Kamil Trzciński authored
      Fix labels for git clone/git fetch Project CI setting
      
      
      
      See merge request !2842
      fcedf80f
    • Kamil Trzciński's avatar
      Merge branch 'patch-1' into 'master' · f762b632
      Kamil Trzciński authored
      Add example of creating build artifacts only for release tags.
      
      
      
      See merge request !2649
      f762b632
    • Robert Speicher's avatar
      Merge branch 'issue_13539' into 'master' · 03a15622
      Robert Speicher authored
      Reopened MRs should also be considered as open.
      
      Fixes #13539 
      
      See merge request !2866
      03a15622
    • Rémy Coutable's avatar
      Merge branch 're-add-missing-part-in-update-doc' into 'master' · d19fa9af
      Rémy Coutable authored
      Re-add section about NGINX config and init script updates in 8.4->8.5 update doc
      
      These sections were removed by !2766 but:
      - even if the NGINX config wasn't modified, it might
        be in future updates so it's better to always have
        it instead of having to remember to add it depending
        on the changes
      - the init script update section must be there since
        it's a safe command line that should be run on every update
      
      This fixes https://github.com/gitlabhq/gitlabhq/issues/10031.
      
      /cc @rspeicher @yorickpeterse 
      
      See merge request !2815
      d19fa9af