1. 06 Mar, 2019 5 commits
  2. 05 Mar, 2019 12 commits
  3. 04 Mar, 2019 21 commits
  4. 02 Mar, 2019 2 commits
    • Grzegorz Bizon's avatar
      Extract scoped CI/CD variables to a separate concern · 552a32c0
      Grzegorz Bizon authored
      This commits extract code responsible for calculating essential CI/CD
      variables to a separate concern. This makes it possible to share this
      code between a `Ci::Build` and a `Ci::Bridge`.
      
      We might want to refactor this to use composition instead of
      inheritance.
      552a32c0
    • Stan Hu's avatar
      Show pre-receive error message in merge request widget · b6a97278
      Stan Hu authored
      When a merge fails due to a locked file, no feedback was given to the
      user as to why it failed if the user used the Merge button.  However, if
      the push attempt happened directly in the Web UI, the pre-receive
      message would be displayed.
      
      To be consistent and to make it clear why a merge failed, we now include
      the pre-receive error message in the merge request widget.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165
      b6a97278