1. 03 Mar, 2016 1 commit
    • Kirill Smelkov's avatar
      Sync with upstream 8-5-stable · 1bfb586a
      Kirill Smelkov authored
      * 8-5-stable:
        Version 8.5.2
        Merge branch 'docs_todos' into 'master'
        Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master'
        Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
        Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
        Merge branch 'issue_13623' into 'master'
        Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
        Merge branch 'shortcuts-help' into 'master'
        Merge branch 'rel-url-fix' into 'master'
        Merge branch 'sidebar-overlap-fix' into 'master'
        Merge branch 'rs-improve-grace-period' into 'master'
        Merge branch 'issue_13648' into 'master'
        Merge branch 'issue_13621' into 'master'
        Merge branch 'issue_13851' into 'master'
        Merge branch 'fix-migration' into 'master'
        Merge branch '11489-branded-appearance-to-ce' into 'master'
        Update Rails to 4.2.5.2
      1bfb586a
  2. 02 Mar, 2016 8 commits
  3. 01 Mar, 2016 9 commits
  4. 29 Feb, 2016 3 commits
  5. 28 Feb, 2016 8 commits
  6. 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
  7. 24 Feb, 2016 6 commits