1. 07 Aug, 2018 1 commit
    • Shinya Maeda's avatar
      Squashed commit of the following: · 8fa361b2
      Shinya Maeda authored
      commit 610c02c305d9fb3c7d271883450a5fee8b0cf16f
      Merge: f2088edb260 84f24dce
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 23:01:38 2018 +0900
      
          Merge branch 'master-ce' into improve-junit-support-be
      
      commit f2088edb26008e5791b7be86fc02fc470c881143
      Merge: c67e1d32cac 339f47abec1
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 21:52:10 2018 +0900
      
          Merge branch 'improve-junit-support-be' of gitlab.com:gitlab-org/gitlab-ce into improve-junit-support-be
      
      commit c67e1d32cac731b895e2f49a24ce0e1726b8196c
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 21:51:39 2018 +0900
      
          Remove debuggable fixtures
      
      commit 339f47abec1d0ce815e6103a087902d71d8ff5be
      Merge: 7a33a9be724 96b748fbcc0
      Author: Filipa Lacerda <filipa@gitlab.com>
      Date:   Tue Aug 7 11:10:18 2018 +0100
      
          Merge branch 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce into improve-junit-support-be
      
          * 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce:
            Add spec for latest
            Add spec for merge request
            Add spec for cache invalidation
            Add spec for pipeline
            Add spec
            Fix specs
            Support corrupted fixtures
            Add  cache key to error message
      
      commit 7a33a9be724dbde79a24cec77658952ff2d2fa6c
      Author: Filipa Lacerda <filipa@gitlab.com>
      Date:   Tue Aug 7 11:09:56 2018 +0100
      
          Show resolved failures
      
      commit 96b748fbcc00a98a13aeb78f5d97de9cf25035b6
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 18:50:05 2018 +0900
      
          Add spec for latest
      
      commit 0e8b024169b4b0ac272331117ac2fa821c4052f7
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 18:24:38 2018 +0900
      
          Add spec for merge request
      
      commit 8690a699bc98394ad4deebdc91e6690758c5965e
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 18:18:55 2018 +0900
      
          Add spec for cache invalidation
      
      commit 97678e1612826af409ca8a04b6c0dc830f7b66c6
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 18:01:03 2018 +0900
      
          Add spec for pipeline
      
      commit 96c2a698af049e4026c68e74b1f41a265464b2b2
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 17:52:21 2018 +0900
      
          Add spec
      
      commit 67bcbd25a3c13abb78ea43c0411f5aed417b87d0
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 17:39:02 2018 +0900
      
          Fix specs
      
      commit d7d49def2023f85c07d2718b83f35c8849f65f05
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 13:11:07 2018 +0900
      
          Support corrupted fixtures
      
      commit d58dbbc17a7d954db22082615f5331c148c1061b
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 13:10:47 2018 +0900
      
          Add  cache key to error message
      
      commit f6f976216dc36333b5e05e3f0acdfca689350483
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Thu Aug 2 19:07:46 2018 +0900
      
          bring back debaggable fixtures
      
      commit 48a7800e67a718145c0e88c324c0c1f9619e26a4
      Merge: 2822b9e8a36 dd627072
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Tue Aug 7 09:22:22 2018 +0900
      
          Merge branch 'master-ce' into improve-junit-support-be
      
      commit 2822b9e8a369162d098a72a58803c8494b2343cd
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 22:54:47 2018 +0900
      
          Move cache invalidation policy to outside of reactive cache
      
      commit b35efb1764ae61bb31dacbf79dbc022dcee3a203
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 22:34:10 2018 +0900
      
          ADd reactive cache an ability to invalite cache
      
      commit feafee6f8a50f4a32866d8ae768e99766b0b7c73
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 19:25:22 2018 +0900
      
          Pipeline has test reports if latest builds have any
      
      commit f302dbb73abe03c6c431e7d52d526e28a1586fee
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 19:18:56 2018 +0900
      
          Invalidate test reports cache if it's outdated
      
      commit 83adaca01a1ee1cd64cac86b6fa3d10e2e4e2b98
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 18:08:06 2018 +0900
      
          Revert cache invalidation in expire pipeline cache worker
      
      commit ec3af5de4ca34e2e92ad6b97f29733d6c65062bc
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 15:13:47 2018 +0900
      
          Fix feature spec
      
      commit 0db48805a1ba68763be0504eb57218bde2380e4b
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 14:07:46 2018 +0900
      
          Change lifetime of test reports cache to 10 minutes
      
      commit 17f7e78bfe2188c349cda1ff90a3ea94d337461e
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 14:07:19 2018 +0900
      
          Add changelog
      
      commit 89c87585ab7f5333a8139c02b330dd2caf0be31a
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 14:01:20 2018 +0900
      
          Add feature spec
      
      commit 1120cfd7a9ab06105f2e763c375fab00922b7e0c
      Author: Shinya Maeda <shinya@gitlab.com>
      Date:   Mon Aug 6 12:55:47 2018 +0900
      
          Invalidate cache when pipeline status transits. Correct test reports from the latest builds
      8fa361b2
  2. 01 Aug, 2018 2 commits
  3. 20 Jul, 2018 2 commits
  4. 17 Jul, 2018 2 commits
  5. 11 Jul, 2018 1 commit
  6. 09 Jul, 2018 1 commit
  7. 05 Jul, 2018 1 commit
  8. 21 Jun, 2018 1 commit
  9. 07 Jun, 2018 1 commit
  10. 05 Jun, 2018 1 commit
  11. 03 Jun, 2018 1 commit
  12. 01 Jun, 2018 1 commit
  13. 25 May, 2018 2 commits
  14. 22 May, 2018 1 commit
  15. 21 May, 2018 1 commit
  16. 17 May, 2018 1 commit
    • lulalala's avatar
      Add cannot_be_merged_recheck merge_status · 75171053
      lulalala authored
      First, transitions between can_be_merged & cannot_be_merged are removed,
      as they are currently blocked in `check_if_can_be_merged`.
      `can_be_merge` always returns to `unchecked` first,
      before it can transition to `cannot_be_merged` (and vice versa).
      
      We want to avoid repeated notification triggered by repeated transition
      between `cannot_be_merged` & `unchecked`.
      
      So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
      but as a mean to remember it’s from cannot_be_merged.
      
      See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407
      
      Since `unchecked` and `cannot_be_merged_recheck` both mean
      “we are in the middle of checking if it is mergeable”,
      quite often we need to see if merge_status is in either one of them,
      so `check_state?` is added to achieve this.
      75171053
  17. 10 May, 2018 1 commit
  18. 03 May, 2018 1 commit
  19. 20 Apr, 2018 2 commits
  20. 13 Apr, 2018 2 commits
  21. 12 Apr, 2018 2 commits
  22. 11 Apr, 2018 2 commits
  23. 03 Apr, 2018 2 commits
  24. 14 Mar, 2018 1 commit
  25. 13 Mar, 2018 1 commit
  26. 08 Mar, 2018 3 commits
  27. 07 Mar, 2018 3 commits