1. 02 Jun, 2016 2 commits
    • Robert Speicher's avatar
      Update CHANGELOG-EE for 8.8.3 · 2d4d724b
      Robert Speicher authored
      [ci skip]
      2d4d724b
    • Robert Speicher's avatar
      Merge branch 'group_sync_dn_error_checking' into 'master' · 72137999
      Robert Speicher authored
      Gracefully handle malformed DNs in LDAP group sync
      
      Customer reported an emergency because group sync was blowing up with 'Badly formed DN'. It turns out their LDAP system inserts a blank member entry at the beginning of each LDAP group. When we try to parse this DN, group sync explodes. Obviously we should handle this error gracefully. This merge request catches the error, logs it, and moves on (skipping that entry).
      
      See merge request !392
      72137999
  2. 01 Jun, 2016 2 commits
  3. 30 May, 2016 4 commits
  4. 29 May, 2016 3 commits
  5. 26 May, 2016 3 commits
  6. 25 May, 2016 10 commits
  7. 24 May, 2016 12 commits
    • Ruben Davila's avatar
      Add link to Upload License page in broadcast alert message. · 6fefd02e
      Ruben Davila authored
      That way admins can have a quick link at hand to upload the license.
      6fefd02e
    • James Lopez's avatar
      fix formatting · 4cbdd0ee
      James Lopez authored
      4cbdd0ee
    • James Lopez's avatar
      b7370450
    • James Lopez's avatar
      add changelog · f08e3b12
      James Lopez authored
      f08e3b12
    • James Lopez's avatar
      fix project import with mirror enabled · 1ffce294
      James Lopez authored
      1ffce294
    • Valery Sizov's avatar
      Merge branch 'ce-upstream' into 'master' · 0f4cf609
      Valery Sizov authored
      CE upstream
      
      
      
      See merge request !415
      0f4cf609
    • Valery Sizov's avatar
    • Valery Sizov's avatar
      Merge branch 'es_search_through_filenames1' into 'master' · 6b522faa
      Valery Sizov authored
      Search through the filenames
      
      
      
      See merge request !409
      6b522faa
    • Valery Sizov's avatar
      Merge branch 'es_update_guide_addition' into 'master' · b84ab91a
      Valery Sizov authored
      Add one more ES note to 8.8 update guide
      
      
      
      See merge request !406
      b84ab91a
    • Robert Speicher's avatar
      Merge branch 'ce/merge-rubocop-changes' into 'master' · dde8875e
      Robert Speicher authored
      Merge Rubocop changes introduced in CE
      
      This MR merges rubocop changes introduced in EE in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4261 and also fixes offenses detected after enabling these cops.
      
      See merge request !414
      dde8875e
    • Grzegorz Bizon's avatar
      47931f8c
    • Robert Speicher's avatar
      Merge branch 'complexity/enable-multiple-rubocop-cops' into 'master' · fb2577cd
      Robert Speicher authored
      Enable multiple Rubocop cops that can be enabled
      
      See https://gitlab.com/gitlab-org/gitlab-ce/issues/17406
      
      This enabled following cops:
      
      ```text
      Lint/CircularArgumentReference:
        Description: Default values in optional keyword arguments and optional ordinal arguments
      ----------------
      Lint/ConditionPosition:
        Description: Checks for condition placed in a confusing position relative to the keyword.
        StyleGuide: https://github.com/bbatsov/ruby-style-guide#same-line-condition
      ----------------
      Lint/Debugger:
        Description: Check for debugger calls.
      ----------------
      Lint/DefEndAlignment:
        Description: Align ends corresponding to defs correctly.
      ----------------
      Lint/DuplicateMethods:
        Description: Check for duplicate method definitions.
      ----------------
      Lint/DuplicatedKey:
        Description: Check for duplicate keys in hash literals.
      ----------------
      Lint/EachWithObjectArgument:
        Description: Check for immutable argument given to each_with_object.
      ----------------
      Lint/ElseLayout:
        Description: Check for odd code arrangement in an else block.
      ----------------
      Lint/EmptyEnsure:
        Description: Checks for empty ensure block.
      ----------------
      Lint/EmptyInterpolation:
        Description: Checks for empty string interpolation.
      ----------------
      Lint/EndAlignment:
        Description: Align ends correctly.
      ----------------
      Lint/EndInMethod:
        Description: END blocks should not be placed inside method definitions.
      ----------------
      Lint/EnsureReturn:
        Description: Do not use return in an ensure block.
        StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-return-ensure
      ----------------
      Lint/Eval:
        Description: The use of eval represents a serious security risk.
      ----------------
      Lint/FloatOutOfRange:
        Description: Catches floating-point literals too large or small for Ruby to represent.
      ----------------
      Lint/FormatParameterMismatch:
        Description: The number of parameters to format/sprint must match the fields.
      ----------------
      Lint/ImplicitStringConcatenation:
        Description: Checks for adjacent string literals on the same line, which could better
          be represented as a single string literal.
      ----------------
      Lint/InvalidCharacterLiteral:
        Description: Checks for invalid character literals with a non-escaped whitespace character.
      ----------------
      Lint/LiteralInInterpolation:
        Description: Checks for literals used in interpolation.
      ----------------
      Lint/NestedMethodDefinition:
        Description: Do not use nested method definitions.
        StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-methods
      ----------------
      Lint/NextWithoutAccumulator:
        Description: Do not omit the accumulator when calling `next` in a `reduce`/`inject`
          block.
      ----------------
      Lint/RandOne:
        Description: Checks for `rand(1)` calls. Such calls always return `0` and most likely
          a mistake.
      ----------------
      Lint/RequireParentheses:
        Description: Use parentheses in the method call to avoid confusion about precedence.
      ----------------
      Lint/UnreachableCode:
        Description: Unreachable code.
      ----------------
      Lint/UselessComparison:
        Description: Checks for comparison of something with itself.
      ----------------
      Lint/UselessElseWithoutRescue:
        Description: Checks for useless `else` in `begin..end` without `rescue`.
      ----------------
      Lint/UselessSetterCall:
        Description: Checks for useless setter call to a local variable.
      ----------------
      Lint/Void:
        Description: Possible use of operator/literal/variable in void context.
      ----------------
      Performance/DoubleStartEndWith:
        Description: Use `str.{start,end}_with?(x, ..., y, ...)` instead of `str.{start,end}_with?(x,
          ...) || str.{start,end}_with?(y, ...)`.
      ----------------
      Performance/RedundantSortBy:
        Description: Use `sort` instead of `sort_by { |x| x }`.
      ----------------
      Rails/FindBy:
        Description: Prefer find_by over where.first.
        Include:
        - app/models/**/*.rb
      ----------------
      Rails/FindEach:
        Description: Prefer all.find_each over all.find.
        Include:
        - app/models/**/*.rb
      ----------------
      Rails/PluralizationGrammar:
        Description: Checks for incorrect grammar when using methods like `3.day.ago`.
      ----------------
      Rails/ScopeArgs:
        Description: Checks the arguments of ActiveRecord scopes.
        Include:
        - app/models/**/*.rb
      ```
      
      See merge request !4261
      fb2577cd
  8. 23 May, 2016 4 commits