1. 26 Feb, 2015 3 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'line-is-wrong-test' into 'master' · cd6baa14
      Dmitriy Zaporozhets authored
      Make test element selection more specific to fix constantly failing test.
      
      Fixes #2051.
      
      The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist:
      
      > The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element.
      
      This caused the test to fail.
      
      See merge request !1592
      cd6baa14
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-another-migration' into 'master' · 78391fe5
      Dmitriy Zaporozhets authored
      Prevent another migration from failing due to indirect use of model columns not yet created
      
      See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077
      
      cc @marin
      
      See merge request !1597
      78391fe5
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-invalid-syntax' into 'master' · 5cd304dd
      Dmitriy Zaporozhets authored
      Fix git syntax issue for git version older then 1.7.10
      
      For #2067
      
      See merge request !1599
      5cd304dd
  2. 25 Feb, 2015 21 commits
  3. 24 Feb, 2015 16 commits