| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jprovazn-search' into 'master' | Yorick Peterse | 2017-12-21 | 1 | -2/+13 |
|\ |
|
| * | Skip projects filter on merge requests searchjprovazn-search | Jan Provaznik | 2017-12-21 | 1 | -2/+13 |
* | | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master' | Douwe Maan | 2017-12-21 | 6 | -18/+23 |
|\ \
| |/
|/| |
|
| * | Use seconds where possible, and convert to milliseconds for Influxdb consumption | Pawel Chojnacki | 2017-12-21 | 2 | -18/+14 |
| * | use in_milliseconds rails helper | Pawel Chojnacki | 2017-12-20 | 2 | -3/+3 |
| * | Fix tests and formatting | Pawel Chojnacki | 2017-12-19 | 3 | -2/+2 |
| * | Make `System.monotonic_time` retun seconds represented by float with microsec... | Pawel Chojnacki | 2017-12-12 | 5 | -15/+24 |
| * | Fix gitaly_call_histogram to observe times in seconds correctly | Pawel Chojnacki | 2017-12-12 | 1 | -1/+1 |
| * | Reduce cardinality of gitlab_cache_operation_duration_seconds histogram | Pawel Chojnacki | 2017-12-12 | 1 | -1/+1 |
* | | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docs | Robert Speicher | 2017-12-20 | 1 | -8/+3 |
|\ \ |
|
| * | | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7 | Kim Carlbäcker | 2017-12-20 | 1 | -8/+3 |
* | | | Migrate to Project#empty_repo?zj-empty-repo-importer | Zeger-Jan van de Weg | 2017-12-20 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch '38318-search-merge-requests-with-api' into 'master' | Rémy Coutable | 2017-12-20 | 2 | -2/+3 |
|\ \ |
|
| * | | Add optional `search` param for Merge Requests API | Mark Fletcher | 2017-12-20 | 1 | -0/+1 |
| * | | Employ declared_params in finder methods for MR and Issue API lists | Mark Fletcher | 2017-12-20 | 2 | -2/+2 |
* | | | Only include the user's ID in the time_spent command's update hash | Robert Speicher | 2017-12-19 | 2 | -4/+4 |
|/ / |
|
* | | 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 | 28 | -84/+121 |
|\ \ \ |
|
| * | | | Backport changes from EE | Lin Jen-Shin | 2017-12-15 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-12-15 | 105 | -635/+2322 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-30 | 61 | -264/+772 |
| |\ \ \ \ |
|
| * | | | | | 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 | 77 | -207/+371 |
| |\ \ \ \ \ |
|
| * | | | | | | Move ModuleWithInstanceVariables to Gitlab namespace | Lin Jen-Shin | 2017-11-22 | 11 | -28/+28 |
| * | | | | | | 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 | 20 | -75/+80 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-17 | 177 | -1833/+4254 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 | 213 | -1507/+5755 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-09-25 | 39 | -196/+685 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Allow simple ivar ||= form. Update accordingly | Lin Jen-Shin | 2017-09-19 | 23 | -34/+33 |
| * | | | | | | | | | Add cop to make sure we don't use ivar in a module | Lin Jen-Shin | 2017-09-18 | 35 | -30/+69 |
* | | | | | | | | | | 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 'lfs-badge' into 'master' | Douwe Maan | 2017-12-15 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badge | Phil Hughes | 2017-12-14 | 1 | -0/+5 |
| * | | | | | | | | | | moved lfs blob fetch from extractspath file | Phil Hughes | 2017-12-14 | 1 | -4/+0 |
| * | | | | | | | | | | fixed project homepage not having correct variable | Phil Hughes | 2017-12-11 | 1 | -0/+3 |
* | | | | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master' | Robert Speicher | 2017-12-14 | 3 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ \ |
|