1. 21 Dec, 2017 2 commits
    • Phil Hughes's avatar
      Merge branch 'winh-fix-transient-loadDiff-failure' into 'master' · 1e508351
      Phil Hughes authored
      Fix racing condition in Ajax call of merge_request_tabs_spec.js
      
      Closes #35294
      
      See merge request gitlab-org/gitlab-ce!16012
      1e508351
    • Robert Speicher's avatar
      Merge branch... · 5d8d72f1
      Robert Speicher authored
      Merge branch '41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master'
      
      Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url
      
      Closes #41291
      
      See merge request gitlab-org/gitlab-ce!16052
      5d8d72f1
  2. 20 Dec, 2017 19 commits
  3. 19 Dec, 2017 19 commits