Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master' | Robert Speicher | 2017-12-19 | 2 | -0/+22 |
|\ | |||||
| * | Load commit in batches for pipelines#index | Zeger-Jan van de Weg | 2017-12-19 | 2 | -0/+22 |
* | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master' | Kamil Trzciński | 2017-12-18 | 1 | -0/+47 |
|\ \ | |/ |/| | |||||
| * | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-now | Stan Hu | 2017-12-12 | 1 | -1/+17 |
| * | Fix Rubocop offense and use a symbol instead of a string | Stan Hu | 2017-12-12 | 1 | -1/+1 |
| * | Add spec for ActionRateLimiter | Stan Hu | 2017-12-12 | 1 | -2/+2 |
| * | Add rate limiting to guard against excessive scheduling of pipelines | Stan Hu | 2017-12-12 | 1 | -0/+31 |
* | | Merge branch 'no-ivar-in-modules' into 'master' | Robert Speicher | 2017-12-15 | 23 | -62/+87 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-12-15 | 68 | -422/+1864 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-30 | 37 | -183/+487 |
| |\ \ \ | |||||
| * | | | | Cache allowed_ids | Lin Jen-Shin | 2017-11-22 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-22 | 50 | -53/+305 |
| |\ \ \ \ | |||||
| * | | | | | Move ModuleWithInstanceVariables to Gitlab namespace | Lin Jen-Shin | 2017-11-22 | 8 | -11/+11 |
| * | | | | | Just define allowed_ids and override it with empty value | Lin Jen-Shin | 2017-11-22 | 6 | -16/+8 |
| * | | | | | Updates based on feedback | Lin Jen-Shin | 2017-11-22 | 1 | -3/+3 |
| * | | | | | Use StrongMemoize and enable/disable cops properly | Lin Jen-Shin | 2017-11-18 | 15 | -50/+52 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-17 | 116 | -720/+3902 |
| |\ \ \ \ \ | |||||
| * | | | | | | WIP | Lin Jen-Shin | 2017-11-06 | 1 | -0/+4 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-06 | 144 | -895/+4562 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-09-25 | 31 | -169/+620 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow simple ivar ||= form. Update accordingly | Lin Jen-Shin | 2017-09-19 | 16 | -19/+17 |
| * | | | | | | | | Add cop to make sure we don't use ivar in a module | Lin Jen-Shin | 2017-09-18 | 28 | -30/+61 |
* | | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master' | Sean McGivern | 2017-12-15 | 3 | -22/+32 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make sure user email is read only when synced with LDAP | Douwe Maan | 2017-12-15 | 3 | -22/+32 |
* | | | | | | | | | | Merge branch 'gitaly-conflicts-prep' into 'master' | Sean McGivern | 2017-12-15 | 2 | -33/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Simplify conflict resolver interfacegitaly-conflicts-prep | Alejandro Rodríguez | 2017-12-14 | 2 | -33/+32 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master' | Douwe Maan | 2017-12-15 | 3 | -35/+365 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Import gitlab_projects.rb from gitlab-shell | Nick Thomas | 2017-12-14 | 3 | -35/+365 |
* | | | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master' | Robert Speicher | 2017-12-14 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly | Ahmad Sherif | 2017-12-13 | 3 | -2/+19 |
* | | | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master' | Sean McGivern | 2017-12-14 | 3 | -13/+61 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use a dedicated queue for each worker | Douwe Maan | 2017-12-12 | 3 | -13/+61 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '... | Robert Speicher | 2017-12-13 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use class variable and add rubocop exceptionpawel/cache_feature_check_for_5_minutes_for_method_call | Pawel Chojnacki | 2017-12-12 | 1 | -0/+2 |
| * | | | | | | | | | | Expire feature flag cache after 1minute | Pawel Chojnacki | 2017-12-12 | 1 | -1/+1 |
| * | | | | | | | | | | use class variables instead of CONSTANTs | Pawel Chojnacki | 2017-12-12 | 1 | -6/+10 |
| * | | | | | | | | | | move call_measurement_enabled? method to the bottom of the file | Pawel Chojnacki | 2017-12-12 | 1 | -11/+11 |
| * | | | | | | | | | | Use AtomicFixNum to implement CAS isolated cache update. | Pawel Chojnacki | 2017-12-12 | 1 | -10/+7 |
| * | | | | | | | | | | Implemente measurement enabled cache using AtomicReference | Pawel Chojnacki | 2017-12-12 | 1 | -18/+13 |
| * | | | | | | | | | | Set cache expire only once the cache is filled, | Pawel Chojnacki | 2017-12-12 | 1 | -1/+4 |
| * | | | | | | | | | | Implement simple in memory cache that expires after 5 minutes | Pawel Chojnacki | 2017-12-12 | 1 | -7/+19 |
| * | | | | | | | | | | Cache feature check for 5 minutes for MethodCall instrumentation toggle | Pawel Chojnacki | 2017-12-12 | 1 | -1/+3 |
* | | | | | | | | | | | Merge branch 'add-tcp-check-rake-task' into 'master' | Rémy Coutable | 2017-12-13 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add a gitlab:tcp_check rake task | Nick Thomas | 2017-12-13 | 1 | -0/+45 |
* | | | | | | | | | | | Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using... | Robert Speicher | 2017-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter | Rémy Coutable | 2017-12-12 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'zj-memoization-mr-commits' into 'master' | Sean McGivern | 2017-12-12 | 2 | -5/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Use memoization for commits on diffs | Zeger-Jan van de Weg | 2017-12-12 | 2 | -5/+17 |
* | | | | | | | | | | | | Merge branch 'repo-write-ref-client-prep' into 'master' | Robert Speicher | 2017-12-12 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prep | Kim "BKC" Carlbäcker | 2017-12-12 | 1 | -3/+8 |