1. 16 Aug, 2018 1 commit
  2. 10 Jul, 2018 1 commit
  3. 25 Jun, 2018 1 commit
  4. 08 Jun, 2018 1 commit
    • Bob Van Landuyt's avatar
      Users can accept terms during registration · 3d713ac1
      Bob Van Landuyt authored
      When a user checks the `accept` checkbox, we will track that
      acceptance as usual. That way they don't need to accept again after
      they complete the registration.
      
      When an unauthenticated user visits the `/-/users/terms` page, there
      is no button to accept, decline or continue. The 'current-user menu'
      is also hidden from the top bar.
      3d713ac1
  5. 18 May, 2018 1 commit
  6. 04 May, 2018 1 commit
    • Bob Van Landuyt's avatar
      Enforces terms in the web application · 7684217d
      Bob Van Landuyt authored
      This enforces the terms in the web application. These cases are
      specced:
      
      - Logging in: When terms are enforced, and a user logs in that has not
        accepted the terms, they are presented with the screen. They get
        directed to their customized root path afterwards.
      - Signing up: After signing up, the first screen the user is presented
        with the screen to accept the terms. After they accept they are
        directed to the dashboard.
      - While a session is active:
        - For a GET: The user will be directed to the terms page first,
          after they accept the terms, they will be directed to the page
          they were going to
        - For any other request: They are directed to the terms, after they
          accept the terms, they are directed back to the page they came
          from to retry the request. Any information entered would be
          persisted in localstorage and available on the page.
      7684217d
  7. 27 Apr, 2018 1 commit
  8. 05 Apr, 2018 1 commit
  9. 04 Apr, 2018 1 commit
    • Eric Eastwood's avatar
      Add custom additonal email text to all emails · a6c7d805
      Eric Eastwood authored
      Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474
      
      Conflicts:
      	db/schema.rb
      	ee/app/controllers/ee/admin/application_settings_controller.rb
      	ee/app/helpers/ee/application_settings_helper.rb
      	ee/app/models/ee/application_setting.rb
      	ee/app/models/license.rb
      	ee/app/views/layouts/service_desk.html.haml
      	ee/app/views/notify/approved_merge_request_email.html.haml
      	ee/app/views/notify/service_desk_new_note_email.text.erb
      	ee/app/views/notify/service_desk_thank_you_email.text.erb
      	ee/app/views/notify/unapproved_merge_request_email.html.haml
      	ee/lib/ee/api/entities.rb
      	ee/spec/controllers/admin/application_settings_controller_spec.rb
      	ee/spec/models/application_setting_spec.rb
      	ee/spec/requests/api/settings_spec.rb
      	lib/api/settings.rb
      	spec/mailers/previews/notify_preview.rb
      a6c7d805
  10. 07 Mar, 2018 1 commit
  11. 21 Feb, 2018 2 commits
  12. 16 Jun, 2017 1 commit
  13. 22 May, 2017 2 commits
  14. 11 May, 2017 2 commits
  15. 26 Apr, 2017 1 commit
  16. 18 Apr, 2017 1 commit
  17. 14 Apr, 2017 6 commits
  18. 24 Feb, 2017 1 commit
  19. 22 Feb, 2017 1 commit
  20. 20 Feb, 2017 2 commits
  21. 16 Feb, 2017 2 commits
  22. 15 Feb, 2017 3 commits
  23. 08 Feb, 2017 1 commit
  24. 22 Nov, 2016 1 commit
  25. 04 Aug, 2016 1 commit
  26. 22 Jul, 2016 1 commit