summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2Robert Speicher2019-05-081180-2942/+28051
|\
| * Resolve conflicts from masterjl-remove-k8s-components-mermaid-docsJoshua Lambert2019-05-081-99/+65
| * Merge branch 'docs-nneul/gitlab-ce-patch-1' into 'master'Achilleas Pipinellis2019-05-081-0/+16
| |\
| | * Docs nneul/gitlab ce patch 1Ian Baum2019-05-081-0/+16
| |/
| * Merge branch 'revert-0658ebf7' into 'master'Achilleas Pipinellis2019-05-081-5/+2
| |\
| | * Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7Stan Hu2019-05-071-5/+2
| * | Merge branch 'emilie-master-patch-81125' into 'master'Evan Read2019-05-071-0/+2
| |\ \ | | |/ | |/|
| | * Add info to docs about mapping a ping to the category it belongs to.Emilie Schario2019-05-071-0/+2
| |/
| * Merge branch '53973-fix-subpixel-border-issue' into 'master'Fatih Acet2019-05-072-0/+10
| |\
| | * Fix subpixel border issue53973-fix-subpixel-border-issuePaul Slaughter2019-05-072-0/+10
| * | Merge branch '61494-set-status-modal-visual-bugs' into 'master'Fatih Acet2019-05-074-9/+13
| |\ \
| | * | Fix input group and action buttons in "set status" modalPaul Gascou-Vaillancourt2019-05-074-9/+13
| |/ /
| * | Merge branch '57654-add-time-preferences-for-user-fe' into 'master'Fatih Acet2019-05-0717-18/+300
| |\ \
| | * | Added user time settings fields to profileEzekiel Kigbo2019-05-0717-18/+300
| |/ /
| * | Merge branch 'qa-quarantine-download-mr-patch-and-diff-test-suite' into 'master'Dan Davison2019-05-071-1/+2
| |\ \
| | * | Quarantine download MR patch and diff test suiteqa-quarantine-download-mr-patch-and-diff-test-suiteWalmyr Lima2019-05-071-1/+2
| * | | Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'Robert Speicher2019-05-072-2/+11
| |\ \ \
| | * | | CE changes for SSO web enforcementce-jej/group-saml-sso-enforcementJames Edwards-Jones2019-05-062-2/+11
| * | | | Merge branch 'fix-mermaid-chart-docs' into 'master'Sid Sijbrandij2019-05-071-2/+5
| |\ \ \ \
| | * | | | Load mermaid.min.js for now off-siteJoshua Lambert2019-05-071-2/+5
| * | | | | Merge branch 'ce-11099-removing-the-project-that-holds-the-insights-configura...Robert Speicher2019-05-071-0/+6
| |\ \ \ \ \
| | * | | | | Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-errorLin Jen-Shin2019-05-071-0/+6
| * | | | | | Merge branch 'shell-9-1-0' into 'master'Douglas Barbosa Alexandre2019-05-072-1/+6
| |\ \ \ \ \ \
| | * | | | | | Update gitlab-shell to v9.1.0Nick Thomas2019-05-072-1/+6
| * | | | | | | Merge branch '10808-allow-license-import-during-install' into 'master'Achilleas Pipinellis2019-05-074-3/+40
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Document EE License Auto Import During InstallRobert Marshall2019-05-074-3/+40
| |/ / / / / /
| * | | | | | Merge branch 'ce-4452-in-line-chart-designer-mvc' into 'master'Clement Ho2019-05-075-60/+150
| |\ \ \ \ \ \
| | * | | | | | Add custom metrics form to dashboardAdriel Santiago2019-05-075-60/+150
| |/ / / / / /
| * | | | | | Merge branch 'js-i18n-protected-branches' into 'master'Clement Ho2019-05-074-3/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Internationalisation of protected_branches directoryBrandon Labuschagne2019-05-074-3/+13
| |/ / / / /
| * | | | | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status