summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-24' into 'master'Drew Blessing2019-05-071-2/+2
|\
| * docs: clarify LDAP cache timeBen Bodenmiller2019-05-071-2/+2
|/
* Merge branch 'fix/js-error-ssh-key-view' into 'master'Clement Ho2019-05-072-0/+7
|\
| * fix(profile): disable SSH key validation in key details viewRoger Meier2019-05-072-0/+7
|/
* Merge branch 'docs-10k-ref-wip' into 'master'Drew Blessing2019-05-071-1/+25
|\
| * Apply suggestion to doc/administration/high_availability/README.mdDrew Blessing2019-05-071-1/+1
| * Add the WIP 10k ref architecture specs to HA docsDrew Blessing2019-05-061-1/+25
* | Merge branch '56850-add-new-unicorn-metrics' into 'master'Ash McKenzie2019-05-079-29/+153
|\ \
| * | Clarify wording in metrics documentation56850-add-new-unicorn-metricsRyan Cobb2019-05-011-2/+2
| * | Cleanup spec by removing not needed letRyan Cobb2019-04-301-2/+1
| * | Add back ruby_memory_bytes metric, limit duplication, clean upRyan Cobb2019-04-293-11/+21
| * | Cleanup syntax in System max_open_file_descriptorsRyan Cobb2019-04-261-4/+2
| * | Update docs and calculate process start time via proc tableRyan Cobb2019-04-245-34/+44
| * | Move process specific metrics to ruby samplerRyan Cobb2019-04-244-23/+40
| * | Adds new metrics for unicorn monitoringRyan Cobb2019-04-186-13/+103
* | | Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' ...James Lopez2019-05-073-0/+36
|\ \ \
| * | | Confirm existence of head_pipeline if pipeline success requiredKerri Miller2019-05-073-0/+36
|/ / /
* | | Merge branch 'jl-architecture-mermaid-docs' into 'master'Achilleas Pipinellis2019-05-071-2/+146
|\ \ \
| * | | Update component diagram, switch to mermaidJoshua Lambert2019-05-071-2/+146
|/ / /
* | | Merge branch '60462-empty-pipeline-section' into 'master'Mayra Cabrera2019-05-074-2/+42
|\ \ \
| * | | Fixes empty block in MR widgetFilipa Lacerda2019-05-074-2/+42
* | | | Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' into...Phil Hughes2019-05-0710-124/+283
|\ \ \ \
| * | | | Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-changePaul Slaughter2019-05-0710-124/+283
* | | | | Merge branch 'register-gitaly-flags' into 'master'Sean McGivern2019-05-071-1/+2
|\ \ \ \ \
| * | | | | Register "gitaly_delta_islands" feature flagJacob Vosmaer2019-05-071-1/+2
|/ / / / /
* | | | | Merge branch 'sh-fix-related-merge-requests-path' into 'master'Rémy Coutable2019-05-074-1/+44
|\ \ \ \ \
| * | | | | Use a path for the related merge requests endpointsh-fix-related-merge-requests-pathStan Hu2019-05-074-1/+44
* | | | | | Merge branch '57171-link-to-grafana-on-metrics-dashboard' into 'master'Clement Ho2019-05-0711-1/+286
|\ \ \ \ \ \
| * | | | | | Add external dashboard linkAdriel Santiago2019-05-0711-1/+286
|/ / / / / /
* | | | | | Merge branch '58882-reduce-test-view-port' into 'master'Rémy Coutable2019-05-074-9/+23
|\ \ \ \ \ \
| * | | | | | Avoid quick action prompt blocking preview button58882-reduce-test-view-portLin Jen-Shin2019-05-072-5/+14
| * | | | | | Try to reduce testing view port and unify itLin Jen-Shin2019-05-072-4/+9
* | | | | | | Merge branch 'patch-35' into 'master'Achilleas Pipinellis2019-05-071-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fix alert box formattingBen Bodenmiller2019-05-071-2/+2
* | | | | | | | Merge branch 'mc/feature/pipeline-tracking-ce' into 'master'Grzegorz Bizon2019-05-071-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport EE changesmc/feature/pipeline-tracking-ceMatija Čupić2019-05-061-0/+4
* | | | | | | | | Merge branch '57077-add-salesforce-omniauth' into 'master'Douglas Barbosa Alexandre2019-05-0710-1/+95
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove from providers with iconGosia Ksionek2019-05-0710-1/+95
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-11430-update_clair_local_scan' into 'master'James Lopez2019-05-072-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Bump clair-local-scan to v2.0.8Olivier Gonzalez2019-05-072-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'show-disabled-mirrors' into 'master'Nick Thomas2019-05-078-15/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Show disabled project repo mirrorsshow-disabled-mirrorsLuke Bennett2019-05-078-15/+58
* | | | | | | | | Merge branch 'quarantine-login-via-oauth-spec' into 'master'Lin Jen-Shin2019-05-071-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Quarantine login via oauth specWalmyr Lima2019-05-071-1/+2
* | | | | | | | | | Merge branch 'patch-17' into 'master'Bob Van Landuyt2019-05-072-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add changelog entrySimon Hardt2019-05-071-0/+5
| * | | | | | | | | | remove note that multi-line suggestions are not yet availableSimon Hardt2019-05-061-5/+0
* | | | | | | | | | | Merge branch 'fj-59522-improve-search-controller-performance' into 'master'James Lopez2019-05-0714-113/+182
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add improvements to the global search processFrancisco Javier López2019-05-0714-113/+182
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-17' into 'master'Bob Van Landuyt2019-05-071-2/+2
|\ \ \ \ \ \ \ \ \ \