1. 21 Mar, 2019 1 commit
    • Nathan Friend's avatar
      Update merge request widget pipeline block · 7e6b5749
      Nathan Friend authored
      This commit updates the pipeline block that appears on the merge request
      page to include information that will be exposed by the API as part of
      the post-merge pipeline feature.
      7e6b5749
  2. 13 Mar, 2019 1 commit
  3. 09 Mar, 2019 1 commit
  4. 06 Mar, 2019 1 commit
  5. 04 Mar, 2019 2 commits
  6. 25 Feb, 2019 1 commit
    • Oswaldo Ferreira's avatar
      Support merge to ref for merge-commit and squash · 1ad69967
      Oswaldo Ferreira authored
      Adds the ground work for writing into
      the merge ref refs/merge-requests/:iid/merge the
      merge result between source and target branches of
      a MR, without further side-effects such as
      mailing, MR updates and target branch changes.
      1ad69967
  7. 15 Feb, 2019 2 commits
  8. 14 Feb, 2019 1 commit
    • Jarka Košanová's avatar
      Check issue milestone availability · 30ab6ee4
      Jarka Košanová authored
      Add project when creating milestone in specs
      
      We validate milestone is from the same
      project/parent group as issuable ->
      we need to set project in specs correctly
      
      Improve methods names and specs organization
      30ab6ee4
  9. 06 Feb, 2019 1 commit
  10. 28 Jan, 2019 1 commit
    • Mario de la Ossa's avatar
      Save sorting preference for Issues/MRs in BE · 49c74068
      Mario de la Ossa authored
      In order to let users' sorting preferences transfer between devices, we
      save the preference for issues and MRs (one preference for issues, one
      for MRs) in the backend inside the UserPreference object
      49c74068
  11. 12 Jan, 2019 1 commit
    • Oswaldo Ferreira's avatar
      Adjust applied suggestion reverting previous changes · 6e293681
      Oswaldo Ferreira authored
      1. Avoid suggestions being applied on the same file
      from reverting previous changes
      2. Gracefully use and handle file changes error
      when updating the file (though, it does not totally
      solves the sync problem for multiple suggestion
      applications at once)
      6e293681
  12. 10 Jan, 2019 1 commit
  13. 08 Jan, 2019 1 commit
  14. 04 Jan, 2019 2 commits
  15. 02 Jan, 2019 1 commit
  16. 21 Dec, 2018 1 commit
    • Oswaldo Ferreira's avatar
      Cache diff highlight in discussions · 7cf49477
      Oswaldo Ferreira authored
      This commit handles note diffs caching, which considerably improves
      the performance on merge requests with lots of comments.
      Important to note that the caching approach taken here is different
      from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache
      when a new push is sent or anything else. That's because discussions
      diffs are persisted and do not change.
      7cf49477
  17. 18 Dec, 2018 2 commits
  18. 13 Dec, 2018 1 commit
  19. 11 Dec, 2018 2 commits
  20. 07 Dec, 2018 1 commit
  21. 06 Dec, 2018 3 commits
  22. 05 Dec, 2018 2 commits
  23. 08 Nov, 2018 1 commit
  24. 07 Nov, 2018 1 commit
  25. 02 Nov, 2018 1 commit
  26. 29 Oct, 2018 1 commit
  27. 03 Oct, 2018 1 commit
  28. 24 Sep, 2018 1 commit
  29. 17 Sep, 2018 1 commit
    • Yorick Peterse's avatar
      Added FromUnion to easily select from a UNION · 8a72f5c4
      Yorick Peterse authored
      This commit adds the module `FromUnion`, which provides the class method
      `from_union`. This simplifies the process of selecting data from the
      result of a UNION, and reduces the likelihood of making mistakes. As a
      result, instead of this:
      
          union = Gitlab::SQL::Union.new([foo, bar])
      
          Foo.from("(#{union.to_sql}) #{Foo.table_name}")
      
      We can now write this instead:
      
          Foo.from_union([foo, bar])
      
      This commit also includes some changes to make this new setup work
      properly. For example, a bug in Rails 4
      (https://github.com/rails/rails/issues/24193) would break the use of
      `from("sub-query-here").includes(:relation)` in certain cases. There was
      also a CI query which appeared to repeat a lot of conditions from an
      outer query on an inner query, which isn't necessary.
      
      Finally, we include a RuboCop cop to ensure developers use this new
      module, instead of using Gitlab::SQL::Union directly.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
      8a72f5c4
  30. 11 Sep, 2018 1 commit
  31. 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
  32. 06 Aug, 2018 1 commit