BigW Consortium Gitlab

  1. 17 Jun, 2016 6 commits
  2. 16 Jun, 2016 3 commits
    • Revert "squashed merge and fixed conflicts" · 452c076a
      James Lopez authored
      This reverts commit 13e37a3e.
    • squashed merge and fixed conflicts · 13e37a3e
      James Lopez authored
    • 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.
  3. 14 Jun, 2016 5 commits
  4. 13 Jun, 2016 3 commits
  5. 12 Jun, 2016 1 commit
  6. 10 Jun, 2016 5 commits
  7. 08 Jun, 2016 2 commits
    • Allow custom text on 'almost there' page · 40b6d906
      Sean McGivern authored
      Add a new application setting, after_sign_up_text. This is text to be
      rendered as Markdown and shown on the 'almost there' page after a user
      signs up, but before they've confirmed their account.
      
      Tweak the styles for that page so that centered lists look reasonable.
    • Fix pseudo n+1 queries with Note and Note Authors in issuables APIs · fade1a4c
      Alejandro Rodríguez authored
      This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
      that the API is returning you never really need to check for the notes. However, if you're
      subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
      once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
      1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
      of notes when counting user notes.
  8. 06 Jun, 2016 2 commits
    • Add workhorse controller and API helpers · 8c3ba8d6
      Douwe Maan authored
    • 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.
  9. 03 Jun, 2016 6 commits
  10. 02 Jun, 2016 3 commits
  11. 01 Jun, 2016 2 commits
    • Add `sha` parameter to MR accept API · d863d86a
      Sean McGivern authored
      The `sha` parameter is optional, and when present, must match the
      current HEAD SHA of the source branch. Otherwise, the API call fails
      with a 409 Conflict and a message containing the current HEAD for the
      source branch.
      
      Also tidy up some doc wording.
    • Incorportate feedback · 91a7b933
      Z.J. van de Weg authored
  12. 31 May, 2016 1 commit
  13. 30 May, 2016 1 commit