1. 12 Dec, 2018 6 commits
    • Yorick Peterse's avatar
      Move remaining EE specific lines out of CE code · 3c289543
      Yorick Peterse authored
      These lines were not handled by previous work to move EE code out of CE
      code, in most cases because our scripts did not cover all cases. This
      commit moves a variety of EE specific Ruby changes, with the exception
      of `prepend` calls, out of CE code.
      3c289543
    • Yorick Peterse's avatar
      Fix path_to_repo in Elasticsearch::Git::Repository · 2e1c254d
      Yorick Peterse authored
      In `Elasticsearch::Git::Repository` we would define `path_to_repo` as
      follows:
      
          unless defined?(path_to_repo)
            def path_to_repo
              @path_to_repo.presence || raise(NotImplementedError, ...)
            end
          end
      
      Prior to this commit, this module would be included into `Repository`
      before it defined its own `path_to_repo` method, meaning we would not
      use the above definition as intended. However, this _only_ worked
      because the module was included before our custom definition. The
      `defined?(path_to_repo)` call would always return false, because
      `defined?` here checks for _class methods_, and not instance methods. As
      a result, when moving `prepend` in `Repository` to the end of the file,
      the above code would redefine `Repository#path_to_repo`.
      
      To resolve this, we use `method_defined?` instead of `defined?`, which
      allows us to check for the presence of an instance method. This ensures
      that `Repository#path_to_repo` does not get overwritten when we include
      this module.
      2e1c254d
    • Yorick Peterse's avatar
      Fixed flaky EE specific Ci::Pipeline test · bec7d22d
      Yorick Peterse authored
      This test would expect pipelines to be returned in a particular order,
      without actually ordering the rows. This could lead to the test
      sometimes failing. To solve this, we use `to include` instead of `to
      eq`.
      bec7d22d
    • Yorick Peterse's avatar
      Merge branch 'rs-null-notification-service' into 'master' · f269d4a3
      Yorick Peterse authored
      Add a NullNotificationService
      
      See merge request gitlab-org/gitlab-ee!8743
      f269d4a3
    • Achilleas Pipinellis's avatar
      Merge branch 'tatkins-installation-method-docs' into 'master' · 16631301
      Achilleas Pipinellis authored
      Add docs to help choose the best GitLab installation method
      
      See merge request gitlab-org/gitlab-ee!8646
      16631301
    • Sean McGivern's avatar
      Merge branch 'make-quick-action-sentences' into 'master' · 702aafdf
      Sean McGivern authored
      Make quick-action notes complete sentences
      
      See merge request gitlab-org/gitlab-ee!8740
      702aafdf
  2. 11 Dec, 2018 34 commits