Commit Graph

21 Commits

Author SHA1 Message Date
GitLab Bot 3cccd102ba Add latest changes from gitlab-org/gitlab@14-10-stable-ee 2022-04-20 10:00:54 +00:00
GitLab Bot 41fe97390c Add latest changes from gitlab-org/gitlab@14-9-stable-ee 2022-03-18 20:02:30 +00:00
GitLab Bot aee0a117a8 Add latest changes from gitlab-org/gitlab@14-6-stable-ee 2021-12-20 13:37:47 +00:00
GitLab Bot 0653e08efd Add latest changes from gitlab-org/gitlab@14-3-stable-ee 2021-09-20 13:18:24 +00:00
GitLab Bot a5f4bba440 Add latest changes from gitlab-org/gitlab@14-0-stable-ee 2021-06-16 18:25:58 +00:00
GitLab Bot 859a6fb938 Add latest changes from gitlab-org/gitlab@13-9-stable-ee 2021-02-18 10:34:06 +00:00
GitLab Bot a09983ae35 Add latest changes from gitlab-org/gitlab@13-2-stable-ee 2020-07-20 12:26:25 +00:00
GitLab Bot 8c7f4e9d5f Add latest changes from gitlab-org/gitlab@13-1-stable-ee 2020-06-18 11:18:50 +00:00
GitLab Bot cddaddb86b Add latest changes from gitlab-org/gitlab@master 2020-01-09 12:08:03 +00:00
GitLab Bot f155cc9034 Add latest changes from gitlab-org/gitlab@master 2019-10-16 03:06:12 +00:00
Aleksei Lipniagov 50cb6eca57 Use 'gitlab_chronic_duration' gem
Replace 'chronic_duration' to 'gitlab_chronic_duration', to make
relevant method calls thread-safe.
2019-09-11 18:32:24 +00:00
Heinrich Lee Yu 7a8d216480 Fix time tracking parsing of months
Patches ChronicDuration to use our custom conversions
when parsing months
2019-09-05 20:24:33 +08:00
Lin Jen-Shin 52fa309e86 Extract EE only oauth routes and add tests 2018-10-26 14:27:05 +08:00
Lin Jen-Shin ebe89e8bd2 Explicitly state that we're trying to prepend twice 2018-09-11 18:45:49 +08:00
Lin Jen-Shin 1cee6b3c72 Add a test for triggering MultiplePrependedBlocks 2018-09-11 18:45:49 +08:00
Lin Jen-Shin 3acec5328e Explain why we need locals again in let(:ce) 2018-09-11 18:45:49 +08:00
Lin Jen-Shin e8a455dc92 Following the feedbacks 2018-09-11 18:45:49 +08:00
Lin Jen-Shin 07da8f9128 Preserve prepend semantics for Ruby
However we still want to make ClassMethods work!

And we'll need to fix codes using the wrong include/prepend
along the way. There were a lot of misuses.
2018-09-11 18:45:49 +08:00
Lin Jen-Shin d7f87a2bc9 Absorb the old tests 2018-09-11 18:45:49 +08:00
Lin Jen-Shin 517ee9fd04 Fix Override. Properly define prepended
We should never be sloppy!
2018-09-11 18:45:49 +08:00
Lin Jen-Shin 71fefe1474 Properly implement prepending for Concern 2018-09-11 18:45:49 +08:00