• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'ee/master' into 2902-standalone-ee-dir · 9213d306
    Lin Jen-Shin authored
    * ee/master: (262 commits)
      Make dropdown style on project page consistent
      Remove :empty_project factory from spec/requests/api/merge_requests_spec.rb
      Fix merge conflicts
      Try to fix some EE protected branches specs
      Remove EE-specific usages of `:empty_project`
      Change all `:empty_project` to `:project`
      Remove `:empty_project` factory, implement `:repository` trait
      Remove documentation about `:empty_project` since we're removing it
      Use `:empty_project` where possible in features/steps
      Add filtered search to group issue dashboard (EE)
      Update milestone docs EE
      Port of 34027-add-icons-to-sidebar to EE
      Fix docs for using object storage for storing artifacts
      EE port of sidebar-fly-out-sub-nav
      Fix artifacts controller spec for object stores
      Resolve conflicts
      CI fixes for gitaly-ruby
      Fix LogCursor error message handler
      Add structured log messages to Geo LogCursor
      EE-specific changes for `:empty_project` and `:repository`
      ...
    9213d306
1_settings.rb 27.7 KB