1. 04 Nov, 2017 3 commits
    • James Ramsay's avatar
      Docs: highlight geo configuration depends on prior stages · 4b2cb094
      James Ramsay authored
      Database replication must be completed before GitLab Geo can be
      configured. This has tripped up at least one customer, so adding
      documentation to make this clearer.
      4b2cb094
    • Stan Hu's avatar
      Merge branch 'ce-to-ee-2017-11-03' into 'master' · 43ec8c81
      Stan Hu authored
      CE upstream - Friday
      
      Closes gitaly#693, #3890, #3274, and gitlab-ce#34435
      
      See merge request gitlab-org/gitlab-ee!3261
      43ec8c81
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-11-03 · 6c01376c
      Lin Jen-Shin authored
      * ee/master: (192 commits)
        fix flaky tests by removing unneeded clicks and focus actions
        explicitly close select2 dropdown after use
        fix flaky test within protected_branches_access_control.rb
        fix flaky test in gfm_autocomplete_spec.rb
        Resolve "Add group actions to Audit events"
        replace calls to .trigger("click") with .click
        don't attempt to click on hidden elements
        replace use of unsupported trigger method with click
        prevent race condition when attempting to cancel a file upload
        confirm javascript modal when resetting email tokens
        Update CHANGELOG.md for 10.0.5
        Update CHANGELOG-EE.md for 10.0.5-ee
        Add reconfigure logs location to docs
        exclude issuable author from approvers autocomplete list
        close dropdown after selection
        close dropdown by clicking on page body after selection
        fix reference to hidden element
        fix broken click actions
        fix broken references to page.status_code
        add accept_confirm around actions which require it
        ...
      6c01376c
  2. 03 Nov, 2017 37 commits