summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'Jacob Schatz2017-08-151-0/+3
|\
| * enable webpack scope hoistingMike Greiling2017-08-151-0/+3
* | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-141-4/+34
* | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-111-2/+2
|/
* alternative route for download archivehaseeb2017-08-101-0/+3
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
* Merge branch 'master' into ideMike Greiling2017-08-077-7/+47
|\
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+4
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-0/+4
| * | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+2
| |\ \
| | * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+2
| * | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-072-7/+20
| |\ \ \
| | * | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| | * | | add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling2017-08-071-0/+1
| | * | | replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-071-7/+13
| * | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0718-40/+178
| | |\ \ \ \ | | | |/ / /
| * | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-0/+4
| |\ \ \ \ \
| | * | | | | Support references to group milestonesSean McGivern2017-08-071-0/+4
| | | |/ / / | | |/| | |
| * | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into ideMike Greiling2017-08-077-5/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-072-3/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix issues with pdf-js dependenciesMike Greiling2017-08-071-1/+4
| | * | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-2/+2
| * | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+0
| * | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-044-1/+40
| |/ / /
| * | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1
* | | | Merge branch 'master' into ideDouwe Maan2017-08-032-1/+6
|\ \ \ \ | |/ / /
| * | | Inline script cleanup globals and easyTim Zallmann2017-08-011-0/+5
| * | | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docsMichael Kozono2017-07-311-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-312-2/+5
|\ \ \ | |/ /
| * | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-311-1/+4
| |\ \
| | * | Converted Pipelines ChartsTim Zallmann2017-07-271-0/+1
| | * | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-271-1/+2
| | * | Project New moved to external FileTim Zallmann2017-07-271-0/+1
| * | | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
* | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2818-38/+188
|\ \ \ \ | |/ / /
| * | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-5/+8
| |\ \ \
| | * | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-5/+8
| | |/ /
| * | | Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-281-1/+4
| |\ \ \
| | * \ \ Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern2017-07-281-4/+4
| | |\ \ \
| | * | | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-1/+4
| * | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-281-2/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | refactor users bundle, remove inline javascript, and transform into an async ...Mike Greiling2017-07-181-2/+0
| * | | | | Merge branch 'sh-fix-lograge-exception' into 'master'Sean McGivern2017-07-281-1/+1
| |\ \ \ \ \
| | * | | | | Fix lograge exclusion in params sectionsh-fix-lograge-exceptionStan Hu2017-07-281-1/+1
| | | |/ / / | | |/| | |
| * | | | | Rename the metric groups35667-indicate-type-of-metric-for-prometheus-web-application-monitoringJoshua Lambert2017-07-271-4/+4
| |/ / / /
| * | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-3/+3
| |\ \ \ \
| | * | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-3/+3
View Lorry Controller Status