summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1528-84/+121
|\
| * Backport changes from EELin Jen-Shin2017-12-151-1/+1
| * Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-15105-635/+2322
| |\
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3061-264/+772
| |\ \
| * | | Cache allowed_idsLin Jen-Shin2017-11-221-1/+1
| * | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2277-207/+371
| |\ \ \
| * | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2211-28/+28
| * | | | Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-226-16/+8
| * | | | Updates based on feedbackLin Jen-Shin2017-11-221-3/+3
| * | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1820-75/+80
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-17177-1833/+4254
| |\ \ \ \
| * | | | | WIPLin Jen-Shin2017-11-061-0/+4
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-06213-1507/+5755
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2539-196/+685
| |\ \ \ \ \ \
| * | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1923-34/+33
| * | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1835-30/+69
* | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-153-22/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-153-22/+32
* | | | | | | | | Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-152-33/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-142-33/+32
* | | | | | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-153-35/+365
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-143-35/+365
* | | | | | | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-151-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-141-0/+5
| * | | | | | | | | | moved lfs blob fetch from extractspath filePhil Hughes2017-12-141-4/+0
| * | | | | | | | | | fixed project homepage not having correct variablePhil Hughes2017-12-111-0/+3
* | | | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-143-2/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-133-2/+19
* | | | | | | | | | | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-141-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-141-8/+1
* | | | | | | | | | | | sorting for tags apihaseeb2017-12-141-1/+6
* | | | | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-143-13/+61
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use a dedicated queue for each workerDouwe Maan2017-12-123-13/+61
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-131-1/+3
* | | | | | | | | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-131-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use class variable and add rubocop exceptionpawel/cache_feature_check_for_5_minutes_for_method_callPawel Chojnacki2017-12-121-0/+2
| * | | | | | | | | | | | Expire feature flag cache after 1minutePawel Chojnacki2017-12-121-1/+1
| * | | | | | | | | | | | use class variables instead of CONSTANTsPawel Chojnacki2017-12-121-6/+10
| * | | | | | | | | | | | move call_measurement_enabled? method to the bottom of the filePawel Chojnacki2017-12-121-11/+11
| * | | | | | | | | | | | Use AtomicFixNum to implement CAS isolated cache update.Pawel Chojnacki2017-12-121-10/+7
| * | | | | | | | | | | | Implemente measurement enabled cache using AtomicReferencePawel Chojnacki2017-12-121-18/+13
| * | | | | | | | | | | | Set cache expire only once the cache is filled,Pawel Chojnacki2017-12-121-1/+4
| * | | | | | | | | | | | Implement simple in memory cache that expires after 5 minutesPawel Chojnacki2017-12-121-7/+19
| * | | | | | | | | | | | Cache feature check for 5 minutes for MethodCall instrumentation togglePawel Chojnacki2017-12-121-1/+3
* | | | | | | | | | | | | Merge branch 'add-tcp-check-rake-task' into 'master'Rémy Coutable2017-12-132-0/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add a gitlab:tcp_check rake taskNick Thomas2017-12-132-0/+65
* | | | | | | | | | | | | Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using...Robert Speicher2017-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-121-1/+1
* | | | | | | | | | | | | | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-122-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
View Lorry Controller Status