1. 24 Feb, 2017 4 commits
    • Filipa Lacerda's avatar
      Merge branch 'master' into 1589-deploy-boards · 01d5a4dd
      Filipa Lacerda authored
      * master: (467 commits)
        Fix the filtered search
        Resolve merge conflicts
        Fit GitAccess specs
        Fix new offenses
        Fix new offenses
        Stylistic tweaks
        Remove stray conflict
        Fix OAuth/SAML user blocking behavior
        Revert "Enable Style/DotPosition"
        Revert "Prefer leading style for Style/DotPosition"
        Revert "Enable Style/BarePercentLiterals"
        Manually correct autocorrect
        Move up delegate calls
        Exclude migrations from Style/MutableConstant
        ActiveSupport delegation is preferred over Forwardable
        Update haml_lint to work with newest rubocop
        Fix incorrect rubocop autocorrects
        Regenerate .rubocop_todo.yml for EE
        Fix EE offenses
        Add explanations to cops
        ...
      01d5a4dd
    • Filipa Lacerda's avatar
      Simplify backoff algorithm · b5290ce0
      Filipa Lacerda authored
      b5290ce0
    • Filipa Lacerda's avatar
      Changes after review - use relative paths · 29c284cb
      Filipa Lacerda authored
      29c284cb
    • Robert Speicher's avatar
      Merge branch 'ce-to-ee' into 'master' · d2f70576
      Robert Speicher authored
      CE upstream: Thursday
      
      See merge request !1293
      d2f70576
  2. 23 Feb, 2017 36 commits