Commit Graph

24 Commits

Author SHA1 Message Date
GitLab Bot 0f59ad0c29 Add latest changes from gitlab-org/gitlab@master 2020-04-28 09:09:34 +00:00
GitLab Bot 6b9d3a4e83 Add latest changes from gitlab-org/gitlab@master 2020-01-29 18:08:47 +00:00
GitLab Bot cddaddb86b Add latest changes from gitlab-org/gitlab@master 2020-01-09 12:08:03 +00:00
GitLab Bot 88542a5e96 Add latest changes from gitlab-org/gitlab@master 2019-11-19 15:06:24 +00:00
GitLab Bot 759bab0585 Add latest changes from gitlab-org/gitlab@master 2019-11-08 15:06:21 +00:00
GitLab Bot d8ccc7a00b Add latest changes from gitlab-org/gitlab@master 2019-11-07 18:06:21 +00:00
GitLab Bot f155cc9034 Add latest changes from gitlab-org/gitlab@master 2019-10-16 03:06:12 +00:00
GitLab Bot 40597fdec0 Add latest changes from gitlab-org/gitlab@master 2019-10-08 18:05:56 +00:00
GitLab Bot 427b23c127 Add latest changes from gitlab-org/gitlab@master 2019-10-03 00:05:59 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +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
Heinrich Lee Yu d4a919679a Use transactions in JS feature specs
Uses Rails transactional tests instead of DatabaseCleaner
transaction strategy because that doesn't work with JS tests
2019-07-12 10:39:14 +08:00
Lukas Eipert 8ccf1ea310
Use correct integrity hash for sprockets caching
Use self.integrity_uri over self.hexdigest_integrity_uri(digest), as the
latter always returned nil leading to improper cache invalidation.

We are alos enabling caching of `tmp/cache/assets/sprockets` again, to
get those performance gains.
2019-02-08 13:14:39 +01:00
Rémy Coutable 31fc5965ba
Monkey-patch Sprockets to prevent cache ballooning
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-05 13:38:52 +01:00
Lin Jen-Shin 84e441d808 Make it clear that we intent to use | over || 2018-10-26 18:43:33 +08:00
Lin Jen-Shin d045df3da8 Allow CE do nothing if route doesn't exist 2018-10-26 14:27:05 +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 f1701c0fec Make it possible to add EE only route
And if it cannot find any routes, raise an error
2018-10-26 14:27:05 +08:00
Lin Jen-Shin 1581f75fb5 Put EE routes in EE files under EE directories 2018-10-26 14:27:05 +08:00
Lin Jen-Shin d6c4bc4688 Explain why we need Prependable 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 71fefe1474 Properly implement prepending for Concern 2018-09-11 18:45:49 +08:00