summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-211-2/+13
|\
| * Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-211-2/+13
* | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-216-18/+23
|\ \ | |/ |/|
| * Use seconds where possible, and convert to milliseconds for Influxdb consumptionPawel Chojnacki2017-12-212-18/+14
| * use in_milliseconds rails helperPawel Chojnacki2017-12-202-3/+3
| * Fix tests and formattingPawel Chojnacki2017-12-193-2/+2
| * Make `System.monotonic_time` retun seconds represented by float with microsec...Pawel Chojnacki2017-12-125-15/+24
| * Fix gitaly_call_histogram to observe times in seconds correctlyPawel Chojnacki2017-12-121-1/+1
| * Reduce cardinality of gitlab_cache_operation_duration_seconds histogramPawel Chojnacki2017-12-121-1/+1
* | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docsRobert Speicher2017-12-201-8/+3
|\ \
| * | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7Kim Carlbäcker2017-12-201-8/+3
* | | Migrate to Project#empty_repo?zj-empty-repo-importerZeger-Jan van de Weg2017-12-201-1/+1
|/ /
* | Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-202-2/+3
|\ \
| * | Add optional `search` param for Merge Requests APIMark Fletcher2017-12-201-0/+1
| * | Employ declared_params in finder methods for MR and Issue API listsMark Fletcher2017-12-202-2/+2
* | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-4/+4
|/ /
* | Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-192-0/+22
|\ \
| * | Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-192-0/+22
* | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+47
|\ \ \ | |/ / |/| |
| * | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-121-1/+17
| * | Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-121-1/+1
| * | Add spec for ActionRateLimiterStan Hu2017-12-121-2/+2
| * | Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-121-0/+31
* | | 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
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status