• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28 · 5258a53a
    Lin Jen-Shin authored
    * upstream/master: (231 commits)
      Global nav (9.0) UI improvement
      Remove Mattermost team with GitLab group
      resolve remaining eslint violations
      resolve eqeqeq, newline-per-chained-call, no-unused-vars, and no-else-return eslint violations
      resolve consistent-return eslint violation
      resolve prefer-template and quotes eslint violations
      resolve no-mixed-operators and no-return-assign eslint violations
      resolve comma-dangle and object-shorthand eslint violations
      resolve camelcase violations
      remove janky function binding in activity calendar class
      fix all eslint violations in user_tabs.js
      refactors git push service spec code
      Add remote IP, user ID and username to JSON lograge output
      Fix lograge exclusion in params section
      Modify/add some forgotten issues API documentation
      Default /merge_request API endpoint to `scope=created-by-me`
      Add top-level /merge_requests API endpoint
      Update server terminolgy to differentiate HA setups from Geo
      remove implied "GET" http method option
      remove needless brackets object accessor syntax
      ...
    5258a53a
user.rb 36.9 KB