1. 07 May, 2018 5 commits
  2. 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
  3. 27 Apr, 2018 1 commit
  4. 26 Apr, 2018 1 commit
  5. 23 Apr, 2018 1 commit
  6. 20 Apr, 2018 2 commits
  7. 18 Apr, 2018 1 commit
  8. 16 Apr, 2018 1 commit
  9. 13 Apr, 2018 1 commit
  10. 12 Apr, 2018 1 commit
  11. 06 Apr, 2018 2 commits
  12. 05 Apr, 2018 2 commits
  13. 04 Apr, 2018 3 commits
    • Kamil Trzciński's avatar
      Allow to store uploads by default on Object Storage · 9dde7df2
      Kamil Trzciński authored
      Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
      9dde7df2
    • Eric Eastwood's avatar
      Add custom additonal email text to all emails · a6c7d805
      Eric Eastwood authored
      Fix gitlab-org/gitlab-ee#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
    • Stan Hu's avatar
      Add support for Sidekiq JSON logging · 6415ac9e
      Stan Hu authored
      Closes #20060
      6415ac9e
  14. 02 Apr, 2018 2 commits
  15. 29 Mar, 2018 1 commit
  16. 28 Mar, 2018 1 commit
  17. 27 Mar, 2018 2 commits
  18. 26 Mar, 2018 1 commit
  19. 22 Mar, 2018 1 commit
  20. 19 Mar, 2018 1 commit
    • Sean McGivern's avatar
      Show Ajax requests in performance bar · a200619d
      Sean McGivern authored
      But first, rewrite the performance bar in Vue:
      
      1. Remove the peek-host gem and replace it with existing code. This also allows
         us to include the host in the JSON response, rather than in the page HTML.
      2. Leave the line profiler parts as here-be-dragons: nicer would be a separate
         endpoint for these, so we could use them on Ajax requests too.
      3. The performance bar is too fiddly to rewrite right now, so apply the same
         logic to that.
      
      Then, add features! All requests made through Axios are able to be tracked. To
      keep a lid on memory usage, only the first two requests for a given URL are
      tracked, though. Each request that's tracked has the same data as the initial
      page load, with the exception of the performance bar and the line profiler, as
      explained above.
      a200619d
  21. 16 Mar, 2018 1 commit
  22. 13 Mar, 2018 1 commit
  23. 09 Mar, 2018 3 commits
  24. 08 Mar, 2018 1 commit
  25. 07 Mar, 2018 2 commits
  26. 06 Mar, 2018 1 commit