1. 19 Dec, 2017 4 commits
    • Lin Jen-Shin's avatar
      Preserve gem path so that we use the same gems · 873bc3a6
      Lin Jen-Shin authored
      Without this patch, I would end up with:
      
      ```
      An error occurred in a `before(:suite)` hook.
      Failure/Error: raise "could not connect to gitaly at #{socket.inspect} after #{sleep_time} seconds"
      
      RuntimeError:
        could not connect to gitaly at "tmp/tests/gitaly/gitaly.socket" after 10 seconds
      ```
      
      Digging into it, it's because `scripts/gitaly-test-spawn` could not
      spawn the process, because it cannot find the installed gems.
      
      I personally installed all my gems under $HOME, namely with:
      
      * `gem install rake --user-install` or:
      * `bundle install --path ~/.gem`
      
      The gems would be installed to `~/.gem/ruby/2.4.0/gems`, where
      the version is Ruby ABI version.
      
      Now we're changing $HOME, making RubyGems think that the gems
      would be installed to `tmp/tests/ruby/2.4.0/gems` which is
      apparently not the case.
      
      In order to workaround this, we could preserve $GEM_PATH
      populated by RubyGems, ignoring the default path based on $HOME.
      873bc3a6
    • Kamil Trzciński's avatar
      Merge branch 'fix-cluster-enviroment-missing' into 'master' · 888ed309
      Kamil Trzciński authored
      Fix cluster enviroment missing
      
      See merge request gitlab-org/gitlab-ce!15973
      888ed309
    • Kamil Trzciński's avatar
      Merge branch '41139-codequality-and-qa-internal-is-leaking-to-shared-runners' into 'master' · 5ebaafc3
      Kamil Trzciński authored
      Resolve "Codequality and qa:internal is leaking to Shared Runners"
      
      Closes #41139
      
      See merge request gitlab-org/gitlab-ce!15957
      5ebaafc3
    • Oswaldo Ferreira's avatar
      Merge branch 'sh-fix-milestone-id-migration' into 'master' · 130b03c2
      Oswaldo Ferreira authored
      Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration
      
      Closes gitlab-com/infrastructure#3416
      
      See merge request gitlab-org/gitlab-ce!15997
      130b03c2
  2. 18 Dec, 2017 36 commits