• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-11-03 · 7a491a94
    Lin Jen-Shin authored
    * ee/master: (22 commits)
      Add project actions in Audit events
      Update EE-specific API helpers spec
      Pull API job token behavior in line with other tokens, and expand test coverage
      Update documentation
      Add changelog items
      Update specs for sudo behavior
      Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens
      Remove user authentication_token column
      Migrate user private tokens to personal access tokens
      Add sudo API scope
      Consistently use PersonalAccessToken instead of PersonalToken
      Remove User#private_token
      Remove authentication using user.private_token
      Remove tokens:reset_all_auth rake task
      Remove gitlab:users:clear_all_authentication_tokens rake task
      Remove private_token from API user entity
      Remove Session API
      Remove Private Token from User Settings > Account
      Update CHANGELOG.md for 10.1.1
      Update CHANGELOG-EE.md for 10.1.1-ee
      ...
    7a491a94
api_guard.rb 7.69 KB