1. 23 Feb, 2017 1 commit
  2. 21 Feb, 2017 1 commit
  3. 10 Feb, 2017 1 commit
  4. 19 Dec, 2016 2 commits
  5. 23 Nov, 2016 1 commit
  6. 22 Nov, 2016 1 commit
  7. 18 Nov, 2016 1 commit
  8. 24 Oct, 2016 1 commit
  9. 14 Oct, 2016 1 commit
  10. 13 Oct, 2016 2 commits
    • Sean McGivern's avatar
      Fix specs · 241cca01
      Sean McGivern authored
      241cca01
    • Sean McGivern's avatar
      Allow setting content for resolutions · 3f71c43e
      Sean McGivern authored
      When reading conflicts:
      
      1. Add a `type` field. `text` works as before, and has `sections`;
         `text-editor` is a file with ambiguous conflict markers that can only
         be resolved in an editor.
      2. Add a `content_path` field pointing to a JSON representation of the
         file's content for a single file.
      3. Hitting `content_path` returns a similar datastructure to the `file`,
         but without the `content_path` and `sections` fields, and with a
         `content` field containing the full contents of the file (with
         conflict markers).
      
      When writing conflicts:
      
      1. Instead of `sections` being at the top level, they are now in a
         `files` array. This matches the read format better.
      2. The `files` array contains file hashes, each of which must contain:
         a. `new_path`
         b. `old_path`
         c. EITHER `sections` (which works as before) or `content` (with the
            full content of the resolved file).
      3f71c43e
  11. 05 Oct, 2016 1 commit
  12. 01 Sep, 2016 2 commits
  13. 30 Aug, 2016 1 commit
  14. 25 Aug, 2016 1 commit
  15. 24 Aug, 2016 1 commit
  16. 01 Aug, 2016 1 commit
    • zs's avatar
      State specific default sort order for issuables · 84a3225b
      zs authored
      Provide more sensible default sort order for issues and merge requests
      based on the following table:
      
      | type           | state  | default sort order |
      |----------------|--------|--------------------|
      | issues         | open   | last created       |
      | issues         | closed | last updated       |
      | issues         | all    | last created       |
      | merge requests | open   | last created       |
      | merge requests | merged | last updated       |
      | merge requests | closed | last updated       |
      | merge requests | all    | last created       |
      84a3225b
  17. 14 Jul, 2016 1 commit
    • Timothy Andrew's avatar
      Load Javascript U2F library selectively. · 4b33c4c6
      Timothy Andrew authored
      1. Only on supported Chrome versions
      
      2. Mainly, this lets us simplify the javascript-based U2F check to
         `window.u2f`, where `window.u2f` can either be loaded from the GitLab
         server (for Chrome) or from the Firefox extension.
      
      3. This is a better way to provide browser detection for U2F.
      4b33c4c6
  18. 18 Jun, 2016 1 commit
  19. 16 Jun, 2016 1 commit
    • Timothy Andrew's avatar
      Implement @DouweM's feedback. · 7ee0898a
      Timothy Andrew authored
      - Extract a duplicated `redirect_to`
      - Fix a typo: "token", not "certificate"
      - Have the "Expires at" datepicker be attached to a text field, not inline
      - Have both private tokens and personal access tokens verified in a
        single "authenticate_from_private_token" method, both in the
        application and API. Move relevant logic to
        `User#find_by_personal_access_token`
      - Remove unnecessary constants relating to API auth. We don't need a
        separate constant for personal access tokens since the param is the
        same as for private tokens.
      7ee0898a
  20. 06 Jun, 2016 3 commits
    • Douwe Maan's avatar
      Add workhorse controller and API helpers · 8c3ba8d6
      Douwe Maan authored
      8c3ba8d6
    • Timothy Andrew's avatar
      Implement U2F registration. · 128549f1
      Timothy Andrew authored
      - Move the `TwoFactorAuthsController`'s `new` action to `show`, since
        the page is not used to create a single "two factor auth" anymore. We
        can have a single 2FA authenticator app, along with any number of U2F
        devices, in any combination, so the page will be accessed after the
        first "two factor auth" is created.
      - Add the `u2f` javascript library, which provides an API to the
        browser's U2F implementation.
      - Add tests for the JS components
      128549f1
    • Timothy Andrew's avatar
      Add a `U2fRegistrations` table/model. · 791cc913
      Timothy Andrew authored
      - To hold registrations from U2F devices, and to authenticate them.
      - Previously, `User#two_factor_enabled` was aliased to the
        `otp_required_for_login` column on `users`.
      - This commit changes things a bit:
          - `User#two_factor_enabled` is not a method anymore
          - `User#two_factor_enabled?` checks both the
            `otp_required_for_login` column, as well as `U2fRegistration`s
          - Change all instances of `User#two_factor_enabled` to
            `User#two_factor_enabled?`
      - Add the `u2f` gem, and implement registration/authentication at the
        model level.
      791cc913
  21. 03 Jun, 2016 3 commits
  22. 01 Jun, 2016 3 commits
  23. 30 May, 2016 1 commit
  24. 13 May, 2016 1 commit
  25. 11 May, 2016 1 commit
  26. 03 May, 2016 1 commit
  27. 28 Apr, 2016 3 commits
  28. 22 Apr, 2016 1 commit
  29. 14 Apr, 2016 1 commit